From 33e3f8dcbccb20d89929d50d198ef069e2fde07a Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Mon, 6 Nov 2023 14:34:47 +0100 Subject: [PATCH 1/7] Change Java 11 to Java 17 --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- fr.centralesupelec.edf.riseclipse.iec61850.scl/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.classpath b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.classpath index d499d305..06bb5d7d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.classpath +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.classpath @@ -2,6 +2,6 @@ - + diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.jdt.core.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.jdt.core.prefs index a58ebdca..9478cb16 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.jdt.core.prefs +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF index d5f8a1ee..c38dffaf 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-Version: 1.2.6 Bundle-ClassPath: . Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.edit;visibility:=reexport, diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.classpath b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.classpath index c8590e5c..1ed94f75 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.classpath +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.classpath @@ -2,6 +2,6 @@ - + diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.jdt.core.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.jdt.core.prefs index a58ebdca..9478cb16 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.jdt.core.prefs +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF index 9090def1..bb9f781d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Vendor: %providerName Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities Bundle-Version: 1.2.6 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore, fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.6", fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.7,1.3.0)" diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/.classpath b/fr.centralesupelec.edf.riseclipse.iec61850.scl/.classpath index d499d305..06bb5d7d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/.classpath +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/.classpath @@ -2,6 +2,6 @@ - + diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.jdt.core.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.jdt.core.prefs index a58ebdca..9478cb16 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.jdt.core.prefs +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF index 3e2b9faa..c946d20d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl Bundle-Version: 1.2.6 Bundle-ClassPath: . Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl, fr.centralesupelec.edf.riseclipse.iec61850.scl.impl, fr.centralesupelec.edf.riseclipse.iec61850.scl.util From 6ca17eff01c9c10b9a91f730f1a242adf9943a36 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Mon, 6 Nov 2023 14:36:57 +0100 Subject: [PATCH 2/7] Update version numbers --- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF index c38dffaf..4b74e035 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit;singleton:=true Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit -Bundle-Version: 1.2.6 +Bundle-Version: 1.2.7.qualifier Bundle-ClassPath: . Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation Bundle-Localization: plugin diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF index bb9f781d..2b8fc617 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities -Bundle-Version: 1.2.6 +Bundle-Version: 1.2.7.qualifier Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore, diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF index c946d20d..c24efdb8 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl;singleton:=true Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl -Bundle-Version: 1.2.6 +Bundle-Version: 1.2.7.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/pom.xml b/pom.xml index 1e84f536..84f2c35c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ io.github.riseclipse fr.centralesupelec.edf.riseclipse.developer.maven - 1.2.7 + 1.2.9-SNAPSHOT From adee431f8208b31dc684855337c6941d160df8c4 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Tue, 9 Jan 2024 09:15:04 +0100 Subject: [PATCH 3/7] Attempt to correct issue #35 and detab --- .../iec61850/scl/util/SCLXMLHandler.java | 124 ++++++++++-------- 1 file changed, 67 insertions(+), 57 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SCLXMLHandler.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SCLXMLHandler.java index 6c6c6186..991cea49 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SCLXMLHandler.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SCLXMLHandler.java @@ -135,20 +135,28 @@ else if( inPrivate ) { super.endElement( uri, localName, name ); } - @Override + @Override protected EStructuralFeature getFeature( EObject object, String prefix, String name, boolean isElement ) { // XMLHelperImpl.getFeature(EClass eClass, String namespaceURI, String name) - // ignore the namespace to find a feature using XMLHelperImpl.getFeatureWithoutMap(EClass eClass, String name) - // (checked version in Eclipse 2019-06) - // - // This lead to the creation of SCL objects if elements from another namespace use existing SCL element names. - // - // To avoid extending XMLHelper class, the namespace is checked here - // And we give back the any attribute to store the element - - if(( isElement ) && ( prefix != null ) && ( ! SclPackage.eNS_URI.equals( helper.getURI( prefix )))) { - return super.getFeature( object, prefix, "any", isElement ); - } + // ignore the namespace to find a feature using XMLHelperImpl.getFeatureWithoutMap(EClass eClass, String name) + // (checked version in Eclipse 2023-09) + // + // This lead to the creation of SCL objects if elements from another namespace use existing SCL names. + // + // To avoid extending XMLHelper class, the namespace is checked here + // + // See issue https://github.com/riseclipse/riseclipse-metamodel-scl2003/issues/35: + // The problem can also arise for attributes + // + // Before: we give back the any element to store the value + // Now: we give back null because there may be several elements/attributes with the same name in different namespaces but + // any/anyAttribute can have only one value. + // The unknown feature message is not emitted in this case (see handleUnknownFeature() below) + + if(( prefix != null ) && ( ! SclPackage.eNS_URI.equals( helper.getURI( prefix )))) { + //return super.getFeature( object, prefix, isElement ? "any" : "anyAttribute", isElement ); + return null; + } return super.getFeature( object, prefix, name, isElement ); } @@ -168,8 +176,8 @@ protected void processObject( EObject object ) { XML_HANDLER_CATEGORY, resourceURI.lastSegment(), 0, "linenumber stack empty !" ); } else { - // Will pop in endElement, because some attributes in the model - // are sub-elements in XML, therefore they are not process here + // Will pop in endElement, because some attributes in the model + // are sub-elements in XML, therefore they are not process here int lineNumber = lineNumbers.peek(); if( object instanceof SclObject ) { (( SclObject ) object ).setLineNumber( lineNumber ); @@ -179,51 +187,51 @@ protected void processObject( EObject object ) { // TODO: error message super.processObject( object ); } - - protected void setFeatureValue( EObject object, EStructuralFeature feature, Object value, int position ) { - // When an object a owns an object b1, a may replace it by another object b2 of the same kind - // It seems OK. - // However, when an XSD says an element A contains 0 or 1 element B (and not several), and when - // there are in XML 2 elements B in A, EMF just replace the first by the second, therefore - // accept the XML file even if it is invalid according to the XSD. - // We intercept here this behavior - // TODO: check if it has undesirable effect - // TODO: check if there is another way for this - - // feature may be null on invalid attribute/tag - if( feature == null ) return; - - if(( inPrivate ) && ( lastElement != null )) { - text.append( " " + feature.getName() + "=\"" + value + "\"" ); - return; - } - - if(( feature.getUpperBound() == 1 ) && object.eIsSet( feature )) { - AbstractRiseClipseConsole.getConsole().error( - XML_HANDLER_CATEGORY, resourceURI.lastSegment(), (( SclObject ) object ).getLineNumber(), + + protected void setFeatureValue( EObject object, EStructuralFeature feature, Object value, int position ) { + // When an object a owns an object b1, a may replace it by another object b2 of the same kind + // It seems OK. + // However, when an XSD says an element A contains 0 or 1 element B (and not several), and when + // there are in XML 2 elements B in A, EMF just replace the first by the second, therefore + // accept the XML file even if it is invalid according to the XSD. + // We intercept here this behavior + // TODO: check if it has undesirable effect + // TODO: check if there is another way for this + + // feature may be null on invalid attribute/tag + if( feature == null ) return; + + if(( inPrivate ) && ( lastElement != null )) { + text.append( " " + feature.getName() + "=\"" + value + "\"" ); + return; + } + + if(( feature.getUpperBound() == 1 ) && object.eIsSet( feature )) { + AbstractRiseClipseConsole.getConsole().error( + XML_HANDLER_CATEGORY, resourceURI.lastSegment(), (( SclObject ) object ).getLineNumber(), "there shall not be more than 1 ", - feature.getName(), " in ", object.eClass().getName() ); - return; - } - - // 0 or 1 are allowed as boolean values - if( feature.getEType() == EcorePackage.Literals.EBOOLEAN_OBJECT ) { - if(( value != null ) && ( value.getClass() == String.class )) { - switch(( String ) value ) { - case "0" : - super.setFeatureValue( object, feature, "false", position ); - return; - case "1" : - super.setFeatureValue( object, feature, "true", position ); - return; - } - } - } - - super.setFeatureValue( object, feature, value, position ); - } + feature.getName(), " in ", object.eClass().getName() ); + return; + } + + // 0 or 1 are allowed as boolean values + if( feature.getEType() == EcorePackage.Literals.EBOOLEAN_OBJECT ) { + if(( value != null ) && ( value.getClass() == String.class )) { + switch(( String ) value ) { + case "0" : + super.setFeatureValue( object, feature, "false", position ); + return; + case "1" : + super.setFeatureValue( object, feature, "true", position ); + return; + } + } + } + + super.setFeatureValue( object, feature, value, position ); + } - @Override + @Override public void endDocument() { super.endDocument(); @@ -249,6 +257,8 @@ public void handleUnknownFeature( String prefix, String name, boolean isElement, if( ! lineNumbers.empty() ) { ln = lineNumbers.peek(); } + // A feature from another namespace is ignored, so this is not an error + if( prefix != null ) return; AbstractRiseClipseConsole.getConsole().error( XML_HANDLER_CATEGORY, resourceURI.lastSegment(), ln, "unknown feature \"", name, "\" in object ", peekObject.eClass().getName() ); } From 995416830e1f9a9487174763bde1cbeccd334d86 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Wed, 17 Jan 2024 14:00:04 +0100 Subject: [PATCH 4/7] update to Eclipse 2023-12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84f2c35c..f5c17a28 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ io.github.riseclipse fr.centralesupelec.edf.riseclipse.developer.maven - 1.2.9-SNAPSHOT + 1.2.11-SNAPSHOT From c4af075070a1965c5d7f15794d0c12e76fa3c32b Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Thu, 18 Jan 2024 17:54:10 +0100 Subject: [PATCH 5/7] EMF re-generation with current version --- .../model/SCL.genmodel | 8 +- .../scl/impl/AbstractDataAttributeImpl.java | 181 ++++++++++++------ .../iec61850/scl/impl/AnyLNImpl.java | 146 +++++++++----- .../iec61850/scl/impl/AssociationImpl.java | 166 ++++++++++------ .../iec61850/scl/impl/ConnectedAPImpl.java | 149 +++++++++----- .../iec61850/scl/impl/ControlBlockImpl.java | 110 +++++++---- .../iec61850/scl/impl/ControlImpl.java | 71 ++++--- .../riseclipse/iec61850/scl/impl/DAIImpl.java | 169 +++++++++++----- .../riseclipse/iec61850/scl/impl/DOIImpl.java | 110 +++++++---- .../riseclipse/iec61850/scl/impl/DOImpl.java | 63 ++++-- .../iec61850/scl/impl/FCDAImpl.java | 151 ++++++++++----- .../iec61850/scl/impl/LogControlImpl.java | 177 +++++++++++------ .../riseclipse/iec61850/scl/impl/SDIImpl.java | 180 +++++++++++------ .../riseclipse/iec61850/scl/impl/SDOImpl.java | 43 +++-- .../iec61850/scl/impl/SclPackageImpl.java | 14 +- 15 files changed, 1192 insertions(+), 546 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel index f32cac65..169388c4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel @@ -1,16 +1,16 @@ + runtimeVersion="2.36" operationReflection="true" importOrganizing="true" cleanup="true" + eclipsePlatformVersion="2023-12"> 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 1b7f9980..cb390284 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 @@ -407,9 +407,10 @@ public void setBType( String newBType ) { bType = newBType; boolean oldBTypeESet = bTypeESet; bTypeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE, oldBType, bType, !oldBTypeESet ) ); + } } /** @@ -423,9 +424,10 @@ public void unsetBType() { boolean oldBTypeESet = bTypeESet; bType = BTYPE_EDEFAULT; bTypeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__BTYPE, oldBType, BTYPE_EDEFAULT, oldBTypeESet ) ); + } } /** @@ -459,9 +461,10 @@ public void setCount( String newCount ) { count = newCount; boolean oldCountESet = countESet; countESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT, oldCount, count, !oldCountESet ) ); + } } /** @@ -475,9 +478,10 @@ public void unsetCount() { boolean oldCountESet = countESet; count = COUNT_EDEFAULT; countESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__COUNT, oldCount, COUNT_EDEFAULT, oldCountESet ) ); + } } /** @@ -511,9 +515,10 @@ public void setSAddr( String newSAddr ) { sAddr = newSAddr; boolean oldSAddrESet = sAddrESet; sAddrESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR, oldSAddr, sAddr, !oldSAddrESet ) ); + } } /** @@ -527,9 +532,10 @@ public void unsetSAddr() { boolean oldSAddrESet = sAddrESet; sAddr = SADDR_EDEFAULT; sAddrESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__SADDR, oldSAddr, SADDR_EDEFAULT, oldSAddrESet ) ); + } } /** @@ -563,9 +569,10 @@ public void setType( String newType ) { type = newType; boolean oldTypeESet = typeESet; typeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE, oldType, type, !oldTypeESet ) ); + } } /** @@ -579,9 +586,10 @@ public void unsetType() { boolean oldTypeESet = typeESet; type = TYPE_EDEFAULT; typeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet ) ); + } } /** @@ -615,9 +623,10 @@ public void setValImport( Boolean newValImport ) { valImport = newValImport; boolean oldValImportESet = valImportESet; valImportESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT, oldValImport, valImport, !oldValImportESet ) ); + } } /** @@ -631,9 +640,10 @@ public void unsetValImport() { boolean oldValImportESet = valImportESet; valImport = VAL_IMPORT_EDEFAULT; valImportESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT, oldValImport, VAL_IMPORT_EDEFAULT, oldValImportESet ) ); + } } /** @@ -667,9 +677,10 @@ public void setValKind( ValKindEnum newValKind ) { valKind = newValKind == null ? VAL_KIND_EDEFAULT : newValKind; boolean oldValKindESet = valKindESet; valKindESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND, oldValKind, valKind, !oldValKindESet ) ); + } } /** @@ -683,9 +694,10 @@ public void unsetValKind() { boolean oldValKindESet = valKindESet; valKind = VAL_KIND_EDEFAULT; valKindESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND, oldValKind, VAL_KIND_EDEFAULT, oldValKindESet ) ); + } } /** @@ -722,10 +734,12 @@ public NotificationChain basicSetRefersToEnumType( EnumType newRefersToEnumType, ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, oldRefersToEnumType, newRefersToEnumType, !oldRefersToEnumTypeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -739,22 +753,27 @@ public NotificationChain basicSetRefersToEnumType( EnumType newRefersToEnumType, public void setRefersToEnumType( EnumType newRefersToEnumType ) { if( newRefersToEnumType != refersToEnumType ) { NotificationChain msgs = null; - if( refersToEnumType != null ) + if( refersToEnumType != null ) { msgs = ( ( InternalEObject ) refersToEnumType ).eInverseRemove( this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs ); - if( newRefersToEnumType != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToEnumTypeESet = refersToEnumTypeESet; refersToEnumTypeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, newRefersToEnumType, newRefersToEnumType, !oldRefersToEnumTypeESet ) ); + } } } @@ -772,10 +791,12 @@ public NotificationChain basicUnsetRefersToEnumType( NotificationChain msgs ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, oldRefersToEnumType, null, oldRefersToEnumTypeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -792,15 +813,18 @@ public void unsetRefersToEnumType() { msgs = ( ( InternalEObject ) refersToEnumType ).eInverseRemove( this, SclPackage.ENUM_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, EnumType.class, msgs ); msgs = basicUnsetRefersToEnumType( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToEnumTypeESet = refersToEnumTypeESet; refersToEnumTypeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE, null, null, oldRefersToEnumTypeESet ) ); + } } } @@ -835,7 +859,9 @@ public EList< Val > getVal() { */ @Override public void unsetVal() { - if( val != null ) ( ( InternalEList.Unsettable< ? > ) val ).unset(); + if( val != null ) { + ( ( InternalEList.Unsettable< ? > ) val ).unset(); + } } /** @@ -872,10 +898,12 @@ public NotificationChain basicSetRefersToDAType( DAType newRefersToDAType, Notif ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, oldRefersToDAType, newRefersToDAType, !oldRefersToDATypeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -889,22 +917,27 @@ public NotificationChain basicSetRefersToDAType( DAType newRefersToDAType, Notif public void setRefersToDAType( DAType newRefersToDAType ) { if( newRefersToDAType != refersToDAType ) { NotificationChain msgs = null; - if( refersToDAType != null ) + if( refersToDAType != null ) { msgs = ( ( InternalEObject ) refersToDAType ).eInverseRemove( this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs ); - if( newRefersToDAType != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToDATypeESet = refersToDATypeESet; refersToDATypeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, newRefersToDAType, newRefersToDAType, !oldRefersToDATypeESet ) ); + } } } @@ -922,10 +955,12 @@ public NotificationChain basicUnsetRefersToDAType( NotificationChain msgs ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, oldRefersToDAType, null, oldRefersToDATypeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -942,14 +977,17 @@ public void unsetRefersToDAType() { msgs = ( ( InternalEObject ) refersToDAType ).eInverseRemove( this, SclPackage.DA_TYPE__REFERRED_BY_ABSTRACT_DATA_ATTRIBUTE, DAType.class, msgs ); msgs = basicUnsetRefersToDAType( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToDATypeESet = refersToDATypeESet; refersToDATypeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_DA_TYPE, null, null, oldRefersToDATypeESet ) ); + } } } @@ -985,7 +1023,9 @@ public EList< FCDA > getReferredByFCDA() { */ @Override public void unsetReferredByFCDA() { - if( referredByFCDA != null ) ( ( InternalEList.Unsettable< ? > ) referredByFCDA ).unset(); + if( referredByFCDA != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByFCDA ).unset(); + } } /** @@ -1020,7 +1060,9 @@ public EList< ExtRef > getReferredByExtRef() { */ @Override public void unsetReferredByExtRef() { - if( referredByExtRef != null ) ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).unset(); + if( referredByExtRef != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).unset(); + } } /** @@ -1054,9 +1096,10 @@ public void setName( String newName ) { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME, oldName, name, !oldNameESet ) ); + } } /** @@ -1070,9 +1113,10 @@ public void unsetName() { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + } } /** @@ -1107,7 +1151,9 @@ public EList< DAI > getReferredByDAI() { */ @Override public void unsetReferredByDAI() { - if( referredByDAI != null ) ( ( InternalEList.Unsettable< ? > ) referredByDAI ).unset(); + if( referredByDAI != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByDAI ).unset(); + } } /** @@ -1142,7 +1188,9 @@ public EList< SDI > getReferredBySDI() { */ @Override public void unsetReferredBySDI() { - if( referredBySDI != null ) ( ( InternalEList.Unsettable< ? > ) referredBySDI ).unset(); + if( referredBySDI != null ) { + ( ( InternalEList.Unsettable< ? > ) referredBySDI ).unset(); + } } /** @@ -1165,16 +1213,18 @@ public boolean isSetReferredBySDI() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERS_TO_ENUM_TYPE: - if( refersToEnumType != null ) + 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 ) + 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() ) @@ -1419,51 +1469,68 @@ public boolean eIsSet( int featureID ) { */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (bType: " ); - if( bTypeESet ) + if( bTypeESet ) { result.append( bType ); - else + } + else { result.append( "" ); + } result.append( ", count: " ); - if( countESet ) + if( countESet ) { result.append( count ); - else + } + else { result.append( "" ); + } result.append( ", sAddr: " ); - if( sAddrESet ) + if( sAddrESet ) { result.append( sAddr ); - else + } + else { result.append( "" ); + } result.append( ", type: " ); - if( typeESet ) + if( typeESet ) { result.append( type ); - else + } + else { result.append( "" ); + } result.append( ", valImport: " ); - if( valImportESet ) + if( valImportESet ) { result.append( valImport ); - else + } + else { result.append( "" ); + } result.append( ", valKind: " ); - if( valKindESet ) + if( valKindESet ) { result.append( valKind ); - else + } + else { result.append( "" ); + } result.append( ", name: " ); - if( nameESet ) + if( nameESet ) { result.append( name ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AbstractDataAttributeImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "AbstractDataAttributeImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); 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 abfbce21..5c9e3d4c 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 @@ -350,9 +350,10 @@ public void setInst( String newInst ) { inst = newInst; boolean oldInstESet = instESet; instESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__INST, oldInst, inst, !oldInstESet ) ); + } } /** @@ -366,9 +367,10 @@ public void unsetInst() { boolean oldInstESet = instESet; inst = INST_EDEFAULT; instESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__INST, oldInst, INST_EDEFAULT, oldInstESet ) ); + } } /** @@ -402,9 +404,10 @@ public void setLnClass( String newLnClass ) { lnClass = newLnClass; boolean oldLnClassESet = lnClassESet; lnClassESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet ) ); + } } /** @@ -418,9 +421,10 @@ public void unsetLnClass() { boolean oldLnClassESet = lnClassESet; lnClass = LN_CLASS_EDEFAULT; lnClassESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet ) ); + } } /** @@ -454,9 +458,10 @@ public void setLnType( String newLnType ) { lnType = newLnType; boolean oldLnTypeESet = lnTypeESet; lnTypeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__LN_TYPE, oldLnType, lnType, !oldLnTypeESet ) ); + } } /** @@ -470,9 +475,10 @@ public void unsetLnType() { boolean oldLnTypeESet = lnTypeESet; lnType = LN_TYPE_EDEFAULT; lnTypeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__LN_TYPE, oldLnType, LN_TYPE_EDEFAULT, oldLnTypeESet ) ); + } } /** @@ -509,10 +515,12 @@ public NotificationChain basicSetRefersToLNodeType( LNodeType newRefersToLNodeTy ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -526,21 +534,26 @@ public NotificationChain basicSetRefersToLNodeType( LNodeType newRefersToLNodeTy public void setRefersToLNodeType( LNodeType newRefersToLNodeType ) { if( newRefersToLNodeType != refersToLNodeType ) { NotificationChain msgs = null; - if( refersToLNodeType != null ) + if( refersToLNodeType != null ) { msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this, SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs ); - if( newRefersToLNodeType != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet; refersToLNodeTypeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, newRefersToLNodeType, newRefersToLNodeType, !oldRefersToLNodeTypeESet ) ); + } } } @@ -557,10 +570,12 @@ public NotificationChain basicUnsetRefersToLNodeType( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, oldRefersToLNodeType, null, oldRefersToLNodeTypeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -577,14 +592,17 @@ public void unsetRefersToLNodeType() { msgs = ( ( InternalEObject ) refersToLNodeType ).eInverseRemove( this, SclPackage.LNODE_TYPE__REFERRED_BY_ANY_LN, LNodeType.class, msgs ); msgs = basicUnsetRefersToLNodeType( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToLNodeTypeESet = refersToLNodeTypeESet; refersToLNodeTypeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE, null, null, oldRefersToLNodeTypeESet ) ); + } } } @@ -621,10 +639,12 @@ public NotificationChain basicSetInputs( Inputs newInputs, NotificationChain msg if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__INPUTS, oldInputs, newInputs, !oldInputsESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -638,21 +658,26 @@ public NotificationChain basicSetInputs( Inputs newInputs, NotificationChain msg public void setInputs( Inputs newInputs ) { if( newInputs != inputs ) { NotificationChain msgs = null; - if( inputs != null ) + if( inputs != null ) { msgs = ( ( InternalEObject ) inputs ).eInverseRemove( this, SclPackage.INPUTS__PARENT_ANY_LN, Inputs.class, msgs ); - if( newInputs != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldInputsESet = inputsESet; inputsESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ANY_LN__INPUTS, newInputs, newInputs, !oldInputsESet ) ); + } } } @@ -669,10 +694,12 @@ public NotificationChain basicUnsetInputs( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__INPUTS, oldInputs, null, oldInputsESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -689,14 +716,17 @@ public void unsetInputs() { msgs = ( ( InternalEObject ) inputs ).eInverseRemove( this, SclPackage.INPUTS__PARENT_ANY_LN, Inputs.class, msgs ); msgs = basicUnsetInputs( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldInputsESet = inputsESet; inputsESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ANY_LN__INPUTS, null, null, oldInputsESet ) ); + } } } @@ -731,7 +761,9 @@ public EList< Log > getLog() { */ @Override public void unsetLog() { - if( log != null ) ( ( InternalEList.Unsettable< ? > ) log ).unset(); + if( log != null ) { + ( ( InternalEList.Unsettable< ? > ) log ).unset(); + } } /** @@ -765,7 +797,9 @@ public EList< DOI > getDOI() { */ @Override public void unsetDOI() { - if( doi != null ) ( ( InternalEList.Unsettable< ? > ) doi ).unset(); + if( doi != null ) { + ( ( InternalEList.Unsettable< ? > ) doi ).unset(); + } } /** @@ -799,7 +833,9 @@ public EList< ReportControl > getReportControl() { */ @Override public void unsetReportControl() { - if( reportControl != null ) ( ( InternalEList.Unsettable< ? > ) reportControl ).unset(); + if( reportControl != null ) { + ( ( InternalEList.Unsettable< ? > ) reportControl ).unset(); + } } /** @@ -833,7 +869,9 @@ public EList< LogControl > getLogControl() { */ @Override public void unsetLogControl() { - if( logControl != null ) ( ( InternalEList.Unsettable< ? > ) logControl ).unset(); + if( logControl != null ) { + ( ( InternalEList.Unsettable< ? > ) logControl ).unset(); + } } /** @@ -867,7 +905,9 @@ public EList< DataSet > getDataSet() { */ @Override public void unsetDataSet() { - if( dataSet != null ) ( ( InternalEList.Unsettable< ? > ) dataSet ).unset(); + if( dataSet != null ) { + ( ( InternalEList.Unsettable< ? > ) dataSet ).unset(); + } } /** @@ -901,7 +941,9 @@ public EList< ClientLN > getReferredByClientLN() { */ @Override public void unsetReferredByClientLN() { - if( referredByClientLN != null ) ( ( InternalEList.Unsettable< ? > ) referredByClientLN ).unset(); + if( referredByClientLN != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByClientLN ).unset(); + } } /** @@ -935,7 +977,9 @@ public EList< Association > getReferredByAssociation() { */ @Override public void unsetReferredByAssociation() { - if( referredByAssociation != null ) ( ( InternalEList.Unsettable< ? > ) referredByAssociation ).unset(); + if( referredByAssociation != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByAssociation ).unset(); + } } /** @@ -969,7 +1013,9 @@ public EList< IEDName > getReferredByIEDName() { */ @Override public void unsetReferredByIEDName() { - if( referredByIEDName != null ) ( ( InternalEList.Unsettable< ? > ) referredByIEDName ).unset(); + if( referredByIEDName != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByIEDName ).unset(); + } } /** @@ -1003,7 +1049,9 @@ public EList< LNode > getReferredByLNode() { */ @Override public void unsetReferredByLNode() { - if( referredByLNode != null ) ( ( InternalEList.Unsettable< ? > ) referredByLNode ).unset(); + if( referredByLNode != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByLNode ).unset(); + } } /** @@ -1089,14 +1137,16 @@ public String getNamespace() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.ANY_LN__REFERS_TO_LNODE_TYPE: - if( refersToLNodeType != null ) + 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 ) + 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 ); @@ -1420,24 +1470,32 @@ public Object eInvoke( int operationID, EList< ? > arguments ) throws Invocation */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (inst: " ); - if( instESet ) + if( instESet ) { result.append( inst ); - else + } + else { result.append( "" ); + } result.append( ", lnClass: " ); - if( lnClassESet ) + if( lnClassESet ) { result.append( lnClass ); - else + } + else { result.append( "" ); + } result.append( ", lnType: " ); - if( lnTypeESet ) + if( lnTypeESet ) { result.append( lnType ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } 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 e2575fe6..15c5abd1 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 @@ -21,7 +21,6 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; import org.apache.commons.lang3.tuple.Pair; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; @@ -356,9 +355,10 @@ public void setDesc( String newDesc ) { desc = newDesc; boolean oldDescESet = descESet; descESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__DESC, oldDesc, desc, !oldDescESet ) ); + } } /** @@ -372,9 +372,10 @@ public void unsetDesc() { boolean oldDescESet = descESet; desc = DESC_EDEFAULT; descESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__DESC, oldDesc, DESC_EDEFAULT, oldDescESet ) ); + } } /** @@ -408,9 +409,10 @@ public void setAssociationID( String newAssociationID ) { associationID = newAssociationID; boolean oldAssociationIDESet = associationIDESet; associationIDESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__ASSOCIATION_ID, oldAssociationID, associationID, !oldAssociationIDESet ) ); + } } /** @@ -424,9 +426,10 @@ public void unsetAssociationID() { boolean oldAssociationIDESet = associationIDESet; associationID = ASSOCIATION_ID_EDEFAULT; associationIDESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__ASSOCIATION_ID, oldAssociationID, ASSOCIATION_ID_EDEFAULT, oldAssociationIDESet ) ); + } } /** @@ -460,9 +463,10 @@ public void setIedName( String newIedName ) { iedName = newIedName; boolean oldIedNameESet = iedNameESet; iedNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__IED_NAME, oldIedName, iedName, !oldIedNameESet ) ); + } } /** @@ -476,9 +480,10 @@ public void unsetIedName() { boolean oldIedNameESet = iedNameESet; iedName = IED_NAME_EDEFAULT; iedNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet ) ); + } } /** @@ -512,9 +517,10 @@ public void setKind( AssociationKindEnum newKind ) { kind = newKind == null ? KIND_EDEFAULT : newKind; boolean oldKindESet = kindESet; kindESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__KIND, oldKind, kind, !oldKindESet ) ); + } } /** @@ -528,9 +534,10 @@ public void unsetKind() { boolean oldKindESet = kindESet; kind = KIND_EDEFAULT; kindESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__KIND, oldKind, KIND_EDEFAULT, oldKindESet ) ); + } } /** @@ -550,7 +557,9 @@ public boolean isSetKind() { */ @Override public Server getParentServer() { - if( eContainerFeatureID() != SclPackage.ASSOCIATION__PARENT_SERVER ) return null; + if( eContainerFeatureID() != SclPackage.ASSOCIATION__PARENT_SERVER ) { + return null; + } return ( Server ) eInternalContainer(); } @@ -573,20 +582,26 @@ public NotificationChain basicSetParentServer( Server newParentServer, Notificat public void setParentServer( Server newParentServer ) { if( newParentServer != eInternalContainer() || ( eContainerFeatureID() != SclPackage.ASSOCIATION__PARENT_SERVER && newParentServer != null ) ) { - if( EcoreUtil.isAncestor( this, newParentServer ) ) + if( EcoreUtil.isAncestor( this, newParentServer ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentServer != null ) + } + if( newParentServer != null ) { msgs = ( ( InternalEObject ) newParentServer ).eInverseAdd( this, SclPackage.SERVER__ASSOCIATION, Server.class, msgs ); + } msgs = basicSetParentServer( newParentServer, msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__PARENT_SERVER, newParentServer, newParentServer ) ); + } } /** @@ -610,9 +625,10 @@ public void setLdInst( String newLdInst ) { ldInst = newLdInst; boolean oldLdInstESet = ldInstESet; ldInstESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__LD_INST, oldLdInst, ldInst, !oldLdInstESet ) ); + } } /** @@ -626,9 +642,10 @@ public void unsetLdInst() { boolean oldLdInstESet = ldInstESet; ldInst = LD_INST_EDEFAULT; ldInstESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet ) ); + } } /** @@ -662,9 +679,10 @@ public void setLnClass( String newLnClass ) { lnClass = newLnClass; boolean oldLnClassESet = lnClassESet; lnClassESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet ) ); + } } /** @@ -678,9 +696,10 @@ public void unsetLnClass() { boolean oldLnClassESet = lnClassESet; lnClass = LN_CLASS_EDEFAULT; lnClassESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet ) ); + } } /** @@ -714,9 +733,10 @@ public void setLnInst( String newLnInst ) { lnInst = newLnInst; boolean oldLnInstESet = lnInstESet; lnInstESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__LN_INST, oldLnInst, lnInst, !oldLnInstESet ) ); + } } /** @@ -730,9 +750,10 @@ public void unsetLnInst() { boolean oldLnInstESet = lnInstESet; lnInst = LN_INST_EDEFAULT; lnInstESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet ) ); + } } /** @@ -766,9 +787,10 @@ public void setPrefix( String newPrefix ) { prefix = newPrefix; boolean oldPrefixESet = prefixESet; prefixESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__PREFIX, oldPrefix, prefix, !oldPrefixESet ) ); + } } /** @@ -782,9 +804,10 @@ public void unsetPrefix() { boolean oldPrefixESet = prefixESet; prefix = PREFIX_EDEFAULT; prefixESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet ) ); + } } /** @@ -821,10 +844,12 @@ public NotificationChain basicSetRefersToAnyLN( AnyLN newRefersToAnyLN, Notifica ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, oldRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -838,21 +863,26 @@ public NotificationChain basicSetRefersToAnyLN( AnyLN newRefersToAnyLN, Notifica public void setRefersToAnyLN( AnyLN newRefersToAnyLN ) { if( newRefersToAnyLN != refersToAnyLN ) { NotificationChain msgs = null; - if( refersToAnyLN != null ) + if( refersToAnyLN != null ) { msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs ); - if( newRefersToAnyLN != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAnyLNESet = refersToAnyLNESet; refersToAnyLNESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, newRefersToAnyLN, newRefersToAnyLN, !oldRefersToAnyLNESet ) ); + } } } @@ -869,10 +899,12 @@ public NotificationChain basicUnsetRefersToAnyLN( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, oldRefersToAnyLN, null, oldRefersToAnyLNESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -889,14 +921,17 @@ public void unsetRefersToAnyLN() { msgs = ( ( InternalEObject ) refersToAnyLN ).eInverseRemove( this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, AnyLN.class, msgs ); msgs = basicUnsetRefersToAnyLN( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAnyLNESet = refersToAnyLNESet; refersToAnyLNESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN, null, null, oldRefersToAnyLNESet ) ); + } } } @@ -919,13 +954,15 @@ public boolean isSetRefersToAnyLN() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.ASSOCIATION__PARENT_SERVER: - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentServer( ( Server ) otherEnd, msgs ); case SclPackage.ASSOCIATION__REFERS_TO_ANY_LN: - if( refersToAnyLN != null ) + 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 ); @@ -1196,56 +1233,75 @@ public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass */ @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 ) + if( descESet ) { result.append( desc ); - else + } + else { result.append( "" ); + } result.append( ", iedName: " ); - if( iedNameESet ) + if( iedNameESet ) { result.append( iedName ); - else + } + else { result.append( "" ); + } result.append( ", ldInst: " ); - if( ldInstESet ) + if( ldInstESet ) { result.append( ldInst ); - else + } + else { result.append( "" ); + } result.append( ", lnClass: " ); - if( lnClassESet ) + if( lnClassESet ) { result.append( lnClass ); - else + } + else { result.append( "" ); + } result.append( ", lnInst: " ); - if( lnInstESet ) + if( lnInstESet ) { result.append( lnInst ); - else + } + else { result.append( "" ); + } result.append( ", prefix: " ); - if( prefixESet ) + if( prefixESet ) { result.append( prefix ); - else + } + else { result.append( "" ); + } result.append( ", associationID: " ); - if( associationIDESet ) + if( associationIDESet ) { result.append( associationID ); - else + } + else { result.append( "" ); + } result.append( ", kind: " ); - if( kindESet ) + if( kindESet ) { result.append( kind ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AssociationImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "AssociationImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1307,7 +1363,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String mess = "LN( lnClass = " + getLnClass(); if( getLnInst() != null ) { mess += ", inst = " + getLnInst(); - if( getPrefix() != "" ) mess += ", prefix = " + getPrefix(); + if( getPrefix() != "" ) { + mess += ", prefix = " + getPrefix(); + } } mess += " )"; if( anyLN.getLeft() == null ) { 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 8e46fbeb..0206a4bd 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 @@ -23,7 +23,6 @@ import java.util.Collection; import org.apache.commons.lang3.tuple.Pair; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -264,9 +263,10 @@ public void setApName( String newApName ) { apName = newApName; boolean oldApNameESet = apNameESet; apNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__AP_NAME, oldApName, apName, !oldApNameESet ) ); + } } /** @@ -280,9 +280,10 @@ public void unsetApName() { boolean oldApNameESet = apNameESet; apName = AP_NAME_EDEFAULT; apNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__AP_NAME, oldApName, AP_NAME_EDEFAULT, oldApNameESet ) ); + } } /** @@ -316,9 +317,10 @@ public void setIedName( String newIedName ) { iedName = newIedName; boolean oldIedNameESet = iedNameESet; iedNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__IED_NAME, oldIedName, iedName, !oldIedNameESet ) ); + } } /** @@ -332,9 +334,10 @@ public void unsetIedName() { boolean oldIedNameESet = iedNameESet; iedName = IED_NAME_EDEFAULT; iedNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__IED_NAME, oldIedName, IED_NAME_EDEFAULT, oldIedNameESet ) ); + } } /** @@ -368,9 +371,10 @@ public void setRedProt( String newRedProt ) { redProt = newRedProt; boolean oldRedProtESet = redProtESet; redProtESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__RED_PROT, oldRedProt, redProt, !oldRedProtESet ) ); + } } /** @@ -384,9 +388,10 @@ public void unsetRedProt() { boolean oldRedProtESet = redProtESet; redProt = RED_PROT_EDEFAULT; redProtESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__RED_PROT, oldRedProt, RED_PROT_EDEFAULT, oldRedProtESet ) ); + } } /** @@ -422,10 +427,12 @@ public NotificationChain basicSetAddress( Address newAddress, NotificationChain if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__ADDRESS, oldAddress, newAddress, !oldAddressESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -439,21 +446,26 @@ public NotificationChain basicSetAddress( Address newAddress, NotificationChain public void setAddress( Address newAddress ) { if( newAddress != address ) { NotificationChain msgs = null; - if( address != null ) + if( address != null ) { msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONNECTED_AP, Address.class, msgs ); - if( newAddress != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldAddressESet = addressESet; addressESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__ADDRESS, newAddress, newAddress, !oldAddressESet ) ); + } } } @@ -470,10 +482,12 @@ public NotificationChain basicUnsetAddress( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__ADDRESS, oldAddress, null, oldAddressESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -490,14 +504,17 @@ public void unsetAddress() { msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONNECTED_AP, Address.class, msgs ); msgs = basicUnsetAddress( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldAddressESet = addressESet; addressESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__ADDRESS, null, null, oldAddressESet ) ); + } } } @@ -518,7 +535,9 @@ public boolean isSetAddress() { */ @Override public SubNetwork getParentSubNetwork() { - if( eContainerFeatureID() != SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK ) return null; + if( eContainerFeatureID() != SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK ) { + return null; + } return ( SubNetwork ) eInternalContainer(); } @@ -543,20 +562,26 @@ public void setParentSubNetwork( SubNetwork newParentSubNetwork ) { if( newParentSubNetwork != eInternalContainer() || ( eContainerFeatureID() != SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK && newParentSubNetwork != null ) ) { - if( EcoreUtil.isAncestor( this, newParentSubNetwork ) ) + if( EcoreUtil.isAncestor( this, newParentSubNetwork ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentSubNetwork != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__PARENT_SUB_NETWORK, newParentSubNetwork, newParentSubNetwork ) ); + } } /** @@ -583,10 +608,12 @@ public NotificationChain basicSetRefersToAccessPoint( AccessPoint newRefersToAcc ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -600,21 +627,26 @@ public NotificationChain basicSetRefersToAccessPoint( AccessPoint newRefersToAcc public void setRefersToAccessPoint( AccessPoint newRefersToAccessPoint ) { if( newRefersToAccessPoint != refersToAccessPoint ) { NotificationChain msgs = null; - if( refersToAccessPoint != null ) + if( refersToAccessPoint != null ) { msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this, SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs ); - if( newRefersToAccessPoint != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAccessPointESet = refersToAccessPointESet; refersToAccessPointESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, newRefersToAccessPoint, newRefersToAccessPoint, !oldRefersToAccessPointESet ) ); + } } } @@ -632,10 +664,12 @@ public NotificationChain basicUnsetRefersToAccessPoint( NotificationChain msgs ) ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, oldRefersToAccessPoint, null, oldRefersToAccessPointESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -652,14 +686,17 @@ public void unsetRefersToAccessPoint() { msgs = ( ( InternalEObject ) refersToAccessPoint ).eInverseRemove( this, SclPackage.ACCESS_POINT__REFERRED_BY_CONNECTED_AP, AccessPoint.class, msgs ); msgs = basicUnsetRefersToAccessPoint( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAccessPointESet = refersToAccessPointESet; refersToAccessPointESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT, null, null, oldRefersToAccessPointESet ) ); + } } } @@ -694,7 +731,9 @@ public EList< PhysConn > getPhysConn() { */ @Override public void unsetPhysConn() { - if( physConn != null ) ( ( InternalEList.Unsettable< ? > ) physConn ).unset(); + if( physConn != null ) { + ( ( InternalEList.Unsettable< ? > ) physConn ).unset(); + } } /** @@ -728,7 +767,9 @@ public EList< GSE > getGSE() { */ @Override public void unsetGSE() { - if( gse != null ) ( ( InternalEList.Unsettable< ? > ) gse ).unset(); + if( gse != null ) { + ( ( InternalEList.Unsettable< ? > ) gse ).unset(); + } } /** @@ -762,7 +803,9 @@ public EList< SMV > getSMV() { */ @Override public void unsetSMV() { - if( smv != null ) ( ( InternalEList.Unsettable< ? > ) smv ).unset(); + if( smv != null ) { + ( ( InternalEList.Unsettable< ? > ) smv ).unset(); + } } /** @@ -785,18 +828,21 @@ public boolean isSetSMV() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.CONNECTED_AP__ADDRESS: - if( address != null ) + 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 ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentSubNetwork( ( SubNetwork ) otherEnd, msgs ); case SclPackage.CONNECTED_AP__REFERS_TO_ACCESS_POINT: - if( refersToAccessPoint != null ) + 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, @@ -997,31 +1043,40 @@ public boolean eIsSet( int featureID ) { */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (apName: " ); - if( apNameESet ) + if( apNameESet ) { result.append( apName ); - else + } + else { result.append( "" ); + } result.append( ", iedName: " ); - if( iedNameESet ) + if( iedNameESet ) { result.append( iedName ); - else + } + else { result.append( "" ); + } result.append( ", redProt: " ); - if( redProtESet ) + if( redProtESet ) { result.append( redProt ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ConnectedAPImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "ConnectedAPImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); 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 ed3a2e05..5267a2d1 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 @@ -26,7 +26,6 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -199,9 +198,10 @@ public void setCbName( String newCbName ) { cbName = newCbName; boolean oldCbNameESet = cbNameESet; cbNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__CB_NAME, oldCbName, cbName, !oldCbNameESet ) ); + } } /** @@ -215,9 +215,10 @@ public void unsetCbName() { boolean oldCbNameESet = cbNameESet; cbName = CB_NAME_EDEFAULT; cbNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__CB_NAME, oldCbName, CB_NAME_EDEFAULT, oldCbNameESet ) ); + } } /** @@ -251,9 +252,10 @@ public void setLdInst( String newLdInst ) { ldInst = newLdInst; boolean oldLdInstESet = ldInstESet; ldInstESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__LD_INST, oldLdInst, ldInst, !oldLdInstESet ) ); + } } /** @@ -267,9 +269,10 @@ public void unsetLdInst() { boolean oldLdInstESet = ldInstESet; ldInst = LD_INST_EDEFAULT; ldInstESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet ) ); + } } /** @@ -305,10 +308,12 @@ public NotificationChain basicSetAddress( Address newAddress, NotificationChain if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__ADDRESS, oldAddress, newAddress, !oldAddressESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -322,21 +327,26 @@ public NotificationChain basicSetAddress( Address newAddress, NotificationChain public void setAddress( Address newAddress ) { if( newAddress != address ) { NotificationChain msgs = null; - if( address != null ) + if( address != null ) { msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK, Address.class, msgs ); - if( newAddress != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldAddressESet = addressESet; addressESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__ADDRESS, newAddress, newAddress, !oldAddressESet ) ); + } } } @@ -353,10 +363,12 @@ public NotificationChain basicUnsetAddress( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__ADDRESS, oldAddress, null, oldAddressESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -373,14 +385,17 @@ public void unsetAddress() { msgs = ( ( InternalEObject ) address ).eInverseRemove( this, SclPackage.ADDRESS__PARENT_CONTROL_BLOCK, Address.class, msgs ); msgs = basicUnsetAddress( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldAddressESet = addressESet; addressESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__ADDRESS, null, null, oldAddressESet ) ); + } } } @@ -419,10 +434,12 @@ public NotificationChain basicSetRefersToControlWithIEDName( ControlWithIEDName ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, oldRefersToControlWithIEDName, newRefersToControlWithIEDName, !oldRefersToControlWithIEDNameESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -436,22 +453,27 @@ public NotificationChain basicSetRefersToControlWithIEDName( ControlWithIEDName public void setRefersToControlWithIEDName( ControlWithIEDName newRefersToControlWithIEDName ) { if( newRefersToControlWithIEDName != refersToControlWithIEDName ) { NotificationChain msgs = null; - if( refersToControlWithIEDName != null ) + if( refersToControlWithIEDName != null ) { msgs = ( ( InternalEObject ) refersToControlWithIEDName ).eInverseRemove( this, SclPackage.CONTROL_WITH_IED_NAME__REFERRED_BY_CONTROL_BLOCK, ControlWithIEDName.class, msgs ); - if( newRefersToControlWithIEDName != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToControlWithIEDNameESet = refersToControlWithIEDNameESet; refersToControlWithIEDNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, newRefersToControlWithIEDName, newRefersToControlWithIEDName, !oldRefersToControlWithIEDNameESet ) ); + } } } @@ -469,10 +491,12 @@ public NotificationChain basicUnsetRefersToControlWithIEDName( NotificationChain ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, oldRefersToControlWithIEDName, null, oldRefersToControlWithIEDNameESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -489,15 +513,18 @@ public void unsetRefersToControlWithIEDName() { 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(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToControlWithIEDNameESet = refersToControlWithIEDNameESet; refersToControlWithIEDNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL_BLOCK__REFERS_TO_CONTROL_WITH_IED_NAME, null, null, oldRefersToControlWithIEDNameESet ) ); + } } } @@ -532,14 +559,16 @@ public ConnectedAP getParentConnectedAP() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.CONTROL_BLOCK__ADDRESS: - if( address != null ) + 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 ) + 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 ); @@ -670,26 +699,33 @@ public Object eInvoke( int operationID, EList< ? > arguments ) throws Invocation */ @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 ) + if( cbNameESet ) { result.append( cbName ); - else + } + else { result.append( "" ); + } result.append( ", ldInst: " ); - if( ldInstESet ) + if( ldInstESet ) { result.append( ldInst ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ControlBlockImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "ControlBlockImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -717,9 +753,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } // No error or warning messages here: if this happens, error should have been detected before - if( ( getParentConnectedAP() == null ) || ( getParentConnectedAP().getRefersToAccessPoint() == null ) ) return; + if( ( getParentConnectedAP() == null ) || ( getParentConnectedAP().getRefersToAccessPoint() == null ) ) { + return; + } IED ied = getParentConnectedAP().getRefersToAccessPoint().getParentIED(); - if( ied == null ) return; + if( ied == null ) { + return; + } // find an LDevice with // LDevice.inst == ControlBlock.ldInst 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 e2fb054d..0a614936 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 @@ -187,9 +187,10 @@ public void setDatSet( String newDatSet ) { datSet = newDatSet; boolean oldDatSetESet = datSetESet; datSetESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL__DAT_SET, oldDatSet, datSet, !oldDatSetESet ) ); + } } /** @@ -203,9 +204,10 @@ public void unsetDatSet() { boolean oldDatSetESet = datSetESet; datSet = DAT_SET_EDEFAULT; datSetESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL__DAT_SET, oldDatSet, DAT_SET_EDEFAULT, oldDatSetESet ) ); + } } /** @@ -242,10 +244,12 @@ public NotificationChain basicSetRefersToDataSet( DataSet newRefersToDataSet, No ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL__REFERS_TO_DATA_SET, oldRefersToDataSet, newRefersToDataSet, !oldRefersToDataSetESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -259,21 +263,26 @@ public NotificationChain basicSetRefersToDataSet( DataSet newRefersToDataSet, No public void setRefersToDataSet( DataSet newRefersToDataSet ) { if( newRefersToDataSet != refersToDataSet ) { NotificationChain msgs = null; - if( refersToDataSet != null ) + if( refersToDataSet != null ) { msgs = ( ( InternalEObject ) refersToDataSet ).eInverseRemove( this, SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs ); - if( newRefersToDataSet != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToDataSetESet = refersToDataSetESet; refersToDataSetESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL__REFERS_TO_DATA_SET, newRefersToDataSet, newRefersToDataSet, !oldRefersToDataSetESet ) ); + } } } @@ -290,10 +299,12 @@ public NotificationChain basicUnsetRefersToDataSet( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL__REFERS_TO_DATA_SET, oldRefersToDataSet, null, oldRefersToDataSetESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -310,14 +321,17 @@ public void unsetRefersToDataSet() { msgs = ( ( InternalEObject ) refersToDataSet ).eInverseRemove( this, SclPackage.DATA_SET__REFERRED_BY_CONTROL, DataSet.class, msgs ); msgs = basicUnsetRefersToDataSet( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToDataSetESet = refersToDataSetESet; refersToDataSetESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL__REFERS_TO_DATA_SET, null, null, oldRefersToDataSetESet ) ); + } } } @@ -352,9 +366,10 @@ public void setName( String newName ) { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.CONTROL__NAME, oldName, name, !oldNameESet ) ); + } } /** @@ -368,9 +383,10 @@ public void unsetName() { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.CONTROL__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + } } /** @@ -404,7 +420,9 @@ public EList< ExtRef > getReferredByExtRef() { */ @Override public void unsetReferredByExtRef() { - if( referredByExtRef != null ) ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).unset(); + if( referredByExtRef != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByExtRef ).unset(); + } } /** @@ -439,9 +457,10 @@ public AnyLN getParentAnyLN() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.CONTROL__REFERS_TO_DATA_SET: - if( refersToDataSet != null ) + 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() ) @@ -577,19 +596,25 @@ public Object eInvoke( int operationID, EList< ? > arguments ) throws Invocation */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (datSet: " ); - if( datSetESet ) + if( datSetESet ) { result.append( datSet ); - else + } + else { result.append( "" ); + } result.append( ", name: " ); - if( nameESet ) + if( nameESet ) { result.append( name ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @@ -615,7 +640,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } // No error or warning message here: if this happens, error should have been detected before - if( getParentAnyLN() == null ) return; + if( getParentAnyLN() == null ) { + return; + } // find an DataSet with // DataSet.name == Control.datSet 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 c5ae06e0..005a0757 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 @@ -286,8 +286,9 @@ public void setIx( Integer newIx ) { ix = newIx; boolean oldIxESet = ixESet; ixESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__IX, oldIx, ix, !oldIxESet ) ); + } } /** @@ -301,9 +302,10 @@ public void unsetIx() { boolean oldIxESet = ixESet; ix = IX_EDEFAULT; ixESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__IX, oldIx, IX_EDEFAULT, oldIxESet ) ); + } } /** @@ -337,9 +339,10 @@ public void setSAddr( String newSAddr ) { sAddr = newSAddr; boolean oldSAddrESet = sAddrESet; sAddrESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__SADDR, oldSAddr, sAddr, !oldSAddrESet ) ); + } } /** @@ -353,9 +356,10 @@ public void unsetSAddr() { boolean oldSAddrESet = sAddrESet; sAddr = SADDR_EDEFAULT; sAddrESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__SADDR, oldSAddr, SADDR_EDEFAULT, oldSAddrESet ) ); + } } /** @@ -389,9 +393,10 @@ public void setValImport( Boolean newValImport ) { valImport = newValImport; boolean oldValImportESet = valImportESet; valImportESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__VAL_IMPORT, oldValImport, valImport, !oldValImportESet ) ); + } } /** @@ -405,9 +410,10 @@ public void unsetValImport() { boolean oldValImportESet = valImportESet; valImport = VAL_IMPORT_EDEFAULT; valImportESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__VAL_IMPORT, oldValImport, VAL_IMPORT_EDEFAULT, oldValImportESet ) ); + } } /** @@ -441,9 +447,10 @@ public void setValKind( ValKindEnum newValKind ) { valKind = newValKind == null ? VAL_KIND_EDEFAULT : newValKind; boolean oldValKindESet = valKindESet; valKindESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__VAL_KIND, oldValKind, valKind, !oldValKindESet ) ); + } } /** @@ -457,9 +464,10 @@ public void unsetValKind() { boolean oldValKindESet = valKindESet; valKind = VAL_KIND_EDEFAULT; valKindESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__VAL_KIND, oldValKind, VAL_KIND_EDEFAULT, oldValKindESet ) ); + } } /** @@ -493,7 +501,9 @@ public EList< Val > getVal() { */ @Override public void unsetVal() { - if( val != null ) ( ( InternalEList.Unsettable< ? > ) val ).unset(); + if( val != null ) { + ( ( InternalEList.Unsettable< ? > ) val ).unset(); + } } /** @@ -513,7 +523,9 @@ public boolean isSetVal() { */ @Override public DOI getParentDOI() { - if( eContainerFeatureID() != SclPackage.DAI__PARENT_DOI ) return null; + if( eContainerFeatureID() != SclPackage.DAI__PARENT_DOI ) { + return null; + } return ( DOI ) eInternalContainer(); } @@ -536,19 +548,25 @@ public NotificationChain basicSetParentDOI( DOI newParentDOI, NotificationChain public void setParentDOI( DOI newParentDOI ) { if( newParentDOI != eInternalContainer() || ( eContainerFeatureID() != SclPackage.DAI__PARENT_DOI && newParentDOI != null ) ) { - if( EcoreUtil.isAncestor( this, newParentDOI ) ) + if( EcoreUtil.isAncestor( this, newParentDOI ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentDOI != null ) + } + if( newParentDOI != null ) { msgs = ( ( InternalEObject ) newParentDOI ).eInverseAdd( this, SclPackage.DOI__DAI, DOI.class, msgs ); + } msgs = basicSetParentDOI( newParentDOI, msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__PARENT_DOI, newParentDOI, newParentDOI ) ); + } } /** @@ -558,7 +576,9 @@ else if( eNotificationRequired() ) */ @Override public SDI getParentSDI() { - if( eContainerFeatureID() != SclPackage.DAI__PARENT_SDI ) return null; + if( eContainerFeatureID() != SclPackage.DAI__PARENT_SDI ) { + return null; + } return ( SDI ) eInternalContainer(); } @@ -581,19 +601,25 @@ public NotificationChain basicSetParentSDI( SDI newParentSDI, NotificationChain public void setParentSDI( SDI newParentSDI ) { if( newParentSDI != eInternalContainer() || ( eContainerFeatureID() != SclPackage.DAI__PARENT_SDI && newParentSDI != null ) ) { - if( EcoreUtil.isAncestor( this, newParentSDI ) ) + if( EcoreUtil.isAncestor( this, newParentSDI ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentSDI != null ) + } + if( newParentSDI != null ) { msgs = ( ( InternalEObject ) newParentSDI ).eInverseAdd( this, SclPackage.SDI__DAI, SDI.class, msgs ); + } msgs = basicSetParentSDI( newParentSDI, msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__PARENT_SDI, newParentSDI, newParentSDI ) ); + } } /** @@ -617,9 +643,10 @@ public void setName( String newName ) { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__NAME, oldName, name, !oldNameESet ) ); + } } /** @@ -633,9 +660,10 @@ public void unsetName() { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + } } /** @@ -673,10 +701,12 @@ public NotificationChain basicSetRefersToAbstractDataAttribute( ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -690,22 +720,27 @@ public NotificationChain basicSetRefersToAbstractDataAttribute( public void setRefersToAbstractDataAttribute( AbstractDataAttribute newRefersToAbstractDataAttribute ) { if( newRefersToAbstractDataAttribute != refersToAbstractDataAttribute ) { NotificationChain msgs = null; - if( refersToAbstractDataAttribute != null ) + if( refersToAbstractDataAttribute != null ) { msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs ); - if( newRefersToAbstractDataAttribute != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet; refersToAbstractDataAttributeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet ) ); + } } } @@ -723,10 +758,12 @@ public NotificationChain basicUnsetRefersToAbstractDataAttribute( NotificationCh ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null, oldRefersToAbstractDataAttributeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -743,15 +780,18 @@ public void unsetRefersToAbstractDataAttribute() { msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, AbstractDataAttribute.class, msgs ); msgs = basicUnsetRefersToAbstractDataAttribute( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet; refersToAbstractDataAttributeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null, oldRefersToAbstractDataAttributeESet ) ); + } } } @@ -777,17 +817,20 @@ public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, N case SclPackage.DAI__VAL: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getVal() ).basicAdd( otherEnd, msgs ); case SclPackage.DAI__PARENT_DOI: - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentDOI( ( DOI ) otherEnd, msgs ); case SclPackage.DAI__PARENT_SDI: - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentSDI( ( SDI ) otherEnd, msgs ); case SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE: - if( refersToAbstractDataAttribute != null ) + 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 ); @@ -976,34 +1019,46 @@ public boolean eIsSet( int featureID ) { */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (ix: " ); - if( ixESet ) + if( ixESet ) { result.append( ix ); - else + } + else { result.append( "" ); + } result.append( ", sAddr: " ); - if( sAddrESet ) + if( sAddrESet ) { result.append( sAddr ); - else + } + else { result.append( "" ); + } result.append( ", valImport: " ); - if( valImportESet ) + if( valImportESet ) { result.append( valImport ); - else + } + else { result.append( "" ); + } result.append( ", valKind: " ); - if( valKindESet ) + if( valKindESet ) { result.append( valKind ); - else + } + else { result.append( "" ); + } result.append( ", name: " ); - if( nameESet ) + if( nameESet ) { result.append( name ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @@ -1038,14 +1093,18 @@ private void doBuildExplicitLinkWithParentDOI( @NonNull IRiseClipseConsole conso @NonNull String messagePrefix ) { // No error or warning messages here: if this happens, error should have been detected before DO do_ = getParentDOI().getRefersToDO(); - if( do_ == null ) return; + if( do_ == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DO on line ", do_.getLineNumber() ); do_.buildExplicitLinks( console, false ); DOType dot = do_.getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before - if( dot == null ) return; + if( dot == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); @@ -1074,13 +1133,17 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso if( att == null ) { // SDI may refers also to an SDO SDO sdo = getParentSDI().getRefersToSDO(); - if( sdo == null ) return; + if( sdo == null ) { + return; + } sdo.buildExplicitLinks( console, false ); console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found SDO on line ", sdo.getLineNumber() ); DOType dot = sdo.getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before - if( dot == null ) return; + if( dot == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); @@ -1108,7 +1171,9 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso DAType dat = att.getRefersToDAType(); // No error or warning message here: if this happens, error should have been detected before - if( dat == null ) return; + if( dat == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DAType on line ", dat.getLineNumber() ); 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 b223675d..ce88ea13 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 @@ -242,8 +242,9 @@ public void setIx( Integer newIx ) { ix = newIx; boolean oldIxESet = ixESet; ixESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__IX, oldIx, ix, !oldIxESet ) ); + } } /** @@ -257,9 +258,10 @@ public void unsetIx() { boolean oldIxESet = ixESet; ix = IX_EDEFAULT; ixESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__IX, oldIx, IX_EDEFAULT, oldIxESet ) ); + } } /** @@ -279,7 +281,9 @@ public boolean isSetIx() { */ @Override public AnyLN getParentAnyLN() { - if( eContainerFeatureID() != SclPackage.DOI__PARENT_ANY_LN ) return null; + if( eContainerFeatureID() != SclPackage.DOI__PARENT_ANY_LN ) { + return null; + } return ( AnyLN ) eInternalContainer(); } @@ -302,20 +306,26 @@ public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, Notification public void setParentAnyLN( AnyLN newParentAnyLN ) { if( newParentAnyLN != eInternalContainer() || ( eContainerFeatureID() != SclPackage.DOI__PARENT_ANY_LN && newParentAnyLN != null ) ) { - if( EcoreUtil.isAncestor( this, newParentAnyLN ) ) + if( EcoreUtil.isAncestor( this, newParentAnyLN ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentAnyLN != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN ) ); + } } /** @@ -339,7 +349,9 @@ public EList< DAI > getDAI() { */ @Override public void unsetDAI() { - if( dai != null ) ( ( InternalEList.Unsettable< ? > ) dai ).unset(); + if( dai != null ) { + ( ( InternalEList.Unsettable< ? > ) dai ).unset(); + } } /** @@ -373,7 +385,9 @@ public EList< SDI > getSDI() { */ @Override public void unsetSDI() { - if( sdi != null ) ( ( InternalEList.Unsettable< ? > ) sdi ).unset(); + if( sdi != null ) { + ( ( InternalEList.Unsettable< ? > ) sdi ).unset(); + } } /** @@ -407,9 +421,10 @@ public void setAccessControl( String newAccessControl ) { accessControl = newAccessControl; boolean oldAccessControlESet = accessControlESet; accessControlESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__ACCESS_CONTROL, oldAccessControl, accessControl, !oldAccessControlESet ) ); + } } /** @@ -423,9 +438,10 @@ public void unsetAccessControl() { boolean oldAccessControlESet = accessControlESet; accessControl = ACCESS_CONTROL_EDEFAULT; accessControlESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__ACCESS_CONTROL, oldAccessControl, ACCESS_CONTROL_EDEFAULT, oldAccessControlESet ) ); + } } /** @@ -459,9 +475,10 @@ public void setName( String newName ) { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__NAME, oldName, name, !oldNameESet ) ); + } } /** @@ -475,9 +492,10 @@ public void unsetName() { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + } } /** @@ -513,10 +531,12 @@ public NotificationChain basicSetRefersToDO( DO newRefersToDO, NotificationChain if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.DOI__REFERS_TO_DO, oldRefersToDO, newRefersToDO, !oldRefersToDOESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -530,21 +550,26 @@ public NotificationChain basicSetRefersToDO( DO newRefersToDO, NotificationChain public void setRefersToDO( DO newRefersToDO ) { if( newRefersToDO != refersToDO ) { NotificationChain msgs = null; - if( refersToDO != null ) + if( refersToDO != null ) { msgs = ( ( InternalEObject ) refersToDO ).eInverseRemove( this, SclPackage.DO__REFERRED_BY_DOI, DO.class, msgs ); - if( newRefersToDO != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToDOESet = refersToDOESet; refersToDOESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DOI__REFERS_TO_DO, newRefersToDO, newRefersToDO, !oldRefersToDOESet ) ); + } } } @@ -561,10 +586,12 @@ public NotificationChain basicUnsetRefersToDO( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__REFERS_TO_DO, oldRefersToDO, null, oldRefersToDOESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -581,14 +608,17 @@ public void unsetRefersToDO() { msgs = ( ( InternalEObject ) refersToDO ).eInverseRemove( this, SclPackage.DO__REFERRED_BY_DOI, DO.class, msgs ); msgs = basicUnsetRefersToDO( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToDOESet = refersToDOESet; refersToDOESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DOI__REFERS_TO_DO, null, null, oldRefersToDOESet ) ); + } } } @@ -668,17 +698,19 @@ public String getNamespace() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.DOI__PARENT_ANY_LN: - if( eInternalContainer() != null ) + 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 ) + 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 ); @@ -886,24 +918,32 @@ public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (ix: " ); - if( ixESet ) + if( ixESet ) { result.append( ix ); - else + } + else { result.append( "" ); + } result.append( ", accessControl: " ); - if( accessControlESet ) + if( accessControlESet ) { result.append( accessControl ); - else + } + else { result.append( "" ); + } result.append( ", name: " ); - if( nameESet ) + if( nameESet ) { result.append( name ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @@ -924,7 +964,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } // No error or warning message here: if this happens, error should have been detected before - if( ( getParentAnyLN() == null ) || ( getParentAnyLN().getRefersToLNodeType() == null ) ) return; + if( ( getParentAnyLN() == null ) || ( getParentAnyLN().getRefersToLNodeType() == null ) ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LNodeType on line ", getParentAnyLN().getRefersToLNodeType().getLineNumber() ); 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 34a2338c..c6a3122f 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 @@ -181,9 +181,10 @@ public void setTransient( Boolean newTransient ) { transient_ = newTransient; boolean oldTransientESet = transientESet; transientESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO__TRANSIENT, oldTransient, transient_, !oldTransientESet ) ); + } } /** @@ -197,9 +198,10 @@ public void unsetTransient() { boolean oldTransientESet = transientESet; transient_ = TRANSIENT_EDEFAULT; transientESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DO__TRANSIENT, oldTransient, TRANSIENT_EDEFAULT, oldTransientESet ) ); + } } /** @@ -219,7 +221,9 @@ public boolean isSetTransient() { */ @Override public LNodeType getParentLNodeType() { - if( eContainerFeatureID() != SclPackage.DO__PARENT_LNODE_TYPE ) return null; + if( eContainerFeatureID() != SclPackage.DO__PARENT_LNODE_TYPE ) { + return null; + } return ( LNodeType ) eInternalContainer(); } @@ -242,20 +246,26 @@ public NotificationChain basicSetParentLNodeType( LNodeType newParentLNodeType, public void setParentLNodeType( LNodeType newParentLNodeType ) { if( newParentLNodeType != eInternalContainer() || ( eContainerFeatureID() != SclPackage.DO__PARENT_LNODE_TYPE && newParentLNodeType != null ) ) { - if( EcoreUtil.isAncestor( this, newParentLNodeType ) ) + if( EcoreUtil.isAncestor( this, newParentLNodeType ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentLNodeType != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO__PARENT_LNODE_TYPE, newParentLNodeType, newParentLNodeType ) ); + } } /** @@ -279,9 +289,10 @@ public void setAccessControl( String newAccessControl ) { accessControl = newAccessControl; boolean oldAccessControlESet = accessControlESet; accessControlESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.DO__ACCESS_CONTROL, oldAccessControl, accessControl, !oldAccessControlESet ) ); + } } /** @@ -295,9 +306,10 @@ public void unsetAccessControl() { boolean oldAccessControlESet = accessControlESet; accessControl = ACCESS_CONTROL_EDEFAULT; accessControlESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.DO__ACCESS_CONTROL, oldAccessControl, ACCESS_CONTROL_EDEFAULT, oldAccessControlESet ) ); + } } /** @@ -331,7 +343,9 @@ public EList< DOI > getReferredByDOI() { */ @Override public void unsetReferredByDOI() { - if( referredByDOI != null ) ( ( InternalEList.Unsettable< ? > ) referredByDOI ).unset(); + if( referredByDOI != null ) { + ( ( InternalEList.Unsettable< ? > ) referredByDOI ).unset(); + } } /** @@ -354,8 +368,9 @@ public boolean isSetReferredByDOI() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.DO__PARENT_LNODE_TYPE: - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentLNodeType( ( LNodeType ) otherEnd, msgs ); case SclPackage.DO__REFERRED_BY_DOI: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredByDOI() ) @@ -531,19 +546,25 @@ public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (transient: " ); - if( transientESet ) + if( transientESet ) { result.append( transient_ ); - else + } + else { result.append( "" ); + } result.append( ", accessControl: " ); - if( accessControlESet ) + if( accessControlESet ) { result.append( accessControl ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @@ -570,7 +591,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } // No error or warning message here: if this happens, error should have been detected before DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); - if( dtt == null ) return; + if( dtt == null ) { + return; + } List< DOType > res = dtt .getDOType() @@ -600,7 +623,9 @@ public String getNamespace() { if( getRefersToDOType() != null ) { String ns = getRefersToDOType().getNamespace(); - if( ns != null ) return ns; + if( ns != null ) { + return ns; + } } if( getParentLNodeType() != null ) { 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 91a78b08..eb8e54c6 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 @@ -27,7 +27,6 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -361,9 +360,10 @@ public void setDaName( String newDaName ) { daName = newDaName; boolean oldDaNameESet = daNameESet; daNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__DA_NAME, oldDaName, daName, !oldDaNameESet ) ); + } } /** @@ -377,9 +377,10 @@ public void unsetDaName() { boolean oldDaNameESet = daNameESet; daName = DA_NAME_EDEFAULT; daNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__DA_NAME, oldDaName, DA_NAME_EDEFAULT, oldDaNameESet ) ); + } } /** @@ -413,9 +414,10 @@ public void setDoName( String newDoName ) { doName = newDoName; boolean oldDoNameESet = doNameESet; doNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__DO_NAME, oldDoName, doName, !oldDoNameESet ) ); + } } /** @@ -429,9 +431,10 @@ public void unsetDoName() { boolean oldDoNameESet = doNameESet; doName = DO_NAME_EDEFAULT; doNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__DO_NAME, oldDoName, DO_NAME_EDEFAULT, oldDoNameESet ) ); + } } /** @@ -465,8 +468,9 @@ public void setFc( FCEnum newFc ) { fc = newFc == null ? FC_EDEFAULT : newFc; boolean oldFcESet = fcESet; fcESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__FC, oldFc, fc, !oldFcESet ) ); + } } /** @@ -480,9 +484,10 @@ public void unsetFc() { boolean oldFcESet = fcESet; fc = FC_EDEFAULT; fcESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__FC, oldFc, FC_EDEFAULT, oldFcESet ) ); + } } /** @@ -516,8 +521,9 @@ public void setIx( Integer newIx ) { ix = newIx; boolean oldIxESet = ixESet; ixESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__IX, oldIx, ix, !oldIxESet ) ); + } } /** @@ -531,9 +537,10 @@ public void unsetIx() { boolean oldIxESet = ixESet; ix = IX_EDEFAULT; ixESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__IX, oldIx, IX_EDEFAULT, oldIxESet ) ); + } } /** @@ -567,9 +574,10 @@ public void setLdInst( String newLdInst ) { ldInst = newLdInst; boolean oldLdInstESet = ldInstESet; ldInstESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__LD_INST, oldLdInst, ldInst, !oldLdInstESet ) ); + } } /** @@ -583,9 +591,10 @@ public void unsetLdInst() { boolean oldLdInstESet = ldInstESet; ldInst = LD_INST_EDEFAULT; ldInstESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet ) ); + } } /** @@ -619,9 +628,10 @@ public void setLnClass( String newLnClass ) { lnClass = newLnClass; boolean oldLnClassESet = lnClassESet; lnClassESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet ) ); + } } /** @@ -635,9 +645,10 @@ public void unsetLnClass() { boolean oldLnClassESet = lnClassESet; lnClass = LN_CLASS_EDEFAULT; lnClassESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet ) ); + } } /** @@ -671,9 +682,10 @@ public void setLnInst( String newLnInst ) { lnInst = newLnInst; boolean oldLnInstESet = lnInstESet; lnInstESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__LN_INST, oldLnInst, lnInst, !oldLnInstESet ) ); + } } /** @@ -687,9 +699,10 @@ public void unsetLnInst() { boolean oldLnInstESet = lnInstESet; lnInst = LN_INST_EDEFAULT; lnInstESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet ) ); + } } /** @@ -723,9 +736,10 @@ public void setPrefix( String newPrefix ) { prefix = newPrefix; boolean oldPrefixESet = prefixESet; prefixESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__PREFIX, oldPrefix, prefix, !oldPrefixESet ) ); + } } /** @@ -739,9 +753,10 @@ public void unsetPrefix() { boolean oldPrefixESet = prefixESet; prefix = PREFIX_EDEFAULT; prefixESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.FCDA__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet ) ); + } } /** @@ -761,7 +776,9 @@ public boolean isSetPrefix() { */ @Override public DataSet getParentDataSet() { - if( eContainerFeatureID() != SclPackage.FCDA__PARENT_DATA_SET ) return null; + if( eContainerFeatureID() != SclPackage.FCDA__PARENT_DATA_SET ) { + return null; + } return ( DataSet ) eInternalContainer(); } @@ -784,20 +801,26 @@ public NotificationChain basicSetParentDataSet( DataSet newParentDataSet, Notifi public void setParentDataSet( DataSet newParentDataSet ) { if( newParentDataSet != eInternalContainer() || ( eContainerFeatureID() != SclPackage.FCDA__PARENT_DATA_SET && newParentDataSet != null ) ) { - if( EcoreUtil.isAncestor( this, newParentDataSet ) ) + if( EcoreUtil.isAncestor( this, newParentDataSet ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentDataSet != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.FCDA__PARENT_DATA_SET, newParentDataSet, newParentDataSet ) ); + } } /** @@ -822,8 +845,9 @@ public EList< AbstractDataAttribute > getRefersToAbstractDataAttribute() { */ @Override public void unsetRefersToAbstractDataAttribute() { - if( refersToAbstractDataAttribute != null ) + if( refersToAbstractDataAttribute != null ) { ( ( InternalEList.Unsettable< ? > ) refersToAbstractDataAttribute ).unset(); + } } /** @@ -847,8 +871,9 @@ public boolean isSetRefersToAbstractDataAttribute() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.FCDA__PARENT_DATA_SET: - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentDataSet( ( DataSet ) otherEnd, msgs ); case SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getRefersToAbstractDataAttribute() ) @@ -1044,49 +1069,67 @@ public boolean eIsSet( int featureID ) { */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (daName: " ); - if( daNameESet ) + if( daNameESet ) { result.append( daName ); - else + } + else { result.append( "" ); + } result.append( ", doName: " ); - if( doNameESet ) + if( doNameESet ) { result.append( doName ); - else + } + else { result.append( "" ); + } result.append( ", fc: " ); - if( fcESet ) + if( fcESet ) { result.append( fc ); - else + } + else { result.append( "" ); + } result.append( ", ix: " ); - if( ixESet ) + if( ixESet ) { result.append( ix ); - else + } + else { result.append( "" ); + } result.append( ", ldInst: " ); - if( ldInstESet ) + if( ldInstESet ) { result.append( ldInst ); - else + } + else { result.append( "" ); + } result.append( ", lnClass: " ); - if( lnClassESet ) + if( lnClassESet ) { result.append( lnClass ); - else + } + else { result.append( "" ); + } result.append( ", lnInst: " ); - if( lnInstESet ) + if( lnInstESet ) { result.append( lnInst ); - else + } + else { result.append( "" ); + } result.append( ", prefix: " ); - if( prefixESet ) + if( prefixESet ) { result.append( prefix ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @@ -1164,7 +1207,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String mess = " LN( lnClass = " + getLnClass(); if( getLnInst() != null ) { mess += ", inst = " + getLnInst(); - if( getPrefix() != "" ) mess += ", prefix = " + getPrefix(); + if( getPrefix() != "" ) { + mess += ", prefix = " + getPrefix(); + } } mess += " )"; if( anyLN.getLeft() == null ) { @@ -1177,7 +1222,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { messagePrefix, "found ", mess, " on line ", anyLN.getLeft().getLineNumber() ); anyLN.getLeft().buildExplicitLinks( console, false ); - if( anyLN.getLeft().getRefersToLNodeType() == null ) return; + if( anyLN.getLeft().getRefersToLNodeType() == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LNodeType on line ", anyLN.getLeft().getRefersToLNodeType().getLineNumber() ); @@ -1212,7 +1259,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { res1.get( 0 ).buildExplicitLinks( console, false ); DOType doType = res1.get( 0 ).getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before - if( doType == null ) return; + if( doType == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); @@ -1237,7 +1286,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { res2.get( 0 ).buildExplicitLinks( console, false ); doType = res2.get( 0 ).getRefersToDOType(); - if( doType == null ) return; + if( doType == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); } @@ -1264,7 +1315,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { messagePrefix, "found SDO ( name = ", name, " ) in DOType on line ", res3.get( 0 ).getLineNumber() ); doType = res3.get( 0 ).getRefersToDOType(); - if( doType == null ) return; + if( doType == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); continue; @@ -1343,7 +1396,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } // All attributes with functional characteristic given by fc are selected. - if( getFc() == null ) return; + if( getFc() == null ) { + return; + } getRefersToAbstractDataAttribute().addAll( getAllDAInDOTypeWithFC( doType, getFc(), console )); 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 1a25135a..8dc351cf 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 @@ -24,7 +24,6 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; @@ -356,9 +355,10 @@ public void setBufTime( Integer newBufTime ) { bufTime = newBufTime; boolean oldBufTimeESet = bufTimeESet; bufTimeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__BUF_TIME, oldBufTime, bufTime, !oldBufTimeESet ) ); + } } /** @@ -372,9 +372,10 @@ public void unsetBufTime() { boolean oldBufTimeESet = bufTimeESet; bufTime = BUF_TIME_EDEFAULT; bufTimeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__BUF_TIME, oldBufTime, BUF_TIME_EDEFAULT, oldBufTimeESet ) ); + } } /** @@ -408,9 +409,10 @@ public void setLdInst( String newLdInst ) { ldInst = newLdInst; boolean oldLdInstESet = ldInstESet; ldInstESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LD_INST, oldLdInst, ldInst, !oldLdInstESet ) ); + } } /** @@ -424,9 +426,10 @@ public void unsetLdInst() { boolean oldLdInstESet = ldInstESet; ldInst = LD_INST_EDEFAULT; ldInstESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LD_INST, oldLdInst, LD_INST_EDEFAULT, oldLdInstESet ) ); + } } /** @@ -460,9 +463,10 @@ public void setLnClass( String newLnClass ) { lnClass = newLnClass; boolean oldLnClassESet = lnClassESet; lnClassESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LN_CLASS, oldLnClass, lnClass, !oldLnClassESet ) ); + } } /** @@ -476,9 +480,10 @@ public void unsetLnClass() { boolean oldLnClassESet = lnClassESet; lnClass = LN_CLASS_EDEFAULT; lnClassESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LN_CLASS, oldLnClass, LN_CLASS_EDEFAULT, oldLnClassESet ) ); + } } /** @@ -512,9 +517,10 @@ public void setLnInst( String newLnInst ) { lnInst = newLnInst; boolean oldLnInstESet = lnInstESet; lnInstESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LN_INST, oldLnInst, lnInst, !oldLnInstESet ) ); + } } /** @@ -528,9 +534,10 @@ public void unsetLnInst() { boolean oldLnInstESet = lnInstESet; lnInst = LN_INST_EDEFAULT; lnInstESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LN_INST, oldLnInst, LN_INST_EDEFAULT, oldLnInstESet ) ); + } } /** @@ -564,9 +571,10 @@ public void setLogEna( Boolean newLogEna ) { logEna = newLogEna; boolean oldLogEnaESet = logEnaESet; logEnaESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LOG_ENA, oldLogEna, logEna, !oldLogEnaESet ) ); + } } /** @@ -580,9 +588,10 @@ public void unsetLogEna() { boolean oldLogEnaESet = logEnaESet; logEna = LOG_ENA_EDEFAULT; logEnaESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LOG_ENA, oldLogEna, LOG_ENA_EDEFAULT, oldLogEnaESet ) ); + } } /** @@ -616,9 +625,10 @@ public void setLogName( String newLogName ) { logName = newLogName; boolean oldLogNameESet = logNameESet; logNameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__LOG_NAME, oldLogName, logName, !oldLogNameESet ) ); + } } /** @@ -632,9 +642,10 @@ public void unsetLogName() { boolean oldLogNameESet = logNameESet; logName = LOG_NAME_EDEFAULT; logNameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__LOG_NAME, oldLogName, LOG_NAME_EDEFAULT, oldLogNameESet ) ); + } } /** @@ -668,9 +679,10 @@ public void setPrefix( String newPrefix ) { prefix = newPrefix; boolean oldPrefixESet = prefixESet; prefixESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__PREFIX, oldPrefix, prefix, !oldPrefixESet ) ); + } } /** @@ -684,9 +696,10 @@ public void unsetPrefix() { boolean oldPrefixESet = prefixESet; prefix = PREFIX_EDEFAULT; prefixESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__PREFIX, oldPrefix, PREFIX_EDEFAULT, oldPrefixESet ) ); + } } /** @@ -720,9 +733,10 @@ public void setReasonCode( Boolean newReasonCode ) { reasonCode = newReasonCode; boolean oldReasonCodeESet = reasonCodeESet; reasonCodeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__REASON_CODE, oldReasonCode, reasonCode, !oldReasonCodeESet ) ); + } } /** @@ -736,9 +750,10 @@ public void unsetReasonCode() { boolean oldReasonCodeESet = reasonCodeESet; reasonCode = REASON_CODE_EDEFAULT; reasonCodeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__REASON_CODE, oldReasonCode, REASON_CODE_EDEFAULT, oldReasonCodeESet ) ); + } } /** @@ -758,7 +773,9 @@ public boolean isSetReasonCode() { */ @Override public AnyLN getParentAnyLN() { - if( eContainerFeatureID() != SclPackage.LOG_CONTROL__PARENT_ANY_LN ) return null; + if( eContainerFeatureID() != SclPackage.LOG_CONTROL__PARENT_ANY_LN ) { + return null; + } return ( AnyLN ) eInternalContainer(); } @@ -781,20 +798,26 @@ public NotificationChain basicSetParentAnyLN( AnyLN newParentAnyLN, Notification public void setParentAnyLN( AnyLN newParentAnyLN ) { if( newParentAnyLN != eInternalContainer() || ( eContainerFeatureID() != SclPackage.LOG_CONTROL__PARENT_ANY_LN && newParentAnyLN != null ) ) { - if( EcoreUtil.isAncestor( this, newParentAnyLN ) ) + if( EcoreUtil.isAncestor( this, newParentAnyLN ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentAnyLN != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__PARENT_ANY_LN, newParentAnyLN, newParentAnyLN ) ); + } } /** @@ -820,10 +843,12 @@ public NotificationChain basicSetRefersToLog( Log newRefersToLog, NotificationCh if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, oldRefersToLog, newRefersToLog, !oldRefersToLogESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -837,21 +862,26 @@ public NotificationChain basicSetRefersToLog( Log newRefersToLog, NotificationCh public void setRefersToLog( Log newRefersToLog ) { if( newRefersToLog != refersToLog ) { NotificationChain msgs = null; - if( refersToLog != null ) + if( refersToLog != null ) { msgs = ( ( InternalEObject ) refersToLog ).eInverseRemove( this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs ); - if( newRefersToLog != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToLogESet = refersToLogESet; refersToLogESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, newRefersToLog, newRefersToLog, !oldRefersToLogESet ) ); + } } } @@ -868,10 +898,12 @@ public NotificationChain basicUnsetRefersToLog( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, oldRefersToLog, null, oldRefersToLogESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -888,14 +920,17 @@ public void unsetRefersToLog() { msgs = ( ( InternalEObject ) refersToLog ).eInverseRemove( this, SclPackage.LOG__REFERRED_BY_LOG_CONTROL, Log.class, msgs ); msgs = basicUnsetRefersToLog( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToLogESet = refersToLogESet; refersToLogESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.LOG_CONTROL__REFERS_TO_LOG, null, null, oldRefersToLogESet ) ); + } } } @@ -918,13 +953,15 @@ public boolean isSetRefersToLog() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.LOG_CONTROL__PARENT_ANY_LN: - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentAnyLN( ( AnyLN ) otherEnd, msgs ); case SclPackage.LOG_CONTROL__REFERS_TO_LOG: - if( refersToLog != null ) + 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 ); @@ -1115,56 +1152,75 @@ public boolean eIsSet( int featureID ) { */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (bufTime: " ); - if( bufTimeESet ) + if( bufTimeESet ) { result.append( bufTime ); - else + } + else { result.append( "" ); + } result.append( ", ldInst: " ); - if( ldInstESet ) + if( ldInstESet ) { result.append( ldInst ); - else + } + else { result.append( "" ); + } result.append( ", lnClass: " ); - if( lnClassESet ) + if( lnClassESet ) { result.append( lnClass ); - else + } + else { result.append( "" ); + } result.append( ", lnInst: " ); - if( lnInstESet ) + if( lnInstESet ) { result.append( lnInst ); - else + } + else { result.append( "" ); + } result.append( ", logEna: " ); - if( logEnaESet ) + if( logEnaESet ) { result.append( logEna ); - else + } + else { result.append( "" ); + } result.append( ", logName: " ); - if( logNameESet ) + if( logNameESet ) { result.append( logName ); - else + } + else { result.append( "" ); + } result.append( ", prefix: " ); - if( prefixESet ) + if( prefixESet ) { result.append( prefix ); - else + } + else { result.append( "" ); + } result.append( ", reasonCode: " ); - if( reasonCodeESet ) + if( reasonCodeESet ) { result.append( reasonCode ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LogControlImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "LogControlImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1192,9 +1248,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // No error or warning messages here: if this happens, error should have been detected before IED ied = SclUtilities.getMyIED( this ); - if( ( ied == null ) || ( getParentAnyLN() == null ) ) return; + if( ( ied == null ) || ( getParentAnyLN() == null ) ) { + return; + } LDevice lDevice = getParentAnyLN().getParentLDevice(); - if( lDevice == null ) return; + if( lDevice == null ) { + return; + } if( ( getLdInst() != null ) && ( !getLdInst().isEmpty() ) ) { Pair< LDevice, Integer > lDevice1 = SclUtilities.getLDevice( ied, getLdInst() ); @@ -1214,7 +1274,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String mess = "AnyLN( lnClass = " + getLnClass(); if( getLnInst() != null ) { mess += ", inst = " + getLnInst(); - if( !"".equals( getPrefix() ) ) mess += ", prefix = " + getPrefix(); + if( !"".equals( getPrefix() ) ) { + mess += ", prefix = " + getPrefix(); + } } mess += " )"; if( anyLN.getLeft() == null ) { @@ -1227,8 +1289,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { "LogControl refers to ", mess, " on line ", anyLN.getLeft().getLineNumber() ); - List< Log > res = - anyLN.getLeft() + List< Log > res = anyLN.getLeft() .getLog() .stream() .filter( log -> getLogName().equals( log.getName() ) ) 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 983e35f4..c031f094 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 @@ -345,8 +345,9 @@ public void setIx( Integer newIx ) { ix = newIx; boolean oldIxESet = ixESet; ixESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__IX, oldIx, ix, !oldIxESet ) ); + } } /** @@ -360,9 +361,10 @@ public void unsetIx() { boolean oldIxESet = ixESet; ix = IX_EDEFAULT; ixESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__IX, oldIx, IX_EDEFAULT, oldIxESet ) ); + } } /** @@ -396,9 +398,10 @@ public void setSAddr( String newSAddr ) { sAddr = newSAddr; boolean oldSAddrESet = sAddrESet; sAddrESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__SADDR, oldSAddr, sAddr, !oldSAddrESet ) ); + } } /** @@ -412,9 +415,10 @@ public void unsetSAddr() { boolean oldSAddrESet = sAddrESet; sAddr = SADDR_EDEFAULT; sAddrESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__SADDR, oldSAddr, SADDR_EDEFAULT, oldSAddrESet ) ); + } } /** @@ -448,7 +452,9 @@ public EList< DAI > getDAI() { */ @Override public void unsetDAI() { - if( dai != null ) ( ( InternalEList.Unsettable< ? > ) dai ).unset(); + if( dai != null ) { + ( ( InternalEList.Unsettable< ? > ) dai ).unset(); + } } /** @@ -468,7 +474,9 @@ public boolean isSetDAI() { */ @Override public DOI getParentDOI() { - if( eContainerFeatureID() != SclPackage.SDI__PARENT_DOI ) return null; + if( eContainerFeatureID() != SclPackage.SDI__PARENT_DOI ) { + return null; + } return ( DOI ) eInternalContainer(); } @@ -491,19 +499,25 @@ public NotificationChain basicSetParentDOI( DOI newParentDOI, NotificationChain public void setParentDOI( DOI newParentDOI ) { if( newParentDOI != eInternalContainer() || ( eContainerFeatureID() != SclPackage.SDI__PARENT_DOI && newParentDOI != null ) ) { - if( EcoreUtil.isAncestor( this, newParentDOI ) ) + if( EcoreUtil.isAncestor( this, newParentDOI ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentDOI != null ) + } + if( newParentDOI != null ) { msgs = ( ( InternalEObject ) newParentDOI ).eInverseAdd( this, SclPackage.DOI__SDI, DOI.class, msgs ); + } msgs = basicSetParentDOI( newParentDOI, msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__PARENT_DOI, newParentDOI, newParentDOI ) ); + } } /** @@ -527,7 +541,9 @@ public EList< SDI > getSubSDI() { */ @Override public void unsetSubSDI() { - if( subSDI != null ) ( ( InternalEList.Unsettable< ? > ) subSDI ).unset(); + if( subSDI != null ) { + ( ( InternalEList.Unsettable< ? > ) subSDI ).unset(); + } } /** @@ -547,7 +563,9 @@ public boolean isSetSubSDI() { */ @Override public SDI getParentSDI() { - if( eContainerFeatureID() != SclPackage.SDI__PARENT_SDI ) return null; + if( eContainerFeatureID() != SclPackage.SDI__PARENT_SDI ) { + return null; + } return ( SDI ) eInternalContainer(); } @@ -570,20 +588,26 @@ public NotificationChain basicSetParentSDI( SDI newParentSDI, NotificationChain public void setParentSDI( SDI newParentSDI ) { if( newParentSDI != eInternalContainer() || ( eContainerFeatureID() != SclPackage.SDI__PARENT_SDI && newParentSDI != null ) ) { - if( EcoreUtil.isAncestor( this, newParentSDI ) ) + if( EcoreUtil.isAncestor( this, newParentSDI ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentSDI != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__PARENT_SDI, newParentSDI, newParentSDI ) ); + } } /** @@ -607,9 +631,10 @@ public void setName( String newName ) { name = newName; boolean oldNameESet = nameESet; nameESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__NAME, oldName, name, !oldNameESet ) ); + } } /** @@ -623,9 +648,10 @@ public void unsetName() { boolean oldNameESet = nameESet; name = NAME_EDEFAULT; nameESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__NAME, oldName, NAME_EDEFAULT, oldNameESet ) ); + } } /** @@ -661,10 +687,12 @@ public NotificationChain basicSetRefersToSDO( SDO newRefersToSDO, NotificationCh if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.SDI__REFERS_TO_SDO, oldRefersToSDO, newRefersToSDO, !oldRefersToSDOESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -678,21 +706,26 @@ public NotificationChain basicSetRefersToSDO( SDO newRefersToSDO, NotificationCh public void setRefersToSDO( SDO newRefersToSDO ) { if( newRefersToSDO != refersToSDO ) { NotificationChain msgs = null; - if( refersToSDO != null ) + if( refersToSDO != null ) { msgs = ( ( InternalEObject ) refersToSDO ).eInverseRemove( this, SclPackage.SDO__REFERRED_BY_SDI, SDO.class, msgs ); - if( newRefersToSDO != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToSDOESet = refersToSDOESet; refersToSDOESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__REFERS_TO_SDO, newRefersToSDO, newRefersToSDO, !oldRefersToSDOESet ) ); + } } } @@ -709,10 +742,12 @@ public NotificationChain basicUnsetRefersToSDO( NotificationChain msgs ) { if( eNotificationRequired() ) { ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__REFERS_TO_SDO, oldRefersToSDO, null, oldRefersToSDOESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -729,14 +764,17 @@ public void unsetRefersToSDO() { msgs = ( ( InternalEObject ) refersToSDO ).eInverseRemove( this, SclPackage.SDO__REFERRED_BY_SDI, SDO.class, msgs ); msgs = basicUnsetRefersToSDO( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToSDOESet = refersToSDOESet; refersToSDOESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__REFERS_TO_SDO, null, null, oldRefersToSDOESet ) ); + } } } @@ -775,10 +813,12 @@ public NotificationChain basicSetRefersToAbstractDataAttribute( ENotificationImpl notification = new ENotificationImpl( this, Notification.SET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -792,22 +832,27 @@ public NotificationChain basicSetRefersToAbstractDataAttribute( public void setRefersToAbstractDataAttribute( AbstractDataAttribute newRefersToAbstractDataAttribute ) { if( newRefersToAbstractDataAttribute != refersToAbstractDataAttribute ) { NotificationChain msgs = null; - if( refersToAbstractDataAttribute != null ) + if( refersToAbstractDataAttribute != null ) { msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs ); - if( newRefersToAbstractDataAttribute != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet; refersToAbstractDataAttributeESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, newRefersToAbstractDataAttribute, newRefersToAbstractDataAttribute, !oldRefersToAbstractDataAttributeESet ) ); + } } } @@ -825,10 +870,12 @@ public NotificationChain basicUnsetRefersToAbstractDataAttribute( NotificationCh ENotificationImpl notification = new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, oldRefersToAbstractDataAttribute, null, oldRefersToAbstractDataAttributeESet ); - if( msgs == null ) + if( msgs == null ) { msgs = notification; - else + } + else { msgs.add( notification ); + } } return msgs; } @@ -845,15 +892,18 @@ public void unsetRefersToAbstractDataAttribute() { msgs = ( ( InternalEObject ) refersToAbstractDataAttribute ).eInverseRemove( this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, AbstractDataAttribute.class, msgs ); msgs = basicUnsetRefersToAbstractDataAttribute( msgs ); - if( msgs != null ) msgs.dispatch(); + if( msgs != null ) { + msgs.dispatch(); + } } else { boolean oldRefersToAbstractDataAttributeESet = refersToAbstractDataAttributeESet; refersToAbstractDataAttributeESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE, null, null, oldRefersToAbstractDataAttributeESet ) ); + } } } @@ -879,25 +929,29 @@ public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, N case SclPackage.SDI__DAI: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getDAI() ).basicAdd( otherEnd, msgs ); case SclPackage.SDI__PARENT_DOI: - if( eInternalContainer() != null ) + 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 ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentSDI( ( SDI ) otherEnd, msgs ); case SclPackage.SDI__REFERS_TO_SDO: - if( refersToSDO != null ) + 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 ) + 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 ); @@ -1131,24 +1185,32 @@ public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (ix: " ); - if( ixESet ) + if( ixESet ) { result.append( ix ); - else + } + else { result.append( "" ); + } result.append( ", sAddr: " ); - if( sAddrESet ) + if( sAddrESet ) { result.append( sAddr ); - else + } + else { result.append( "" ); + } result.append( ", name: " ); - if( nameESet ) + if( nameESet ) { result.append( name ); - else + } + else { result.append( "" ); + } result.append( ')' ); return result.toString(); } @@ -1182,14 +1244,18 @@ else if( getParentSDI() != null ) { private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { DO do_ = getParentDOI().getRefersToDO(); // No error or warning message here: if this happens, error should have been detected before - if( do_ == null ) return; + if( do_ == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DO on line ", do_.getLineNumber() ); do_.buildExplicitLinks( console, false ); DOType dot = do_.getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before - if( dot == null ) return; + if( dot == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); @@ -1247,7 +1313,9 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N DOType dot = sdo.getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before - if( dot == null ) return; + if( dot == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); @@ -1309,7 +1377,9 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N att.buildExplicitLinks( console, false ); DAType dat = att.getRefersToDAType(); // No error or warning message here: if this happens, error should have been detected before - if( dat == null ) return; + if( dat == null ) { + return; + } console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DAType on line ", dat.getLineNumber() ); 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 9a1b4192..da3513e0 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 @@ -174,9 +174,10 @@ public void setCount( String newCount ) { count = newCount; boolean oldCountESet = countESet; countESet = true; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDO__COUNT, oldCount, count, !oldCountESet ) ); + } } /** @@ -190,9 +191,10 @@ public void unsetCount() { boolean oldCountESet = countESet; count = COUNT_EDEFAULT; countESet = false; - if( eNotificationRequired() ) + if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.UNSET, SclPackage.SDO__COUNT, oldCount, COUNT_EDEFAULT, oldCountESet ) ); + } } /** @@ -212,7 +214,9 @@ public boolean isSetCount() { */ @Override public DOType getParentDOType() { - if( eContainerFeatureID() != SclPackage.SDO__PARENT_DO_TYPE ) return null; + if( eContainerFeatureID() != SclPackage.SDO__PARENT_DO_TYPE ) { + return null; + } return ( DOType ) eInternalContainer(); } @@ -235,20 +239,26 @@ public NotificationChain basicSetParentDOType( DOType newParentDOType, Notificat public void setParentDOType( DOType newParentDOType ) { if( newParentDOType != eInternalContainer() || ( eContainerFeatureID() != SclPackage.SDO__PARENT_DO_TYPE && newParentDOType != null ) ) { - if( EcoreUtil.isAncestor( this, newParentDOType ) ) + if( EcoreUtil.isAncestor( this, newParentDOType ) ) { throw new IllegalArgumentException( "Recursive containment not allowed for " + toString() ); + } NotificationChain msgs = null; - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); - if( newParentDOType != null ) + } + 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( msgs != null ) { + msgs.dispatch(); + } } - else if( eNotificationRequired() ) + else if( eNotificationRequired() ) { eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SDO__PARENT_DO_TYPE, newParentDOType, newParentDOType ) ); + } } /** @@ -272,7 +282,9 @@ public EList< SDI > getReferredBySDI() { */ @Override public void unsetReferredBySDI() { - if( referredBySDI != null ) ( ( InternalEList.Unsettable< ? > ) referredBySDI ).unset(); + if( referredBySDI != null ) { + ( ( InternalEList.Unsettable< ? > ) referredBySDI ).unset(); + } } /** @@ -295,8 +307,9 @@ public boolean isSetReferredBySDI() { public NotificationChain eInverseAdd( InternalEObject otherEnd, int featureID, NotificationChain msgs ) { switch( featureID ) { case SclPackage.SDO__PARENT_DO_TYPE: - if( eInternalContainer() != null ) + if( eInternalContainer() != null ) { msgs = eBasicRemoveFromContainer( msgs ); + } return basicSetParentDOType( ( DOType ) otherEnd, msgs ); case SclPackage.SDO__REFERRED_BY_SDI: return ( ( InternalEList< InternalEObject > ) ( InternalEList< ? > ) getReferredBySDI() ) @@ -462,14 +475,18 @@ public int eDerivedStructuralFeatureID( int baseFeatureID, Class< ? > baseClass */ @Override public String toString() { - if( eIsProxy() ) return super.toString(); + if( eIsProxy() ) { + return super.toString(); + } StringBuilder result = new StringBuilder( super.toString() ); result.append( " (count: " ); - if( countESet ) + if( countESet ) { result.append( count ); - else + } + else { result.append( "" ); + } 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 cab496a5..f65e3b6f 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 @@ -1378,7 +1378,9 @@ private SclPackageImpl() { * @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 ); @@ -10996,13 +10998,15 @@ public SclFactory getSclFactory() { private boolean isLoaded = false; /** - * Laods the package and any sub-packages from their serialized form. + * Loads the package and any sub-packages from their serialized form. * * * @generated */ public void loadPackage() { - if( isLoaded ) return; + if( isLoaded ) { + return; + } isLoaded = true; URL url = getClass().getResource( packageFilename ); @@ -11035,7 +11039,9 @@ public void loadPackage() { * @generated */ public void fixPackageContents() { - if( isFixed ) return; + if( isFixed ) { + return; + } isFixed = true; fixEClassifiers(); } From 0b53a00927f38018d36e90b2906bf1e2dfb84d02 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Wed, 24 Jan 2024 14:16:10 +0100 Subject: [PATCH 6/7] improve display when using as Eclipse plugin --- .../plugin.properties | 1946 ++++++++--------- .../provider/AuthenticationItemProvider.java | 6 +- .../provider/ClientServicesItemProvider.java | 6 +- .../provider/CommunicationItemProvider.java | 6 +- .../scl/provider/DATypeItemProvider.java | 20 +- .../scl/provider/DOTypeItemProvider.java | 25 +- .../DataTypeTemplatesItemProvider.java | 6 +- .../scl/provider/EnumTypeItemProvider.java | 20 +- .../scl/provider/EnumValItemProvider.java | 20 +- .../scl/provider/FCDAItemProvider.java | 6 +- .../scl/provider/HeaderItemProvider.java | 6 +- .../scl/provider/IEDItemProvider.java | 25 +- .../scl/provider/LDeviceItemProvider.java | 20 +- .../scl/provider/LN0ItemProvider.java | 20 +- .../iec61850/scl/provider/LNItemProvider.java | 25 +- .../scl/provider/LNodeTypeItemProvider.java | 20 +- .../scl/provider/PrivateItemProvider.java | 20 +- .../scl/provider/RedProtItemProvider.java | 6 +- .../scl/provider/SCLItemProvider.java | 6 +- .../scl/provider/ServerAtItemProvider.java | 20 +- .../scl/provider/ServerItemProvider.java | 6 +- .../scl/provider/ServicesItemProvider.java | 6 +- .../provider/SettingControlItemProvider.java | 6 +- .../provider/TimeSyncProtItemProvider.java | 6 +- .../scl/provider/ValItemProvider.java | 8 +- 25 files changed, 1192 insertions(+), 1069 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties index 431e11ed..93a389e1 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties @@ -29,11 +29,11 @@ _UI_CreateSibling_description = Create a new sibling of type {0} for the selecte _UI_PropertyDescriptor_description = The {0} of the {1} -_UI_BaseElement_type = Base Element +_UI_BaseElement_type = BaseElement _UI_Header_type = Header _UI_History_type = History _UI_Hitem_type = Hitem -_UI_IDNaming_type = ID Naming +_UI_IDNaming_type = IDNaming _UI_Line_type = Line _UI_Naming_type = Naming _UI_Private_type = Private @@ -42,745 +42,745 @@ _UI_SCL_type = SCL _UI_Text_type = Text _UI_Address_type = Address _UI_Communication_type = Communication -_UI_ConnectedAP_type = Connected AP -_UI_ControlBlock_type = Control Block +_UI_ConnectedAP_type = ConnectedAP +_UI_ControlBlock_type = ControlBlock _UI_GSE_type = GSE _UI_P_type = P _UI_PAddr_type = PAddr -_UI_P_PhysConn_type = PPhys Conn -_UI_PhysConn_type = Phys Conn +_UI_P_PhysConn_type = PPhysConn +_UI_PhysConn_type = PhysConn _UI_SMV_type = SMV -_UI_SubNetwork_type = Sub Network -_UI_AbstractDataAttribute_type = Abstract Data Attribute +_UI_SubNetwork_type = SubNetwork +_UI_AbstractDataAttribute_type = AbstractDataAttribute _UI_BDA_type = BDA _UI_DA_type = DA -_UI_DAType_type = DA Type +_UI_DAType_type = DAType _UI_DO_type = DO -_UI_DOType_type = DO Type -_UI_DataTypeTemplates_type = Data Type Templates -_UI_EnumType_type = Enum Type -_UI_EnumVal_type = Enum Val -_UI_LNodeType_type = LNode Type -_UI_ProtNs_type = Prot Ns +_UI_DOType_type = DOType +_UI_DataTypeTemplates_type = DataTypeTemplates +_UI_EnumType_type = EnumType +_UI_EnumVal_type = EnumVal +_UI_LNodeType_type = LNodeType +_UI_ProtNs_type = ProtNs _UI_SDO_type = SDO _UI_Val_type = Val -_UI_BitRateInMbPerSec_type = Bit Rate In Mb Per Sec -_UI_DurationInMilliSec_type = Duration In Milli Sec -_UI_AccessControl_type = Access Control -_UI_AccessPoint_type = Access Point -_UI_AnyLN_type = Any LN +_UI_BitRateInMbPerSec_type = BitRateInMbPerSec +_UI_DurationInMilliSec_type = DurationInMilliSec +_UI_AccessControl_type = AccessControl +_UI_AccessPoint_type = AccessPoint +_UI_AnyLN_type = AnyLN _UI_Association_type = Association _UI_Authentication_type = Authentication _UI_Certificate_type = Certificate -_UI_ClientLN_type = Client LN -_UI_ClientServices_type = Client Services -_UI_CommProt_type = Comm Prot -_UI_ConfDataSet_type = Conf Data Set -_UI_ConfLNs_type = Conf LNs -_UI_ConfLdName_type = Conf Ld Name -_UI_ConfLogControl_type = Conf Log Control -_UI_ConfReportControl_type = Conf Report Control -_UI_ConfSG_type = Conf SG -_UI_ConfSigRef_type = Conf Sig Ref +_UI_ClientLN_type = ClientLN +_UI_ClientServices_type = ClientServices +_UI_CommProt_type = CommProt +_UI_ConfDataSet_type = ConfDataSet +_UI_ConfLNs_type = ConfLNs +_UI_ConfLdName_type = ConfLdName +_UI_ConfLogControl_type = ConfLogControl +_UI_ConfReportControl_type = ConfReportControl +_UI_ConfSG_type = ConfSG +_UI_ConfSigRef_type = ConfSigRef _UI_Control_type = Control -_UI_ControlWithIEDName_type = Control With IED Name -_UI_ControlWithTriggerOpt_type = Control With Trigger Opt +_UI_ControlWithIEDName_type = ControlWithIEDName +_UI_ControlWithTriggerOpt_type = ControlWithTriggerOpt _UI_DAI_type = DAI _UI_DOI_type = DOI -_UI_DataObjectDirectory_type = Data Object Directory -_UI_DataSet_type = Data Set -_UI_DataSetDirectory_type = Data Set Directory -_UI_DynAssociation_type = Dyn Association -_UI_DynDataSet_type = Dyn Data Set -_UI_ExtRef_type = Ext Ref +_UI_DataObjectDirectory_type = DataObjectDirectory +_UI_DataSet_type = DataSet +_UI_DataSetDirectory_type = DataSetDirectory +_UI_DynAssociation_type = DynAssociation +_UI_DynDataSet_type = DynDataSet +_UI_ExtRef_type = ExtRef _UI_FCDA_type = FCDA -_UI_FileHandling_type = File Handling +_UI_FileHandling_type = FileHandling _UI_GOOSE_type = GOOSE -_UI_GOOSESecurity_type = GOOSE Security -_UI_GSEControl_type = GSE Control -_UI_GSEDir_type = GSE Dir -_UI_GSESettings_type = GSE Settings +_UI_GOOSESecurity_type = GOOSESecurity +_UI_GSEControl_type = GSEControl +_UI_GSEDir_type = GSEDir +_UI_GSESettings_type = GSESettings _UI_GSSE_type = GSSE -_UI_GetCBValues_type = Get CB Values -_UI_GetDataObjectDefinition_type = Get Data Object Definition -_UI_GetDataSetValue_type = Get Data Set Value -_UI_GetDirectory_type = Get Directory +_UI_GetCBValues_type = GetCBValues +_UI_GetDataObjectDefinition_type = GetDataObjectDefinition +_UI_GetDataSetValue_type = GetDataSetValue +_UI_GetDirectory_type = GetDirectory _UI_IED_type = IED -_UI_IEDName_type = IED Name +_UI_IEDName_type = IEDName _UI_Inputs_type = Inputs -_UI_IssuerName_type = Issuer Name +_UI_IssuerName_type = IssuerName _UI_KDC_type = KDC _UI_LDevice_type = LDevice _UI_LN_type = LN _UI_LN0_type = LN0 _UI_Log_type = Log -_UI_LogControl_type = Log Control -_UI_LogSettings_type = Log Settings -_UI_OptFields_type = Opt Fields +_UI_LogControl_type = LogControl +_UI_LogSettings_type = LogSettings +_UI_OptFields_type = OptFields _UI_Protocol_type = Protocol -_UI_ReadWrite_type = Read Write -_UI_RedProt_type = Red Prot -_UI_ReportControl_type = Report Control -_UI_ReportSettings_type = Report Settings -_UI_RptEnabled_type = Rpt Enabled +_UI_ReadWrite_type = ReadWrite +_UI_RedProt_type = RedProt +_UI_ReportControl_type = ReportControl +_UI_ReportSettings_type = ReportSettings +_UI_RptEnabled_type = RptEnabled _UI_SDI_type = SDI -_UI_SGEdit_type = SG Edit -_UI_SMVSecurity_type = SMV Security -_UI_SMVSettings_type = SMV Settings -_UI_SMVsc_type = SM Vsc -_UI_SampledValueControl_type = Sampled Value Control +_UI_SGEdit_type = SGEdit +_UI_SMVSecurity_type = SMVSecurity +_UI_SMVSettings_type = SMVSettings +_UI_SMVsc_type = SMVsc +_UI_SampledValueControl_type = SampledValueControl _UI_Server_type = Server -_UI_ServerAt_type = Server At -_UI_ServiceSettings_type = Service Settings -_UI_ServiceWithMax_type = Service With Max +_UI_ServerAt_type = ServerAt +_UI_ServiceSettings_type = ServiceSettings +_UI_ServiceWithMax_type = ServiceWithMax _UI_Services_type = Services -_UI_SetDataSetValue_type = Set Data Set Value -_UI_SettingControl_type = Setting Control -_UI_SettingGroups_type = Setting Groups -_UI_SmvOpts_type = Smv Opts +_UI_SetDataSetValue_type = SetDataSetValue +_UI_SettingControl_type = SettingControl +_UI_SettingGroups_type = SettingGroups +_UI_SmvOpts_type = SmvOpts _UI_Subject_type = Subject -_UI_SupSubscription_type = Sup Subscription -_UI_TimeSyncProt_type = Time Sync Prot -_UI_TimerActivatedControl_type = Timer Activated Control -_UI_TrgOps_type = Trg Ops -_UI_ValueHandling_type = Value Handling -_UI_AbstractConductingEquipment_type = Abstract Conducting Equipment -_UI_AbstractEqFuncSubFunc_type = Abstract Eq Func Sub Func +_UI_SupSubscription_type = SupSubscription +_UI_TimeSyncProt_type = TimeSyncProt +_UI_TimerActivatedControl_type = TimerActivatedControl +_UI_TrgOps_type = TrgOps +_UI_ValueHandling_type = ValueHandling +_UI_AbstractConductingEquipment_type = AbstractConductingEquipment +_UI_AbstractEqFuncSubFunc_type = AbstractEqFuncSubFunc _UI_Bay_type = Bay -_UI_ConductingEquipment_type = Conducting Equipment -_UI_ConnectivityNode_type = Connectivity Node -_UI_EqFunction_type = Eq Function -_UI_EqSubFunction_type = Eq Sub Function +_UI_ConductingEquipment_type = ConductingEquipment +_UI_ConnectivityNode_type = ConnectivityNode +_UI_EqFunction_type = EqFunction +_UI_EqSubFunction_type = EqSubFunction _UI_Equipment_type = Equipment -_UI_EquipmentContainer_type = Equipment Container +_UI_EquipmentContainer_type = EquipmentContainer _UI_Function_type = Function -_UI_GeneralEquipment_type = General Equipment -_UI_GeneralEquipmentContainer_type = General Equipment Container +_UI_GeneralEquipment_type = GeneralEquipment +_UI_GeneralEquipmentContainer_type = GeneralEquipmentContainer _UI_LNode_type = LNode -_UI_LNodeContainer_type = LNode Container -_UI_NeutralPoint_type = Neutral Point -_UI_PowerSystemResource_type = Power System Resource -_UI_PowerTransformer_type = Power Transformer -_UI_SubEquipment_type = Sub Equipment -_UI_SubFunction_type = Sub Function +_UI_LNodeContainer_type = LNodeContainer +_UI_NeutralPoint_type = NeutralPoint +_UI_PowerSystemResource_type = PowerSystemResource +_UI_PowerTransformer_type = PowerTransformer +_UI_SubEquipment_type = SubEquipment +_UI_SubFunction_type = SubFunction _UI_Substation_type = Substation -_UI_TapChanger_type = Tap Changer +_UI_TapChanger_type = TapChanger _UI_Terminal_type = Terminal -_UI_TransformerWinding_type = Transformer Winding +_UI_TransformerWinding_type = TransformerWinding _UI_Voltage_type = Voltage -_UI_VoltageLevel_type = Voltage Level +_UI_VoltageLevel_type = VoltageLevel _UI_Unknown_type = Object _UI_Unknown_datatype= Value -_UI_BaseElement_desc_feature = Desc +_UI_BaseElement_desc_feature = desc _UI_BaseElement_Private_feature = Private _UI_BaseElement_Text_feature = Text -_UI_Header_id_feature = Id -_UI_Header_nameStructure_feature = Name Structure -_UI_Header_revision_feature = Revision -_UI_Header_toolID_feature = Tool ID -_UI_Header_version_feature = Version +_UI_Header_id_feature = id +_UI_Header_nameStructure_feature = nameStructure +_UI_Header_revision_feature = revision +_UI_Header_toolID_feature = toolID +_UI_Header_version_feature = version _UI_Header_SCL_feature = SCL _UI_Header_Text_feature = Text _UI_Header_History_feature = History _UI_History_Header_feature = Header _UI_History_Hitem_feature = Hitem -_UI_Hitem_revision_feature = Revision -_UI_Hitem_version_feature = Version -_UI_Hitem_what_feature = What -_UI_Hitem_when_feature = When -_UI_Hitem_who_feature = Who -_UI_Hitem_why_feature = Why +_UI_Hitem_revision_feature = revision +_UI_Hitem_version_feature = version +_UI_Hitem_what_feature = what +_UI_Hitem_when_feature = when +_UI_Hitem_who_feature = who +_UI_Hitem_why_feature = why _UI_Hitem_History_feature = History -_UI_IDNaming_id_feature = Id -_UI_Line_type_feature = Type +_UI_IDNaming_id_feature = id +_UI_Line_type_feature = type _UI_Line_Process_feature = Process _UI_Line_SCL_feature = SCL -_UI_Line_ConnectivityNode_feature = Connectivity Node -_UI_Line_ConductingEquipment_feature = Conducting Equipment -_UI_Naming_name_feature = Name -_UI_Private_source_feature = Source -_UI_Private_type_feature = Type -_UI_Private_BaseElement_feature = Base Element -_UI_Process_type_feature = Type +_UI_Line_ConnectivityNode_feature = ConnectivityNode +_UI_Line_ConductingEquipment_feature = ConductingEquipment +_UI_Naming_name_feature = name +_UI_Private_source_feature = source +_UI_Private_type_feature = type +_UI_Private_BaseElement_feature = BaseElement +_UI_Process_type_feature = type _UI_Process_Line_feature = Line _UI_Process_SCL_feature = SCL -_UI_Process_ConductingEquipment_feature = Conducting Equipment +_UI_Process_ConductingEquipment_feature = ConductingEquipment _UI_Process_Substation_feature = Substation -_UI_Process_SubProcesses_feature = Sub Processes -_UI_SCL_revision_feature = Revision -_UI_SCL_version_feature = Version +_UI_Process_SubProcesses_feature = SubProcesses +_UI_SCL_revision_feature = revision +_UI_SCL_version_feature = version _UI_SCL_Header_feature = Header _UI_SCL_Line_feature = Line _UI_SCL_Process_feature = Process _UI_SCL_IED_feature = IED -_UI_SCL_DataTypeTemplates_feature = Data Type Templates +_UI_SCL_DataTypeTemplates_feature = DataTypeTemplates _UI_SCL_Communication_feature = Communication _UI_SCL_Substation_feature = Substation -_UI_Text_source_feature = Source -_UI_Text_BaseElement_feature = Base Element +_UI_Text_source_feature = source +_UI_Text_BaseElement_feature = BaseElement _UI_Text_Header_feature = Header -_UI_Text_value_feature = Value -_UI_Address_ConnectedAP_feature = Connected AP -_UI_Address_ControlBlock_feature = Control Block +_UI_Text_value_feature = value +_UI_Address_ConnectedAP_feature = ConnectedAP +_UI_Address_ControlBlock_feature = ControlBlock _UI_Address_P_feature = P -_UI_Communication_SubNetwork_feature = Sub Network +_UI_Communication_SubNetwork_feature = SubNetwork _UI_Communication_SCL_feature = SCL -_UI_ConnectedAP_apName_feature = Ap Name -_UI_ConnectedAP_iedName_feature = Ied Name -_UI_ConnectedAP_redProt_feature = Red Prot +_UI_ConnectedAP_apName_feature = apName +_UI_ConnectedAP_iedName_feature = iedName +_UI_ConnectedAP_redProt_feature = redProt _UI_ConnectedAP_Address_feature = Address -_UI_ConnectedAP_SubNetwork_feature = Sub Network +_UI_ConnectedAP_SubNetwork_feature = SubNetwork _UI_ConnectedAP_IED_feature = IED -_UI_ConnectedAP_PhysConn_feature = Phys Conn +_UI_ConnectedAP_PhysConn_feature = PhysConn _UI_ConnectedAP_GSE_feature = GSE _UI_ConnectedAP_SMV_feature = SMV -_UI_ControlBlock_cbName_feature = Cb Name -_UI_ControlBlock_ldInst_feature = Ld Inst +_UI_ControlBlock_cbName_feature = cbName +_UI_ControlBlock_ldInst_feature = ldInst _UI_ControlBlock_Address_feature = Address _UI_ControlBlock_LDevice_feature = LDevice -_UI_ControlBlock_GSEControl_feature = GSE Control -_UI_GSE_maxTime_feature = Max Time -_UI_GSE_minTime_feature = Min Time -_UI_GSE_ConnectedAP_feature = Connected AP +_UI_ControlBlock_GSEControl_feature = GSEControl +_UI_GSE_maxTime_feature = maxTime +_UI_GSE_minTime_feature = minTime +_UI_GSE_ConnectedAP_feature = ConnectedAP _UI_P_Address_feature = Address -_UI_PAddr_type_feature = Type -_UI_PAddr_value_feature = Value -_UI_P_PhysConn_PhysConn_feature = Phys Conn -_UI_PhysConn_type_feature = Type -_UI_PhysConn_ConnectedAP_feature = Connected AP +_UI_PAddr_type_feature = type +_UI_PAddr_value_feature = value +_UI_P_PhysConn_PhysConn_feature = PhysConn_PhysConn +_UI_PhysConn_type_feature = type +_UI_PhysConn_ConnectedAP_feature = ConnectedAP _UI_PhysConn_P_feature = P -_UI_SMV_ConnectedAP_feature = Connected AP -_UI_SubNetwork_type_feature = Type -_UI_SubNetwork_BitRate_feature = Bit Rate +_UI_SMV_ConnectedAP_feature = ConnectedAP +_UI_SubNetwork_type_feature = type +_UI_SubNetwork_BitRate_feature = BitRate _UI_SubNetwork_Communication_feature = Communication -_UI_SubNetwork_ConnectedAP_feature = Connected AP -_UI_AbstractDataAttribute_bType_feature = BType -_UI_AbstractDataAttribute_count_feature = Count -_UI_AbstractDataAttribute_sAddr_feature = SAddr -_UI_AbstractDataAttribute_type_feature = Type -_UI_AbstractDataAttribute_valImport_feature = Val Import -_UI_AbstractDataAttribute_valKind_feature = Val Kind -_UI_AbstractDataAttribute_EnumType_feature = Enum Type +_UI_SubNetwork_ConnectedAP_feature = ConnectedAP +_UI_AbstractDataAttribute_bType_feature = bType +_UI_AbstractDataAttribute_count_feature = count +_UI_AbstractDataAttribute_sAddr_feature = sAddr +_UI_AbstractDataAttribute_type_feature = type +_UI_AbstractDataAttribute_valImport_feature = valImport +_UI_AbstractDataAttribute_valKind_feature = valKind +_UI_AbstractDataAttribute_EnumType_feature = EnumType _UI_AbstractDataAttribute_Val_feature = Val -_UI_BDA_DAType_feature = DA Type -_UI_DA_dchg_feature = Dchg -_UI_DA_dupd_feature = Dupd -_UI_DA_fc_feature = Fc -_UI_DA_qchg_feature = Qchg -_UI_DA_DAType_feature = DA Type -_UI_DA_DOType_feature = DO Type -_UI_DA_ProtNs_feature = Prot Ns -_UI_DAType_iedType_feature = Ied Type +_UI_BDA_DAType_feature = DAType +_UI_DA_dchg_feature = dchg +_UI_DA_dupd_feature = dupd +_UI_DA_fc_feature = fc +_UI_DA_qchg_feature = qchg +_UI_DA_DAType_feature = DAType +_UI_DA_DOType_feature = DOType +_UI_DA_ProtNs_feature = ProtNs +_UI_DAType_iedType_feature = iedType _UI_DAType_BDA_feature = BDA _UI_DAType_DA_feature = DA -_UI_DAType_DataTypeTemplates_feature = Data Type Templates -_UI_DAType_ProtNs_feature = Prot Ns -_UI_DO_accessControl_feature = Access Control -_UI_DO_transient_feature = Transient -_UI_DO_type_feature = Type -_UI_DO_LNodeType_feature = LNode Type -_UI_DO_DOType_feature = DO Type -_UI_DOType_cdc_feature = Cdc -_UI_DOType_iedType_feature = Ied Type +_UI_DAType_DataTypeTemplates_feature = DataTypeTemplates +_UI_DAType_ProtNs_feature = ProtNs +_UI_DO_accessControl_feature = accessControl +_UI_DO_transient_feature = transient +_UI_DO_type_feature = type +_UI_DO_LNodeType_feature = LNodeType +_UI_DO_DOType_feature = DOType +_UI_DOType_cdc_feature = cdc +_UI_DOType_iedType_feature = iedType _UI_DOType_DA_feature = DA _UI_DOType_DO_feature = DO -_UI_DOType_DataTypeTemplates_feature = Data Type Templates +_UI_DOType_DataTypeTemplates_feature = DataTypeTemplates _UI_DOType_SDO_feature = SDO -_UI_DataTypeTemplates_DAType_feature = DA Type -_UI_DataTypeTemplates_DOType_feature = DO Type -_UI_DataTypeTemplates_EnumType_feature = Enum Type -_UI_DataTypeTemplates_LNodeType_feature = LNode Type +_UI_DataTypeTemplates_DAType_feature = DAType +_UI_DataTypeTemplates_DOType_feature = DOType +_UI_DataTypeTemplates_EnumType_feature = EnumType +_UI_DataTypeTemplates_LNodeType_feature = LNodeType _UI_DataTypeTemplates_SCL_feature = SCL -_UI_EnumType_AbstractDataAttribute_feature = Abstract Data Attribute -_UI_EnumType_DataTypeTemplates_feature = Data Type Templates -_UI_EnumType_EnumVal_feature = Enum Val -_UI_EnumVal_ord_feature = Ord -_UI_EnumVal_EnumType_feature = Enum Type -_UI_LNodeType_iedType_feature = Ied Type -_UI_LNodeType_lnClass_feature = Ln Class +_UI_EnumType_AbstractDataAttribute_feature = AbstractDataAttribute +_UI_EnumType_DataTypeTemplates_feature = DataTypeTemplates +_UI_EnumType_EnumVal_feature = EnumVal +_UI_EnumVal_ord_feature = ord +_UI_EnumVal_EnumType_feature = EnumType +_UI_LNodeType_iedType_feature = iedType +_UI_LNodeType_lnClass_feature = lnClass _UI_LNodeType_DO_feature = DO -_UI_LNodeType_DataTypeTemplates_feature = Data Type Templates -_UI_LNodeType_AnyLN_feature = Any LN -_UI_ProtNs_type_feature = Type +_UI_LNodeType_DataTypeTemplates_feature = DataTypeTemplates +_UI_LNodeType_AnyLN_feature = AnyLN +_UI_ProtNs_type_feature = type _UI_ProtNs_DA_feature = DA -_UI_ProtNs_DAType_feature = DA Type -_UI_SDO_count_feature = Count -_UI_SDO_type_feature = Type -_UI_SDO_DOType_feature = DO Type -_UI_Val_sGroup_feature = SGroup -_UI_Val_AbstractDataAttribute_feature = Abstract Data Attribute +_UI_ProtNs_DAType_feature = DAType +_UI_SDO_count_feature = count +_UI_SDO_type_feature = type +_UI_SDO_DOType_feature = DOType +_UI_Val_sGroup_feature = sGroup +_UI_Val_AbstractDataAttribute_feature = AbstractDataAttribute _UI_Val_DAI_feature = DAI -_UI_BitRateInMbPerSec_multiplier_feature = Multiplier -_UI_BitRateInMbPerSec_unit_feature = Unit -_UI_BitRateInMbPerSec_value_feature = Value -_UI_DurationInMilliSec_multiplier_feature = Multiplier -_UI_DurationInMilliSec_unit_feature = Unit +_UI_BitRateInMbPerSec_multiplier_feature = multiplier +_UI_BitRateInMbPerSec_unit_feature = unit +_UI_BitRateInMbPerSec_value_feature = value +_UI_DurationInMilliSec_multiplier_feature = multiplier +_UI_DurationInMilliSec_unit_feature = unit _UI_AccessControl_LDevice_feature = LDevice -_UI_AccessPoint_clock_feature = Clock -_UI_AccessPoint_kdc_feature = Kdc -_UI_AccessPoint_router_feature = Router +_UI_AccessPoint_clock_feature = clock +_UI_AccessPoint_kdc_feature = kdc +_UI_AccessPoint_router_feature = router _UI_AccessPoint_IED_feature = IED _UI_AccessPoint_LN_feature = LN -_UI_AccessPoint_SMVSecurity_feature = SMV Security -_UI_AccessPoint_ServerAt_feature = Server At +_UI_AccessPoint_SMVSecurity_feature = SMVSecurity +_UI_AccessPoint_ServerAt_feature = ServerAt _UI_AccessPoint_Server_feature = Server _UI_AccessPoint_Services_feature = Services -_UI_AccessPoint_GOOSESecurity_feature = GOOSE Security -_UI_AnyLN_inst_feature = Inst -_UI_AnyLN_lnClass_feature = Ln Class -_UI_AnyLN_lnType_feature = Ln Type -_UI_AnyLN_LNodeType_feature = LNode Type +_UI_AccessPoint_GOOSESecurity_feature = GOOSESecurity +_UI_AnyLN_inst_feature = inst +_UI_AnyLN_lnClass_feature = lnClass +_UI_AnyLN_lnType_feature = lnType +_UI_AnyLN_LNodeType_feature = LNodeType _UI_AnyLN_Inputs_feature = Inputs _UI_AnyLN_Log_feature = Log _UI_AnyLN_DOI_feature = DOI -_UI_AnyLN_ReportControl_feature = Report Control -_UI_AnyLN_LogControl_feature = Log Control -_UI_AnyLN_DataSet_feature = Data Set -_UI_Association_associationID_feature = Association ID -_UI_Association_iedName_feature = Ied Name -_UI_Association_kind_feature = Kind -_UI_Association_ldInst_feature = Ld Inst -_UI_Association_lnClass_feature = Ln Class -_UI_Association_lnInst_feature = Ln Inst -_UI_Association_prefix_feature = Prefix +_UI_AnyLN_ReportControl_feature = ReportControl +_UI_AnyLN_LogControl_feature = LogControl +_UI_AnyLN_DataSet_feature = DataSet +_UI_Association_associationID_feature = associationID +_UI_Association_iedName_feature = iedName +_UI_Association_kind_feature = kind +_UI_Association_ldInst_feature = ldInst +_UI_Association_lnClass_feature = lnClass +_UI_Association_lnInst_feature = lnInst +_UI_Association_prefix_feature = prefix _UI_Association_IED_feature = IED _UI_Association_Server_feature = Server -_UI_Authentication_certificate_feature = Certificate -_UI_Authentication_none_feature = None -_UI_Authentication_password_feature = Password -_UI_Authentication_strong_feature = Strong -_UI_Authentication_weak_feature = Weak +_UI_Authentication_certificate_feature = certificate +_UI_Authentication_none_feature = none +_UI_Authentication_password_feature = password +_UI_Authentication_strong_feature = strong +_UI_Authentication_weak_feature = weak _UI_Authentication_Server_feature = Server -_UI_Certificate_serialNumber_feature = Serial Number -_UI_Certificate_xferNumber_feature = Xfer Number +_UI_Certificate_serialNumber_feature = serialNumber +_UI_Certificate_xferNumber_feature = xferNumber _UI_Certificate_Subject_feature = Subject -_UI_Certificate_IssuerName_feature = Issuer Name -_UI_ClientLN_apRef_feature = Ap Ref -_UI_ClientLN_iedName_feature = Ied Name -_UI_ClientLN_ldInst_feature = Ld Inst -_UI_ClientLN_lnClass_feature = Ln Class -_UI_ClientLN_lnInst_feature = Ln Inst -_UI_ClientLN_prefix_feature = Prefix +_UI_Certificate_IssuerName_feature = IssuerName +_UI_ClientLN_apRef_feature = apRef +_UI_ClientLN_iedName_feature = iedName +_UI_ClientLN_ldInst_feature = ldInst +_UI_ClientLN_lnClass_feature = lnClass +_UI_ClientLN_lnInst_feature = lnInst +_UI_ClientLN_prefix_feature = prefix _UI_ClientLN_IED_feature = IED -_UI_ClientLN_RptEnabled_feature = Rpt Enabled -_UI_ClientServices_bufReport_feature = Buf Report -_UI_ClientServices_goose_feature = Goose -_UI_ClientServices_gsse_feature = Gsse -_UI_ClientServices_maxAttributes_feature = Max Attributes -_UI_ClientServices_maxGOOSE_feature = Max GOOSE -_UI_ClientServices_maxReports_feature = Max Reports -_UI_ClientServices_maxSMV_feature = Max SMV -_UI_ClientServices_readLog_feature = Read Log -_UI_ClientServices_supportsLdName_feature = Supports Ld Name -_UI_ClientServices_sv_feature = Sv -_UI_ClientServices_unbufReport_feature = Unbuf Report +_UI_ClientLN_RptEnabled_feature = RptEnabled +_UI_ClientServices_bufReport_feature = bufReport +_UI_ClientServices_goose_feature = goose +_UI_ClientServices_gsse_feature = gsse +_UI_ClientServices_maxAttributes_feature = maxAttributes +_UI_ClientServices_maxGOOSE_feature = maxGOOSE +_UI_ClientServices_maxReports_feature = maxReports +_UI_ClientServices_maxSMV_feature = maxSMV +_UI_ClientServices_readLog_feature = readLog +_UI_ClientServices_supportsLdName_feature = supportsLdName +_UI_ClientServices_sv_feature = sv +_UI_ClientServices_unbufReport_feature = unbufReport _UI_ClientServices_Services_feature = Services -_UI_ClientServices_TimeSyncProt_feature = Time Sync Prot -_UI_CommProt_ipv6_feature = Ipv6 +_UI_ClientServices_TimeSyncProt_feature = TimeSyncProt +_UI_CommProt_ipv6_feature = ipv6 _UI_CommProt_Services_feature = Services -_UI_ConfDataSet_maxAttributes_feature = Max Attributes -_UI_ConfDataSet_modify_feature = Modify +_UI_ConfDataSet_maxAttributes_feature = maxAttributes +_UI_ConfDataSet_modify_feature = modify _UI_ConfDataSet_Services_feature = Services -_UI_ConfLNs_fixLnInst_feature = Fix Ln Inst -_UI_ConfLNs_fixPrefix_feature = Fix Prefix +_UI_ConfLNs_fixLnInst_feature = fixLnInst +_UI_ConfLNs_fixPrefix_feature = fixPrefix _UI_ConfLNs_Services_feature = Services _UI_ConfLdName_Services_feature = Services _UI_ConfLogControl_Services_feature = Services -_UI_ConfReportControl_bufConf_feature = Buf Conf -_UI_ConfReportControl_bufMode_feature = Buf Mode +_UI_ConfReportControl_bufConf_feature = bufConf +_UI_ConfReportControl_bufMode_feature = bufMode _UI_ConfReportControl_Services_feature = Services -_UI_ConfSG_resvTms_feature = Resv Tms -_UI_ConfSG_SettingGroups_feature = Setting Groups +_UI_ConfSG_resvTms_feature = resvTms +_UI_ConfSG_SettingGroups_feature = SettingGroups _UI_ConfSigRef_Services_feature = Services -_UI_Control_datSet_feature = Dat Set -_UI_Control_DataSet_feature = Data Set -_UI_ControlWithIEDName_confRev_feature = Conf Rev -_UI_ControlWithIEDName_IEDName_feature = IED Name -_UI_ControlWithTriggerOpt_intgPd_feature = Intg Pd -_UI_ControlWithTriggerOpt_TrgOps_feature = Trg Ops -_UI_DAI_ix_feature = Ix -_UI_DAI_sAddr_feature = SAddr -_UI_DAI_valImport_feature = Val Import -_UI_DAI_valKind_feature = Val Kind +_UI_Control_datSet_feature = datSet +_UI_Control_DataSet_feature = DataSet +_UI_ControlWithIEDName_confRev_feature = confRev +_UI_ControlWithIEDName_IEDName_feature = IEDName +_UI_ControlWithTriggerOpt_intgPd_feature = intgPd +_UI_ControlWithTriggerOpt_TrgOps_feature = TrgOps +_UI_DAI_ix_feature = ix +_UI_DAI_sAddr_feature = sAddr +_UI_DAI_valImport_feature = valImport +_UI_DAI_valKind_feature = valKind _UI_DAI_Val_feature = Val _UI_DAI_DOI_feature = DOI _UI_DAI_SDI_feature = SDI _UI_DAI_FCDA_feature = FCDA -_UI_DOI_accessControl_feature = Access Control -_UI_DOI_ix_feature = Ix -_UI_DOI_AnyLN_feature = Any LN +_UI_DOI_accessControl_feature = accessControl +_UI_DOI_ix_feature = ix +_UI_DOI_AnyLN_feature = AnyLN _UI_DOI_DAI_feature = DAI _UI_DOI_FCDA_feature = FCDA _UI_DOI_SDI_feature = SDI _UI_DataObjectDirectory_Services_feature = Services -_UI_DataSet_AnyLN_feature = Any LN +_UI_DataSet_AnyLN_feature = AnyLN _UI_DataSet_Control_feature = Control _UI_DataSet_FCDA_feature = FCDA _UI_DataSetDirectory_Services_feature = Services -_UI_DynAssociation_max_feature = Max +_UI_DynAssociation_max_feature = max _UI_DynAssociation_Services_feature = Services -_UI_DynDataSet_maxAttributes_feature = Max Attributes +_UI_DynDataSet_maxAttributes_feature = maxAttributes _UI_DynDataSet_Services_feature = Services -_UI_ExtRef_daName_feature = Da Name -_UI_ExtRef_doName_feature = Do Name -_UI_ExtRef_iedName_feature = Ied Name -_UI_ExtRef_intAddr_feature = Int Addr -_UI_ExtRef_ldInst_feature = Ld Inst -_UI_ExtRef_lnClass_feature = Ln Class -_UI_ExtRef_lnInst_feature = Ln Inst -_UI_ExtRef_prefix_feature = Prefix -_UI_ExtRef_serviceType_feature = Service Type -_UI_ExtRef_srcCBName_feature = Src CB Name -_UI_ExtRef_srcLDInst_feature = Src LD Inst -_UI_ExtRef_srcLNClass_feature = Src LN Class -_UI_ExtRef_srcLNInst_feature = Src LN Inst -_UI_ExtRef_srcPrefix_feature = Src Prefix +_UI_ExtRef_daName_feature = daName +_UI_ExtRef_doName_feature = doName +_UI_ExtRef_iedName_feature = iedName +_UI_ExtRef_intAddr_feature = intAddr +_UI_ExtRef_ldInst_feature = ldInst +_UI_ExtRef_lnClass_feature = lnClass +_UI_ExtRef_lnInst_feature = lnInst +_UI_ExtRef_prefix_feature = prefix +_UI_ExtRef_serviceType_feature = serviceType +_UI_ExtRef_srcCBName_feature = srcCBName +_UI_ExtRef_srcLDInst_feature = srcLDInst +_UI_ExtRef_srcLNClass_feature = srcLNClass +_UI_ExtRef_srcLNInst_feature = srcLNInst +_UI_ExtRef_srcPrefix_feature = srcPrefix _UI_ExtRef_Inputs_feature = Inputs _UI_ExtRef_IED_feature = IED -_UI_FCDA_daName_feature = Da Name -_UI_FCDA_doName_feature = Do Name -_UI_FCDA_fc_feature = Fc -_UI_FCDA_ix_feature = Ix -_UI_FCDA_ldInst_feature = Ld Inst -_UI_FCDA_lnClass_feature = Ln Class -_UI_FCDA_lnInst_feature = Ln Inst -_UI_FCDA_prefix_feature = Prefix +_UI_FCDA_daName_feature = daName +_UI_FCDA_doName_feature = doName +_UI_FCDA_fc_feature = fc +_UI_FCDA_ix_feature = ix +_UI_FCDA_ldInst_feature = ldInst +_UI_FCDA_lnClass_feature = lnClass +_UI_FCDA_lnInst_feature = lnInst +_UI_FCDA_prefix_feature = prefix _UI_FCDA_DAI_feature = DAI _UI_FCDA_DOI_feature = DOI -_UI_FCDA_DataSet_feature = Data Set +_UI_FCDA_DataSet_feature = DataSet _UI_FCDA_LN_feature = LN -_UI_FileHandling_ftp_feature = Ftp -_UI_FileHandling_ftps_feature = Ftps -_UI_FileHandling_mms_feature = Mms +_UI_FileHandling_ftp_feature = ftp +_UI_FileHandling_ftps_feature = ftps +_UI_FileHandling_mms_feature = mms _UI_FileHandling_Services_feature = Services -_UI_GOOSE_fixedOffs_feature = Fixed Offs +_UI_GOOSE_fixedOffs_feature = fixedOffs _UI_GOOSE_Services_feature = Services -_UI_GOOSESecurity_AccessPoint_feature = Access Point -_UI_GSEControl_appID_feature = App ID -_UI_GSEControl_fixedOffs_feature = Fixed Offs -_UI_GSEControl_securityEnable_feature = Security Enable -_UI_GSEControl_type_feature = Type -_UI_GSEControl_ControlBlock_feature = Control Block +_UI_GOOSESecurity_AccessPoint_feature = AccessPoint +_UI_GSEControl_appID_feature = appID +_UI_GSEControl_fixedOffs_feature = fixedOffs +_UI_GSEControl_securityEnable_feature = securityEnable +_UI_GSEControl_type_feature = type +_UI_GSEControl_ControlBlock_feature = ControlBlock _UI_GSEControl_LN0_feature = LN0 _UI_GSEControl_Protocol_feature = Protocol _UI_GSEDir_Services_feature = Services -_UI_GSESettings_appID_feature = App ID -_UI_GSESettings_dataLabel_feature = Data Label +_UI_GSESettings_appID_feature = appID +_UI_GSESettings_dataLabel_feature = dataLabel _UI_GSESettings_Services_feature = Services _UI_GSSE_Services_feature = Services _UI_GetCBValues_Services_feature = Services _UI_GetDataObjectDefinition_Services_feature = Services _UI_GetDataSetValue_Services_feature = Services _UI_GetDirectory_Services_feature = Services -_UI_IED_configVersion_feature = Config Version -_UI_IED_engRight_feature = Eng Right -_UI_IED_manufacturer_feature = Manufacturer -_UI_IED_originalSclRevision_feature = Original Scl Revision -_UI_IED_originalSclVersion_feature = Original Scl Version -_UI_IED_owner_feature = Owner -_UI_IED_type_feature = Type -_UI_IED_ConnectedAP_feature = Connected AP -_UI_IED_AccessPoint_feature = Access Point +_UI_IED_configVersion_feature = configVersion +_UI_IED_engRight_feature = engRight +_UI_IED_manufacturer_feature = manufacturer +_UI_IED_originalSclRevision_feature = originalSclRevision +_UI_IED_originalSclVersion_feature = originalSclVersion +_UI_IED_owner_feature = owner +_UI_IED_type_feature = type +_UI_IED_ConnectedAP_feature = ConnectedAP +_UI_IED_AccessPoint_feature = AccessPoint _UI_IED_Association_feature = Association -_UI_IED_ClientLN_feature = Client LN -_UI_IED_ExtRef_feature = Ext Ref +_UI_IED_ClientLN_feature = ClientLN +_UI_IED_ExtRef_feature = ExtRef _UI_IED_LNode_feature = LNode _UI_IED_KDC_feature = KDC _UI_IED_Services_feature = Services _UI_IED_SCL_feature = SCL -_UI_IEDName_apRef_feature = Ap Ref -_UI_IEDName_ldInst_feature = Ld Inst -_UI_IEDName_lnClass_feature = Ln Class -_UI_IEDName_lnInst_feature = Ln Inst -_UI_IEDName_prefix_feature = Prefix -_UI_IEDName_ControlWithIEDName_feature = Control With IED Name -_UI_Inputs_AnyLN_feature = Any LN -_UI_Inputs_ExtRef_feature = Ext Ref -_UI_IssuerName_commonName_feature = Common Name -_UI_IssuerName_idHierarchy_feature = Id Hierarchy +_UI_IEDName_apRef_feature = apRef +_UI_IEDName_ldInst_feature = ldInst +_UI_IEDName_lnClass_feature = lnClass +_UI_IEDName_lnInst_feature = lnInst +_UI_IEDName_prefix_feature = prefix +_UI_IEDName_ControlWithIEDName_feature = ControlWithIEDName +_UI_Inputs_AnyLN_feature = AnyLN +_UI_Inputs_ExtRef_feature = ExtRef +_UI_IssuerName_commonName_feature = commonName +_UI_IssuerName_idHierarchy_feature = idHierarchy _UI_IssuerName_Certificate_feature = Certificate -_UI_KDC_apName_feature = Ap Name -_UI_KDC_iedName_feature = Ied Name +_UI_KDC_apName_feature = apName +_UI_KDC_iedName_feature = iedName _UI_KDC_IED_feature = IED -_UI_LDevice_inst_feature = Inst -_UI_LDevice_ldName_feature = Ld Name -_UI_LDevice_ControlBlock_feature = Control Block -_UI_LDevice_AccessControl_feature = Access Control +_UI_LDevice_inst_feature = inst +_UI_LDevice_ldName_feature = ldName +_UI_LDevice_ControlBlock_feature = ControlBlock +_UI_LDevice_AccessControl_feature = AccessControl _UI_LDevice_Server_feature = Server _UI_LDevice_LNode_feature = LNode _UI_LDevice_LN_feature = LN _UI_LDevice_LN0_feature = LN0 -_UI_LN_prefix_feature = Prefix -_UI_LN_AccessPoint_feature = Access Point +_UI_LN_prefix_feature = prefix +_UI_LN_AccessPoint_feature = AccessPoint _UI_LN_FCDA_feature = FCDA _UI_LN_LDevice_feature = LDevice _UI_LN_LNode_feature = LNode -_UI_LN0_GSEControl_feature = GSE Control +_UI_LN0_GSEControl_feature = GSEControl _UI_LN0_LDevice_feature = LDevice -_UI_LN0_SampledValueControl_feature = Sampled Value Control -_UI_LN0_SettingControl_feature = Setting Control -_UI_Log_AnyLN_feature = Any LN -_UI_LogControl_bufTime_feature = Buf Time -_UI_LogControl_ldInst_feature = Ld Inst -_UI_LogControl_lnClass_feature = Ln Class -_UI_LogControl_lnInst_feature = Ln Inst -_UI_LogControl_logEna_feature = Log Ena -_UI_LogControl_logName_feature = Log Name -_UI_LogControl_prefix_feature = Prefix -_UI_LogControl_reasonCode_feature = Reason Code -_UI_LogControl_AnyLN_feature = Any LN -_UI_LogSettings_intgPd_feature = Intg Pd -_UI_LogSettings_logEna_feature = Log Ena -_UI_LogSettings_trgOps_feature = Trg Ops +_UI_LN0_SampledValueControl_feature = SampledValueControl +_UI_LN0_SettingControl_feature = SettingControl +_UI_Log_AnyLN_feature = AnyLN +_UI_LogControl_bufTime_feature = bufTime +_UI_LogControl_ldInst_feature = ldInst +_UI_LogControl_lnClass_feature = lnClass +_UI_LogControl_lnInst_feature = lnInst +_UI_LogControl_logEna_feature = logEna +_UI_LogControl_logName_feature = logName +_UI_LogControl_prefix_feature = prefix +_UI_LogControl_reasonCode_feature = reasonCode +_UI_LogControl_AnyLN_feature = AnyLN +_UI_LogSettings_intgPd_feature = intgPd +_UI_LogSettings_logEna_feature = logEna +_UI_LogSettings_trgOps_feature = trgOps _UI_LogSettings_Services_feature = Services -_UI_OptFields_bufOvfl_feature = Buf Ovfl -_UI_OptFields_configRef_feature = Config Ref -_UI_OptFields_dataRef_feature = Data Ref -_UI_OptFields_dataSet_feature = Data Set -_UI_OptFields_entryID_feature = Entry ID -_UI_OptFields_reasonCode_feature = Reason Code -_UI_OptFields_segmentation_feature = Segmentation -_UI_OptFields_seqNum_feature = Seq Num -_UI_OptFields_timeStamp_feature = Time Stamp -_UI_OptFields_ReportControl_feature = Report Control -_UI_Protocol_mustUnderstand_feature = Must Understand -_UI_Protocol_GSEControl_feature = GSE Control -_UI_Protocol_SampledValueControl_feature = Sampled Value Control +_UI_OptFields_bufOvfl_feature = bufOvfl +_UI_OptFields_configRef_feature = configRef +_UI_OptFields_dataRef_feature = dataRef +_UI_OptFields_dataSet_feature = dataSet +_UI_OptFields_entryID_feature = entryID +_UI_OptFields_reasonCode_feature = reasonCode +_UI_OptFields_segmentation_feature = segmentation +_UI_OptFields_seqNum_feature = seqNum +_UI_OptFields_timeStamp_feature = timeStamp +_UI_OptFields_ReportControl_feature = ReportControl +_UI_Protocol_mustUnderstand_feature = mustUnderstand +_UI_Protocol_GSEControl_feature = GSEControl +_UI_Protocol_SampledValueControl_feature = SampledValueControl _UI_ReadWrite_Services_feature = Services -_UI_RedProt_hsr_feature = Hsr -_UI_RedProt_prp_feature = Prp -_UI_RedProt_rstp_feature = Rstp +_UI_RedProt_hsr_feature = hsr +_UI_RedProt_prp_feature = prp +_UI_RedProt_rstp_feature = rstp _UI_RedProt_Services_feature = Services -_UI_ReportControl_buffered_feature = Buffered -_UI_ReportControl_bufTime_feature = Buf Time -_UI_ReportControl_confRev_feature = Conf Rev -_UI_ReportControl_indexed_feature = Indexed -_UI_ReportControl_rptID_feature = Rpt ID -_UI_ReportControl_AnyLN_feature = Any LN -_UI_ReportControl_OptFields_feature = Opt Fields -_UI_ReportControl_RptEnabled_feature = Rpt Enabled -_UI_ReportSettings_bufTime_feature = Buf Time -_UI_ReportSettings_intgPd_feature = Intg Pd -_UI_ReportSettings_optFields_feature = Opt Fields -_UI_ReportSettings_owner_feature = Owner -_UI_ReportSettings_resvTms_feature = Resv Tms -_UI_ReportSettings_rptID_feature = Rpt ID -_UI_ReportSettings_trgOps_feature = Trg Ops +_UI_ReportControl_buffered_feature = buffered +_UI_ReportControl_bufTime_feature = bufTime +_UI_ReportControl_confRev_feature = confRev +_UI_ReportControl_indexed_feature = indexed +_UI_ReportControl_rptID_feature = rptID +_UI_ReportControl_AnyLN_feature = AnyLN +_UI_ReportControl_OptFields_feature = OptFields +_UI_ReportControl_RptEnabled_feature = RptEnabled +_UI_ReportSettings_bufTime_feature = bufTime +_UI_ReportSettings_intgPd_feature = intgPd +_UI_ReportSettings_optFields_feature = optFields +_UI_ReportSettings_owner_feature = owner +_UI_ReportSettings_resvTms_feature = resvTms +_UI_ReportSettings_rptID_feature = rptID +_UI_ReportSettings_trgOps_feature = trgOps _UI_ReportSettings_Services_feature = Services -_UI_RptEnabled_max_feature = Max -_UI_RptEnabled_ClientLN_feature = Client LN -_UI_RptEnabled_ReportControl_feature = Report Control -_UI_SDI_ix_feature = Ix -_UI_SDI_sAddr_feature = SAddr +_UI_RptEnabled_max_feature = max +_UI_RptEnabled_ClientLN_feature = ClientLN +_UI_RptEnabled_ReportControl_feature = ReportControl +_UI_SDI_ix_feature = ix +_UI_SDI_sAddr_feature = sAddr _UI_SDI_DAI_feature = DAI _UI_SDI_DOI_feature = DOI -_UI_SDI_SubSDI_feature = Sub SDI -_UI_SGEdit_resvTms_feature = Resv Tms -_UI_SGEdit_SettingGroups_feature = Setting Groups -_UI_SMVSecurity_AccessPoint_feature = Access Point -_UI_SMVsc_delivery_feature = Delivery -_UI_SMVsc_deliveryConf_feature = Delivery Conf +_UI_SDI_SubSDI_feature = SubSDI +_UI_SGEdit_resvTms_feature = resvTms +_UI_SGEdit_SettingGroups_feature = SettingGroups +_UI_SMVSecurity_AccessPoint_feature = AccessPoint +_UI_SMVsc_delivery_feature = delivery +_UI_SMVsc_deliveryConf_feature = deliveryConf _UI_SMVsc_Services_feature = Services -_UI_SampledValueControl_multicast_feature = Multicast -_UI_SampledValueControl_nofASDU_feature = Nof ASDU -_UI_SampledValueControl_securityEnable_feature = Security Enable -_UI_SampledValueControl_smpMod_feature = Smp Mod -_UI_SampledValueControl_smpRate_feature = Smp Rate -_UI_SampledValueControl_smvID_feature = Smv ID +_UI_SampledValueControl_multicast_feature = multicast +_UI_SampledValueControl_nofASDU_feature = nofASDU +_UI_SampledValueControl_securityEnable_feature = securityEnable +_UI_SampledValueControl_smpMod_feature = smpMod +_UI_SampledValueControl_smpRate_feature = smpRate +_UI_SampledValueControl_smvID_feature = smvID _UI_SampledValueControl_LN0_feature = LN0 _UI_SampledValueControl_Protocol_feature = Protocol -_UI_SampledValueControl_SmvOpts_feature = Smv Opts -_UI_Server_timeout_feature = Timeout -_UI_Server_AccessPoint_feature = Access Point +_UI_SampledValueControl_SmvOpts_feature = SmvOpts +_UI_Server_timeout_feature = timeout +_UI_Server_AccessPoint_feature = AccessPoint _UI_Server_Association_feature = Association _UI_Server_Authentication_feature = Authentication _UI_Server_LDevice_feature = LDevice -_UI_ServerAt_apName_feature = Ap Name -_UI_ServerAt_AccessPoint_feature = Access Point -_UI_ServiceSettings_cbName_feature = Cb Name -_UI_ServiceSettings_datSet_feature = Dat Set -_UI_ServiceWithMax_max_feature = Max -_UI_Services_nameLength_feature = Name Length -_UI_Services_AccessPoint_feature = Access Point -_UI_Services_ClientServices_feature = Client Services -_UI_Services_CommProt_feature = Comm Prot -_UI_Services_ConfDataSet_feature = Conf Data Set -_UI_Services_ConfLNs_feature = Conf LNs -_UI_Services_ConfLdName_feature = Conf Ld Name -_UI_Services_ConfLogControl_feature = Conf Log Control -_UI_Services_ConfReportControl_feature = Conf Report Control -_UI_Services_ConfSigRef_feature = Conf Sig Ref -_UI_Services_DataObjectDirectory_feature = Data Object Directory -_UI_Services_DataSetDirectory_feature = Data Set Directory -_UI_Services_DynAssociation_feature = Dyn Association -_UI_Services_DynDataSet_feature = Dyn Data Set -_UI_Services_FileHandling_feature = File Handling +_UI_ServerAt_apName_feature = apName +_UI_ServerAt_AccessPoint_feature = AccessPoint +_UI_ServiceSettings_cbName_feature = cbName +_UI_ServiceSettings_datSet_feature = datSet +_UI_ServiceWithMax_max_feature = max +_UI_Services_nameLength_feature = nameLength +_UI_Services_AccessPoint_feature = AccessPoint +_UI_Services_ClientServices_feature = ClientServices +_UI_Services_CommProt_feature = CommProt +_UI_Services_ConfDataSet_feature = ConfDataSet +_UI_Services_ConfLNs_feature = ConfLNs +_UI_Services_ConfLdName_feature = ConfLdName +_UI_Services_ConfLogControl_feature = ConfLogControl +_UI_Services_ConfReportControl_feature = ConfReportControl +_UI_Services_ConfSigRef_feature = ConfSigRef +_UI_Services_DataObjectDirectory_feature = DataObjectDirectory +_UI_Services_DataSetDirectory_feature = DataSetDirectory +_UI_Services_DynAssociation_feature = DynAssociation +_UI_Services_DynDataSet_feature = DynDataSet +_UI_Services_FileHandling_feature = FileHandling _UI_Services_GOOSE_feature = GOOSE -_UI_Services_GSEDir_feature = GSE Dir -_UI_Services_GSESettings_feature = GSE Settings +_UI_Services_GSEDir_feature = GSEDir +_UI_Services_GSESettings_feature = GSESettings _UI_Services_GSSE_feature = GSSE -_UI_Services_GetCBValues_feature = Get CB Values -_UI_Services_GetDataObjectDefinition_feature = Get Data Object Definition -_UI_Services_GetDataSetValue_feature = Get Data Set Value -_UI_Services_GetDirectory_feature = Get Directory +_UI_Services_GetCBValues_feature = GetCBValues +_UI_Services_GetDataObjectDefinition_feature = GetDataObjectDefinition +_UI_Services_GetDataSetValue_feature = GetDataSetValue +_UI_Services_GetDirectory_feature = GetDirectory _UI_Services_IED_feature = IED -_UI_Services_LogSettings_feature = Log Settings -_UI_Services_ReadWrite_feature = Read Write -_UI_Services_RedProt_feature = Red Prot -_UI_Services_ReportSettings_feature = Report Settings -_UI_Services_SMVsc_feature = SM Vsc -_UI_Services_SupSubscription_feature = Sup Subscription -_UI_Services_ValueHandling_feature = Value Handling -_UI_Services_SetDataSetValue_feature = Set Data Set Value -_UI_Services_SettingGroups_feature = Setting Groups -_UI_Services_TimeSyncProt_feature = Time Sync Prot -_UI_Services_TimerActivatedControl_feature = Timer Activated Control +_UI_Services_LogSettings_feature = LogSettings +_UI_Services_ReadWrite_feature = ReadWrite +_UI_Services_RedProt_feature = RedProt +_UI_Services_ReportSettings_feature = ReportSettings +_UI_Services_SMVsc_feature = SMVsc +_UI_Services_SupSubscription_feature = SupSubscription +_UI_Services_ValueHandling_feature = ValueHandling +_UI_Services_SetDataSetValue_feature = SetDataSetValue +_UI_Services_SettingGroups_feature = SettingGroups +_UI_Services_TimeSyncProt_feature = TimeSyncProt +_UI_Services_TimerActivatedControl_feature = TimerActivatedControl _UI_SetDataSetValue_Services_feature = Services -_UI_SettingControl_actSG_feature = Act SG -_UI_SettingControl_numOfSGs_feature = Num Of SGs -_UI_SettingControl_resvTms_feature = Resv Tms +_UI_SettingControl_actSG_feature = actSG +_UI_SettingControl_numOfSGs_feature = numOfSGs +_UI_SettingControl_resvTms_feature = resvTms _UI_SettingControl_LN0_feature = LN0 -_UI_SettingGroups_ConfSG_feature = Conf SG -_UI_SettingGroups_SGEdit_feature = SG Edit +_UI_SettingGroups_ConfSG_feature = ConfSG +_UI_SettingGroups_SGEdit_feature = SGEdit _UI_SettingGroups_Services_feature = Services -_UI_SmvOpts_dataRef_feature = Data Ref -_UI_SmvOpts_dataSet_feature = Data Set -_UI_SmvOpts_refreshTime_feature = Refresh Time -_UI_SmvOpts_sampleRate_feature = Sample Rate -_UI_SmvOpts_sampleSynchronized_feature = Sample Synchronized -_UI_SmvOpts_security_feature = Security -_UI_SmvOpts_timestamp_feature = Timestamp -_UI_SmvOpts_SampledValueControl_feature = Sampled Value Control -_UI_Subject_commonName_feature = Common Name -_UI_Subject_idHierarchy_feature = Id Hierarchy +_UI_SmvOpts_dataRef_feature = dataRef +_UI_SmvOpts_dataSet_feature = dataSet +_UI_SmvOpts_refreshTime_feature = refreshTime +_UI_SmvOpts_sampleRate_feature = sampleRate +_UI_SmvOpts_sampleSynchronized_feature = sampleSynchronized +_UI_SmvOpts_security_feature = security +_UI_SmvOpts_timestamp_feature = timestamp +_UI_SmvOpts_SampledValueControl_feature = SampledValueControl +_UI_Subject_commonName_feature = commonName +_UI_Subject_idHierarchy_feature = idHierarchy _UI_Subject_Certificate_feature = Certificate -_UI_SupSubscription_maxGo_feature = Max Go -_UI_SupSubscription_maxSv_feature = Max Sv +_UI_SupSubscription_maxGo_feature = maxGo +_UI_SupSubscription_maxSv_feature = maxSv _UI_SupSubscription_Services_feature = Services -_UI_TimeSyncProt_c37_238_feature = C37 238 -_UI_TimeSyncProt_other_feature = Other -_UI_TimeSyncProt_sntp_feature = Sntp -_UI_TimeSyncProt_ClientServices_feature = Client Services +_UI_TimeSyncProt_c37_238_feature = c37_238 +_UI_TimeSyncProt_other_feature = other +_UI_TimeSyncProt_sntp_feature = sntp +_UI_TimeSyncProt_ClientServices_feature = ClientServices _UI_TimeSyncProt_Services_feature = Services _UI_TimerActivatedControl_Services_feature = Services -_UI_TrgOps_dchg_feature = Dchg -_UI_TrgOps_dupd_feature = Dupd -_UI_TrgOps_gi_feature = Gi -_UI_TrgOps_period_feature = Period -_UI_TrgOps_qchg_feature = Qchg -_UI_TrgOps_ControlWithTriggerOpt_feature = Control With Trigger Opt -_UI_ValueHandling_setToRO_feature = Set To RO +_UI_TrgOps_dchg_feature = dchg +_UI_TrgOps_dupd_feature = dupd +_UI_TrgOps_gi_feature = gi +_UI_TrgOps_period_feature = period +_UI_TrgOps_qchg_feature = qchg +_UI_TrgOps_ControlWithTriggerOpt_feature = ControlWithTriggerOpt +_UI_ValueHandling_setToRO_feature = setToRO _UI_ValueHandling_Services_feature = Services -_UI_AbstractConductingEquipment_SubEquipment_feature = Sub Equipment +_UI_AbstractConductingEquipment_SubEquipment_feature = SubEquipment _UI_AbstractConductingEquipment_Terminal_feature = Terminal -_UI_AbstractEqFuncSubFunc_type_feature = Type -_UI_AbstractEqFuncSubFunc_EqSubFunction_feature = Eq Sub Function -_UI_AbstractEqFuncSubFunc_SubGeneralEquipment_feature = Sub General Equipment -_UI_Bay_VoltageLevel_feature = Voltage Level +_UI_AbstractEqFuncSubFunc_type_feature = type +_UI_AbstractEqFuncSubFunc_EqSubFunction_feature = EqSubFunction +_UI_AbstractEqFuncSubFunc_SubGeneralEquipment_feature = SubGeneralEquipment +_UI_Bay_VoltageLevel_feature = VoltageLevel _UI_Bay_Function_feature = Function -_UI_Bay_ConnectivityNode_feature = Connectivity Node +_UI_Bay_ConnectivityNode_feature = ConnectivityNode _UI_Bay_Terminal_feature = Terminal -_UI_Bay_ConductingEquipment_feature = Conducting Equipment -_UI_ConductingEquipment_type_feature = Type +_UI_Bay_ConductingEquipment_feature = ConductingEquipment +_UI_ConductingEquipment_type_feature = type _UI_ConductingEquipment_Bay_feature = Bay _UI_ConductingEquipment_Function_feature = Function -_UI_ConductingEquipment_SubFunction_feature = Sub Function -_UI_ConductingEquipment_EqFunction_feature = Eq Function +_UI_ConductingEquipment_SubFunction_feature = SubFunction +_UI_ConductingEquipment_EqFunction_feature = EqFunction _UI_ConductingEquipment_Line_feature = Line _UI_ConductingEquipment_Process_feature = Process -_UI_ConnectivityNode_pathName_feature = Path Name +_UI_ConnectivityNode_pathName_feature = pathName _UI_ConnectivityNode_Bay_feature = Bay _UI_ConnectivityNode_Terminal_feature = Terminal _UI_ConnectivityNode_Line_feature = Line -_UI_EqFunction_ConductingEquipment_feature = Conducting Equipment -_UI_EqFunction_GeneralEquipment_feature = General Equipment -_UI_EqFunction_PowerTransformer_feature = Power Transformer -_UI_EqFunction_SubEquipment_feature = Sub Equipment -_UI_EqFunction_TransformerWinding_feature = Transformer Winding -_UI_EqFunction_TapChanger_feature = Tap Changer -_UI_EqSubFunction_AbstractEqFuncSubFunc_feature = Abstract Eq Func Sub Func -_UI_Equipment_virtual_feature = Virtual -_UI_EquipmentContainer_PowerTransformer_feature = Power Transformer -_UI_EquipmentContainer_GeneralEquipment_feature = General Equipment -_UI_Function_type_feature = Type +_UI_EqFunction_ConductingEquipment_feature = ConductingEquipment +_UI_EqFunction_GeneralEquipment_feature = GeneralEquipment +_UI_EqFunction_PowerTransformer_feature = PowerTransformer +_UI_EqFunction_SubEquipment_feature = SubEquipment +_UI_EqFunction_TransformerWinding_feature = TransformerWinding +_UI_EqFunction_TapChanger_feature = TapChanger +_UI_EqSubFunction_AbstractEqFuncSubFunc_feature = AbstractEqFuncSubFunc +_UI_Equipment_virtual_feature = virtual +_UI_EquipmentContainer_PowerTransformer_feature = PowerTransformer +_UI_EquipmentContainer_GeneralEquipment_feature = GeneralEquipment +_UI_Function_type_feature = type _UI_Function_Bay_feature = Bay -_UI_Function_ConductingEquipment_feature = Conducting Equipment -_UI_Function_GeneralEquipmentContainer_feature = General Equipment Container +_UI_Function_ConductingEquipment_feature = ConductingEquipment +_UI_Function_GeneralEquipmentContainer_feature = GeneralEquipmentContainer _UI_Function_Substation_feature = Substation -_UI_Function_VoltageLevel_feature = Voltage Level -_UI_Function_SubFunction_feature = Sub Function -_UI_Function_GeneralEquipment_feature = General Equipment -_UI_GeneralEquipment_type_feature = Type -_UI_GeneralEquipment_AbstractEqFuncSubFunc_feature = Abstract Eq Func Sub Func -_UI_GeneralEquipment_EqFunction_feature = Eq Function -_UI_GeneralEquipment_EquipmentContainer_feature = Equipment Container +_UI_Function_VoltageLevel_feature = VoltageLevel +_UI_Function_SubFunction_feature = SubFunction +_UI_Function_GeneralEquipment_feature = GeneralEquipment +_UI_GeneralEquipment_type_feature = type +_UI_GeneralEquipment_AbstractEqFuncSubFunc_feature = AbstractEqFuncSubFunc +_UI_GeneralEquipment_EqFunction_feature = EqFunction +_UI_GeneralEquipment_EquipmentContainer_feature = EquipmentContainer _UI_GeneralEquipment_Function_feature = Function -_UI_GeneralEquipment_GeneralEquipmentContainer_feature = General Equipment Container -_UI_GeneralEquipment_SubFunction_feature = Sub Function +_UI_GeneralEquipment_GeneralEquipmentContainer_feature = GeneralEquipmentContainer +_UI_GeneralEquipment_SubFunction_feature = SubFunction _UI_GeneralEquipmentContainer_Function_feature = Function -_UI_GeneralEquipmentContainer_GeneralEquipment_feature = General Equipment -_UI_LNode_iedName_feature = Ied Name -_UI_LNode_ldInst_feature = Ld Inst -_UI_LNode_lnClass_feature = Ln Class -_UI_LNode_lnInst_feature = Ln Inst -_UI_LNode_lnType_feature = Ln Type -_UI_LNode_prefix_feature = Prefix +_UI_GeneralEquipmentContainer_GeneralEquipment_feature = GeneralEquipment +_UI_LNode_iedName_feature = iedName +_UI_LNode_ldInst_feature = ldInst +_UI_LNode_lnClass_feature = lnClass +_UI_LNode_lnInst_feature = lnInst +_UI_LNode_lnType_feature = lnType +_UI_LNode_prefix_feature = prefix _UI_LNode_IED_feature = IED _UI_LNode_LDevice_feature = LDevice _UI_LNode_LN_feature = LN -_UI_LNode_LNodeContainer_feature = LNode Container +_UI_LNode_LNodeContainer_feature = LNodeContainer _UI_LNodeContainer_LNode_feature = LNode -_UI_NeutralPoint_TransformerWinding_feature = Transformer Winding -_UI_PowerTransformer_type_feature = Type -_UI_PowerTransformer_EqFunction_feature = Eq Function -_UI_PowerTransformer_EquipmentContainer_feature = Equipment Container -_UI_PowerTransformer_SubEquipment_feature = Sub Equipment -_UI_PowerTransformer_TransformerWinding_feature = Transformer Winding -_UI_SubEquipment_phase_feature = Phase -_UI_SubEquipment_virtual_feature = Virtual -_UI_SubEquipment_AbstractConductingEquipment_feature = Abstract Conducting Equipment -_UI_SubEquipment_EqFunction_feature = Eq Function -_UI_SubEquipment_PowerTransformer_feature = Power Transformer -_UI_SubEquipment_TapChanger_feature = Tap Changer -_UI_SubFunction_type_feature = Type -_UI_SubFunction_ConductingEquipment_feature = Conducting Equipment +_UI_NeutralPoint_TransformerWinding_feature = TransformerWinding +_UI_PowerTransformer_type_feature = type +_UI_PowerTransformer_EqFunction_feature = EqFunction +_UI_PowerTransformer_EquipmentContainer_feature = EquipmentContainer +_UI_PowerTransformer_SubEquipment_feature = SubEquipment +_UI_PowerTransformer_TransformerWinding_feature = TransformerWinding +_UI_SubEquipment_phase_feature = phase +_UI_SubEquipment_virtual_feature = virtual +_UI_SubEquipment_AbstractConductingEquipment_feature = AbstractConductingEquipment +_UI_SubEquipment_EqFunction_feature = EqFunction +_UI_SubEquipment_PowerTransformer_feature = PowerTransformer +_UI_SubEquipment_TapChanger_feature = TapChanger +_UI_SubFunction_type_feature = type +_UI_SubFunction_ConductingEquipment_feature = ConductingEquipment _UI_SubFunction_Function_feature = Function -_UI_SubFunction_GeneralEquipment_feature = General Equipment -_UI_SubFunction_SubSubFunctions_feature = Sub Sub Functions +_UI_SubFunction_GeneralEquipment_feature = GeneralEquipment +_UI_SubFunction_SubSubFunctions_feature = SubSubFunctions _UI_Substation_Function_feature = Function -_UI_Substation_VoltageLevel_feature = Voltage Level +_UI_Substation_VoltageLevel_feature = VoltageLevel _UI_Substation_Terminal_feature = Terminal _UI_Substation_Process_feature = Process _UI_Substation_SCL_feature = SCL -_UI_TapChanger_type_feature = Type -_UI_TapChanger_virtual_feature = Virtual -_UI_TapChanger_EqFunction_feature = Eq Function -_UI_TapChanger_SubEquipment_feature = Sub Equipment -_UI_TapChanger_TransformerWinding_feature = Transformer Winding -_UI_Terminal_bayName_feature = Bay Name -_UI_Terminal_cNodeName_feature = CNode Name -_UI_Terminal_connectivityNode_feature = Connectivity Node -_UI_Terminal_processName_feature = Process Name -_UI_Terminal_substationName_feature = Substation Name -_UI_Terminal_voltageLevelName_feature = Voltage Level Name -_UI_Terminal_AbstractConductingEquipment_feature = Abstract Conducting Equipment +_UI_TapChanger_type_feature = type +_UI_TapChanger_virtual_feature = virtual +_UI_TapChanger_EqFunction_feature = EqFunction +_UI_TapChanger_SubEquipment_feature = SubEquipment +_UI_TapChanger_TransformerWinding_feature = TransformerWinding +_UI_Terminal_bayName_feature = bayName +_UI_Terminal_cNodeName_feature = cNodeName +_UI_Terminal_connectivityNode_feature = connectivityNode +_UI_Terminal_processName_feature = processName +_UI_Terminal_substationName_feature = substationName +_UI_Terminal_voltageLevelName_feature = voltageLevelName +_UI_Terminal_AbstractConductingEquipment_feature = AbstractConductingEquipment _UI_Terminal_Bay_feature = Bay -_UI_Terminal_cNode_feature = CNode +_UI_Terminal_cNode_feature = cNode _UI_Terminal_Substation_feature = Substation _UI_Terminal_Voltage_feature = Voltage -_UI_TransformerWinding_type_feature = Type -_UI_TransformerWinding_EqFunction_feature = Eq Function -_UI_TransformerWinding_NeutralPoint_feature = Neutral Point -_UI_TransformerWinding_PowerTransformer_feature = Power Transformer -_UI_TransformerWinding_TapChanger_feature = Tap Changer -_UI_Voltage_multiplier_feature = Multiplier -_UI_Voltage_unit_feature = Unit +_UI_TransformerWinding_type_feature = type +_UI_TransformerWinding_EqFunction_feature = EqFunction +_UI_TransformerWinding_NeutralPoint_feature = NeutralPoint +_UI_TransformerWinding_PowerTransformer_feature = PowerTransformer +_UI_TransformerWinding_TapChanger_feature = TapChanger +_UI_Voltage_multiplier_feature = multiplier +_UI_Voltage_unit_feature = unit _UI_Voltage_Terminal_feature = Terminal -_UI_Voltage_VoltageLevel_feature = Voltage Level -_UI_VoltageLevel_nomFreq_feature = Nom Freq -_UI_VoltageLevel_numPhases_feature = Num Phases +_UI_Voltage_VoltageLevel_feature = VoltageLevel +_UI_VoltageLevel_nomFreq_feature = nomFreq +_UI_VoltageLevel_numPhases_feature = numPhases _UI_VoltageLevel_Bay_feature = Bay _UI_VoltageLevel_Function_feature = Function _UI_VoltageLevel_Substation_feature = Substation @@ -859,446 +859,446 @@ _UI_ValKindEnum_Set_literal = Set _UI_bufModeEnum_unbuffered_literal = unbuffered _UI_bufModeEnum_buffered_literal = buffered _UI_bufModeEnum_both_literal = both -_UI_Terminal_VoltageLevel_feature = Voltage Level +_UI_Terminal_VoltageLevel_feature = VoltageLevel _UI_VoltageLevel_Terminal_feature = Terminal -_UI_EnumVal_value_feature = Value -_UI_Val_value_feature = Value -_UI_Voltage_value_feature = Value +_UI_EnumVal_value_feature = value +_UI_Val_value_feature = value +_UI_Voltage_value_feature = value _UI_AnyLN_LDevice_feature = LDevice -_UI_SDI_superSDI_feature = Super SDI -_UI_Bay_taSoeur_feature = Ta Soeur -_UI_AnyContentFromOtherNamespace_type = Any Content From Other Namespace -_UI_AnyContentFromOtherNamespace_mixed_feature = Mixed -_UI_AnyContentFromOtherNamespace_group_feature = Group -_UI_AnyContentFromOtherNamespace_any_feature = Any -_UI_AnyContentFromOtherNamespace_anyAttribute_feature = Any Attribute -_UI_BaseElement_any_feature = Any -_UI_BaseElement_anyAttribute_feature = Any Attribute -_UI_XMLTypeDocumentRoot_comment_feature = Comment -_UI_XMLTypeDocumentRoot_text_feature = Text -_UI_XMLTypeDocumentRoot_processingInstruction_feature = Processing Instruction -_UI_XMLTypeDocumentRoot_cDATA_feature = CDATA -_UI_SDI_ParentSDI_feature = Parent SDI -_UI_ExplicitLinkResolver_type = Explicit Link Resolver +_UI_SDI_superSDI_feature = superSDI +_UI_Bay_taSoeur_feature = taSoeur +_UI_AnyContentFromOtherNamespace_type = AnyContentFromOtherNamespace +_UI_AnyContentFromOtherNamespace_mixed_feature = mixed +_UI_AnyContentFromOtherNamespace_group_feature = group +_UI_AnyContentFromOtherNamespace_any_feature = any +_UI_AnyContentFromOtherNamespace_anyAttribute_feature = anyAttribute +_UI_BaseElement_any_feature = any +_UI_BaseElement_anyAttribute_feature = anyAttribute +_UI_XMLTypeDocumentRoot_comment_feature = comment +_UI_XMLTypeDocumentRoot_text_feature = text +_UI_XMLTypeDocumentRoot_processingInstruction_feature = processingInstruction +_UI_XMLTypeDocumentRoot_cDATA_feature = cDATA +_UI_SDI_ParentSDI_feature = ParentSDI +_UI_ExplicitLinkResolver_type = ExplicitLinkResolver _UI_AnyLN_FCDA_feature = FCDA -_UI_ControlBlock_ControlWithIEDName_feature = Control With IED Name -_UI_ControlWithIEDName_ControlBlock_feature = Control Block -_UI_DataObject_type = Data Object -_UI_DataAttribute_type = Data Attribute -_UI_FCDA_DataAttribute_feature = Data Attribute -_UI_FCDA_DataObject_feature = Data Object -_UI_DataObject_accessControl_feature = Access Control +_UI_ControlBlock_ControlWithIEDName_feature = ControlWithIEDName +_UI_ControlWithIEDName_ControlBlock_feature = ControlBlock +_UI_DataObject_type = DataObject +_UI_DataAttribute_type = DataAttribute +_UI_FCDA_DataAttribute_feature = DataAttribute +_UI_FCDA_DataObject_feature = DataObject +_UI_DataObject_accessControl_feature = accessControl _UI_DataObject_FCDA_feature = FCDA _UI_DataAttribute_FCDA_feature = FCDA -_UI_AccessPoint_ReferenceByServerAt_feature = Reference By Server At -_UI_ServerAt_ServerAccessPoint_feature = Server Access Point +_UI_AccessPoint_ReferenceByServerAt_feature = ReferenceByServerAt +_UI_ServerAt_ServerAccessPoint_feature = ServerAccessPoint _UI_ControlWithIEDName_Protocol_feature = Protocol -_UI_Protocol_ControlWithIEDName_feature = Control With IED Name -_UI_Process_ParentProcess_feature = Parent Process +_UI_Protocol_ControlWithIEDName_feature = ControlWithIEDName +_UI_Process_ParentProcess_feature = ParentProcess _UI_SclObject_type = Object -_UI_SclObject_lineNumber_feature = Line Number -_UI_SCL_release_feature = Release -_UI_UnNaming_type = Un Naming -_UI_IDNaming_desc_feature = Desc -_UI_Naming_desc_feature = Desc -_UI_UnNaming_desc_feature = Desc -_UI_AccessPoint_name_feature = Name -_UI_Control_name_feature = Name -_UI_DAI_name_feature = Name -_UI_DOI_name_feature = Name -_UI_DataSet_name_feature = Name -_UI_IED_name_feature = Name -_UI_Log_name_feature = Name -_UI_SDI_name_feature = Name -_UI_Terminal_name_feature = Name -_UI_AbstractDataAttribute_name_feature = Name -_UI_DataAttribute_name_feature = Name -_UI_DataObject_name_feature = Name -_UI_SDO_name_feature = Name -_UI_ClientLN_desc_feature = Desc -_UI_IED_originalSclRelease_feature = Original Scl Release -_UI_EnumVal_desc_feature = Desc -_UI_ServiceYesNo_type = Service Yes No -_UI_ServiceWithOptionalMax_type = Service With Optional Max -_UI_ServiceWithMaxNonZero_type = Service With Max Non Zero -_UI_ServiceConfReportControl_type = Service Conf Report Control -_UI_ServiceWithMaxAndMaxAttributes_type = Service With Max And Max Attributes -_UI_ServiceWithMaxAndModify_type = Service With Max And Modify -_UI_ServiceForConfDataSet_type = Service For Conf Data Set -_UI_ServiceWithOptionalMax_max_feature = Max -_UI_ServiceWithMaxNonZero_max_feature = Max -_UI_ServiceConfReportControl_bufMode_feature = Buf Mode -_UI_ServiceConfReportControl_bufConf_feature = Buf Conf -_UI_ServiceWithMaxAndMaxAttributes_maxAttributes_feature = Max Attributes -_UI_ServiceWithMaxAndModify_modify_feature = Modify -_UI_ServiceForConfDataSet_modify_feature = Modify -_UI_ProtNs_value_feature = Value +_UI_SclObject_lineNumber_feature = lineNumber +_UI_SCL_release_feature = release +_UI_UnNaming_type = UnNaming +_UI_IDNaming_desc_feature = desc +_UI_Naming_desc_feature = desc +_UI_UnNaming_desc_feature = desc +_UI_AccessPoint_name_feature = name +_UI_Control_name_feature = name +_UI_DAI_name_feature = name +_UI_DOI_name_feature = name +_UI_DataSet_name_feature = name +_UI_IED_name_feature = name +_UI_Log_name_feature = name +_UI_SDI_name_feature = name +_UI_Terminal_name_feature = name +_UI_AbstractDataAttribute_name_feature = name +_UI_DataAttribute_name_feature = name +_UI_DataObject_name_feature = name +_UI_SDO_name_feature = name +_UI_ClientLN_desc_feature = desc +_UI_IED_originalSclRelease_feature = originalSclRelease +_UI_EnumVal_desc_feature = desc +_UI_ServiceYesNo_type = ServiceYesNo +_UI_ServiceWithOptionalMax_type = ServiceWithOptionalMax +_UI_ServiceWithMaxNonZero_type = ServiceWithMaxNonZero +_UI_ServiceConfReportControl_type = ServiceConfReportControl +_UI_ServiceWithMaxAndMaxAttributes_type = ServiceWithMaxAndMaxAttributes +_UI_ServiceWithMaxAndModify_type = ServiceWithMaxAndModify +_UI_ServiceForConfDataSet_type = ServiceForConfDataSet +_UI_ServiceWithOptionalMax_max_feature = max +_UI_ServiceWithMaxNonZero_max_feature = max +_UI_ServiceConfReportControl_bufMode_feature = bufMode +_UI_ServiceConfReportControl_bufConf_feature = bufConf +_UI_ServiceWithMaxAndMaxAttributes_maxAttributes_feature = maxAttributes +_UI_ServiceWithMaxAndModify_modify_feature = modify +_UI_ServiceForConfDataSet_modify_feature = modify +_UI_ProtNs_value_feature = value _UI_Cert_type = Cert -_UI_Cert_commonName_feature = Common Name -_UI_Cert_idHierarchy_feature = Id Hierarchy -_UI_ValueWithUnit_type = Value With Unit -_UI_DurationInSec_type = Duration In Sec -_UI_MinTime_type = Min Time -_UI_MaxTime_type = Max Time -_UI_GSE_MinTime_feature = Min Time -_UI_GSE_MaxTime_feature = Max Time -_UI_ValueWithUnit_value_feature = Value -_UI_ValueWithUnit_multiplier_feature = Multiplier -_UI_ValueWithUnit_unit_feature = Unit -_UI_BitRate_type = Bit Rate -_UI_DurationInMilliSec_value_feature = Value -_UI_AnyLN_ExtRef_feature = Ext Ref +_UI_Cert_commonName_feature = commonName +_UI_Cert_idHierarchy_feature = idHierarchy +_UI_ValueWithUnit_type = ValueWithUnit +_UI_DurationInSec_type = DurationInSec +_UI_MinTime_type = MinTime +_UI_MaxTime_type = MaxTime +_UI_GSE_MinTime_feature = MinTime +_UI_GSE_MaxTime_feature = MaxTime +_UI_ValueWithUnit_value_feature = value +_UI_ValueWithUnit_multiplier_feature = multiplier +_UI_ValueWithUnit_unit_feature = unit +_UI_BitRate_type = BitRate +_UI_DurationInMilliSec_value_feature = value +_UI_AnyLN_ExtRef_feature = ExtRef _UI_ExtRef_LN_feature = LN -_UI_ExtRef_DataAttribute_feature = Data Attribute -_UI_ExtRef_DataObject_feature = Data Object -_UI_DataObject_ExtRef_feature = Ext Ref -_UI_DataAttribute_ExtRef_feature = Ext Ref -_UI_AnyLN_ClientLN_feature = Client LN +_UI_ExtRef_DataAttribute_feature = DataAttribute +_UI_ExtRef_DataObject_feature = DataObject +_UI_DataObject_ExtRef_feature = ExtRef +_UI_DataAttribute_ExtRef_feature = ExtRef +_UI_AnyLN_ClientLN_feature = ClientLN _UI_ClientLN_LN_feature = LN -_UI_AnyLN_ReferredByLogControl_feature = Referred By Log Control -_UI_LogControl_RefersToAnyLN_feature = Refers To Any LN -_UI_ConnectedAP_RefersToIED_feature = Refers To IED -_UI_ControlBlock_RefersToLDevice_feature = Refers To LDevice -_UI_ControlBlock_RefersToControlWithIEDName_feature = Refers To Control With IED Name -_UI_AbstractDataAttribute_RefersToEnumType_feature = Refers To Enum Type -_UI_DA_RefersToDAType_feature = Refers To DA Type -_UI_DAType_ReferredByDA_feature = Referred By DA -_UI_DO_RefersToDOType_feature = Refers To DO Type -_UI_DOType_ReferredByDO_feature = Referred By DO -_UI_EnumType_ReferredByAbstractDataAttribute_feature = Referred By Abstract Data Attribute -_UI_LNodeType_ReferredByAnyLN_feature = Referred By Any LN -_UI_AccessPoint_ReferredByServerAt_feature = Referred By Server At -_UI_AnyLN_RefersToLNodeType_feature = Refers To LNode Type -_UI_AnyLN_ReferredByFCDA_feature = Referred By FCDA -_UI_AnyLN_ReferredByExtRef_feature = Referred By Ext Ref -_UI_AnyLN_ReferredByClientLN_feature = Referred By Client LN -_UI_ClientLN_RefersToAnyLN_feature = Refers To Any LN -_UI_Control_RefersToDataSet_feature = Refers To Data Set -_UI_ControlWithIEDName_ReferredByControlBlock_feature = Referred By Control Block -_UI_DataSet_ReferredByControl_feature = Referred By Control -_UI_ExtRef_RefersToAnyLN_feature = Refers To Any LN -_UI_ExtRef_RefersToDataAttribute_feature = Refers To Data Attribute -_UI_ExtRef_RefersToDataObject_feature = Refers To Data Object -_UI_FCDA_RefersToDataAttribute_feature = Refers To Data Attribute -_UI_FCDA_RefersToDataObject_feature = Refers To Data Object -_UI_FCDA_RefersToAnyLN_feature = Refers To Any LN -_UI_IED_ReferredByConnectedAP_feature = Referred By Connected AP -_UI_LDevice_ReferredByControlBlock_feature = Referred By Control Block -_UI_ServerAt_RefersToAccessPoint_feature = Refers To Access Point -_UI_DataObject_ReferredByFCDA_feature = Referred By FCDA -_UI_DataObject_ReferredByExtRef_feature = Referred By Ext Ref -_UI_DataAttribute_ReferredByFCDA_feature = Referred By FCDA -_UI_DataAttribute_ReferredByExtRef_feature = Referred By Ext Ref -_UI_AnyLN_ReferredByAssociation_feature = Referred By Association -_UI_Association_RefersToAnyLN_feature = Refers To Any LN -_UI_AnyLN_ReferredIEDName_feature = Referred IED Name -_UI_IEDName_RefersToAnyLN_feature = Refers To Any LN -_UI_SmpRate_type = Smp Rate -_UI_SamplesPerSec_type = Samples Per Sec -_UI_SecPerSamples_type = Sec Per Samples -_UI_SMVSettings_svID_feature = Sv ID -_UI_SMVSettings_optFields_feature = Opt Fields -_UI_SMVSettings_smpRateAttribute_feature = Smp Rate Attribute -_UI_SMVSettings_samplesPerSecAttribute_feature = Samples Per Sec Attribute -_UI_SMVSettings_pdcTimeStamp_feature = Pdc Time Stamp -_UI_SMVSettings_SmpRate_feature = Smp Rate -_UI_SMVSettings_SamplesPerSec_feature = Samples Per Sec -_UI_SMVSettings_SecPerSamples_feature = Sec Per Samples -_UI_SmpRate_value_feature = Value -_UI_SamplesPerSec_value_feature = Value -_UI_SecPerSamples_value_feature = Value -_UI_ConnectedAP_RefersToAccessPoint_feature = Refers To Access Point -_UI_AccessPoint_ReferredByConnectedAP_feature = Referred By Connected AP -_UI_AccessPoint_ReferredByKDC_feature = Referred By KDC -_UI_KDC_RefersToAccessPoint_feature = Refers To Access Point -_UI_DOType_ReferredBySDO_feature = Referred By SDO -_UI_SDO_RefersToDOType_feature = Refers To DO Type -_UI_ExtRef_desc_feature = Desc -_UI_IEDName_value_feature = Value +_UI_AnyLN_ReferredByLogControl_feature = ReferredByLogControl +_UI_LogControl_RefersToAnyLN_feature = RefersToAnyLN +_UI_ConnectedAP_RefersToIED_feature = RefersToIED +_UI_ControlBlock_RefersToLDevice_feature = RefersToLDevice +_UI_ControlBlock_RefersToControlWithIEDName_feature = RefersToControlWithIEDName +_UI_AbstractDataAttribute_RefersToEnumType_feature = RefersToEnumType +_UI_DA_RefersToDAType_feature = RefersToDAType +_UI_DAType_ReferredByDA_feature = ReferredByDA +_UI_DO_RefersToDOType_feature = RefersToDOType +_UI_DOType_ReferredByDO_feature = ReferredByDO +_UI_EnumType_ReferredByAbstractDataAttribute_feature = ReferredByAbstractDataAttribute +_UI_LNodeType_ReferredByAnyLN_feature = ReferredByAnyLN +_UI_AccessPoint_ReferredByServerAt_feature = ReferredByServerAt +_UI_AnyLN_RefersToLNodeType_feature = RefersToLNodeType +_UI_AnyLN_ReferredByFCDA_feature = ReferredByFCDA +_UI_AnyLN_ReferredByExtRef_feature = ReferredByExtRef +_UI_AnyLN_ReferredByClientLN_feature = ReferredByClientLN +_UI_ClientLN_RefersToAnyLN_feature = RefersToAnyLN +_UI_Control_RefersToDataSet_feature = RefersToDataSet +_UI_ControlWithIEDName_ReferredByControlBlock_feature = ReferredByControlBlock +_UI_DataSet_ReferredByControl_feature = ReferredByControl +_UI_ExtRef_RefersToAnyLN_feature = RefersToAnyLN +_UI_ExtRef_RefersToDataAttribute_feature = RefersToDataAttribute +_UI_ExtRef_RefersToDataObject_feature = RefersToDataObject +_UI_FCDA_RefersToDataAttribute_feature = RefersToDataAttribute +_UI_FCDA_RefersToDataObject_feature = RefersToDataObject +_UI_FCDA_RefersToAnyLN_feature = RefersToAnyLN +_UI_IED_ReferredByConnectedAP_feature = ReferredByConnectedAP +_UI_LDevice_ReferredByControlBlock_feature = ReferredByControlBlock +_UI_ServerAt_RefersToAccessPoint_feature = RefersToAccessPoint +_UI_DataObject_ReferredByFCDA_feature = ReferredByFCDA +_UI_DataObject_ReferredByExtRef_feature = ReferredByExtRef +_UI_DataAttribute_ReferredByFCDA_feature = ReferredByFCDA +_UI_DataAttribute_ReferredByExtRef_feature = ReferredByExtRef +_UI_AnyLN_ReferredByAssociation_feature = ReferredByAssociation +_UI_Association_RefersToAnyLN_feature = RefersToAnyLN +_UI_AnyLN_ReferredIEDName_feature = ReferredIEDName +_UI_IEDName_RefersToAnyLN_feature = RefersToAnyLN +_UI_SmpRate_type = SmpRate +_UI_SamplesPerSec_type = SamplesPerSec +_UI_SecPerSamples_type = SecPerSamples +_UI_SMVSettings_svID_feature = svID +_UI_SMVSettings_optFields_feature = optFields +_UI_SMVSettings_smpRateAttribute_feature = smpRateAttribute +_UI_SMVSettings_samplesPerSecAttribute_feature = samplesPerSecAttribute +_UI_SMVSettings_pdcTimeStamp_feature = pdcTimeStamp +_UI_SMVSettings_SmpRate_feature = SmpRate +_UI_SMVSettings_SamplesPerSec_feature = SamplesPerSec +_UI_SMVSettings_SecPerSamples_feature = SecPerSamples +_UI_SmpRate_value_feature = value +_UI_SamplesPerSec_value_feature = value +_UI_SecPerSamples_value_feature = value +_UI_ConnectedAP_RefersToAccessPoint_feature = RefersToAccessPoint +_UI_AccessPoint_ReferredByConnectedAP_feature = ReferredByConnectedAP +_UI_AccessPoint_ReferredByKDC_feature = ReferredByKDC +_UI_KDC_RefersToAccessPoint_feature = RefersToAccessPoint +_UI_DOType_ReferredBySDO_feature = ReferredBySDO +_UI_SDO_RefersToDOType_feature = RefersToDOType +_UI_ExtRef_desc_feature = desc +_UI_IEDName_value_feature = value _UI_Line_Voltage_feature = Voltage _UI_Voltage_Line_feature = Line _UI_SMVSettings_Services_feature = Services -_UI_Services_SMVSettings_feature = SMV Settings -_UI_Line_nomFreq_feature = Nom Freq -_UI_Line_numPhases_feature = Num Phases -_UI_ClientServices_rGOOSE_feature = RGOOSE -_UI_ClientServices_rSV_feature = RSV -_UI_ClientServices_noIctBinding_feature = No Ict Binding -_UI_ExtRef_pServT_feature = PServ T -_UI_ExtRef_pLN_feature = PLN -_UI_ExtRef_pDO_feature = PDO -_UI_ExtRef_pDA_feature = PDA -_UI_GOOSE_goose_feature = Goose -_UI_GOOSE_rGOOSE_feature = RGOOSE -_UI_SMVSettings_synchSrcId_feature = Synch Src Id -_UI_SMVSettings_nofASDU_feature = Nof ASDU -_UI_SMVSettings_kdaParticipant_feature = Kda Participant -_UI_SMVsc_sv_feature = Sv -_UI_SMVsc_rSV_feature = RSV -_UI_SmvOpts_synchSourceId_feature = Synch Source Id -_UI_TimeSyncProt_iec61850_9_3_feature = Iec61850 93 -_UI_Terminal_lineName_feature = Line Name -_UI_ServiceConfReportControl_maxBuf_feature = Max Buf -_UI_McSecurity_type = Mc Security -_UI_ClientServices_McSecurity_feature = Mc Security -_UI_GSESettings_McSecurity_feature = Mc Security -_UI_SMVSettings_McSecurity_feature = Mc Security -_UI_McSecurity_ClientServices_feature = Client Services -_UI_McSecurity_GSESettings_feature = GSE Settings -_UI_McSecurity_SMVSettings_feature = SMV Settings -_UI_McSecurity_signature_feature = Signature -_UI_McSecurity_encryption_feature = Encryption -_UI_GSESettings_kdaParticipant_feature = Kda Participant -_UI_ConnectivityNode_ReferredByTerminal_feature = Referred By Terminal -_UI_Terminal_RefersToConnectivityNode_feature = Refers To Connectivity Node -_UI_Log_ReferredByLogControl_feature = Referred By Log Control -_UI_LogControl_RefersToLog_feature = Refers To Log -_UI_AnyLN_ReferredByLNode_feature = Referred By LNode -_UI_LDevice_AnyLN_feature = Any LN -_UI_LNode_RefersToAnyLN_feature = Refers To Any LN -_UI_AgAuthentication_type = Ag Authentication -_UI_AgSmvOpts_type = Ag Smv Opts -_UI_AgOptFields_type = Ag Opt Fields -_UI_AgDesc_type = Ag Desc -_UI_AgLDRef_type = Ag LD Ref -_UI_AgLNRef_type = Ag LN Ref -_UI_AgDATrgOp_type = Ag DA Trg Op -_UI_AgVirtual_type = Ag Virtual -_UI_AgAuthentication_certificate_feature = Certificate -_UI_AgAuthentication_none_feature = None -_UI_AgAuthentication_password_feature = Password -_UI_AgAuthentication_strong_feature = Strong -_UI_AgAuthentication_weak_feature = Weak -_UI_AgSmvOpts_dataSet_feature = Data Set -_UI_AgSmvOpts_refreshTime_feature = Refresh Time -_UI_AgSmvOpts_sampleRate_feature = Sample Rate -_UI_AgSmvOpts_sampleSynchronized_feature = Sample Synchronized -_UI_AgSmvOpts_security_feature = Security -_UI_AgSmvOpts_timestamp_feature = Timestamp -_UI_AgSmvOpts_synchSourceId_feature = Synch Source Id -_UI_AgOptFields_bufOvfl_feature = Buf Ovfl -_UI_AgOptFields_configRef_feature = Config Ref -_UI_AgOptFields_dataRef_feature = Data Ref -_UI_AgOptFields_dataSet_feature = Data Set -_UI_AgOptFields_entryID_feature = Entry ID -_UI_AgOptFields_reasonCode_feature = Reason Code -_UI_AgOptFields_seqNum_feature = Seq Num -_UI_AgOptFields_timeStamp_feature = Time Stamp -_UI_AgDesc_desc_feature = Desc -_UI_AgLDRef_iedName_feature = Ied Name -_UI_AgLDRef_ldInst_feature = Ld Inst -_UI_AgLNRef_lnClass_feature = Ln Class -_UI_AgLNRef_lnInst_feature = Ln Inst -_UI_AgLNRef_prefix_feature = Prefix -_UI_AgDATrgOp_dchg_feature = Dchg -_UI_AgDATrgOp_dupd_feature = Dupd -_UI_AgDATrgOp_qchg_feature = Qchg -_UI_AgVirtual_virtual_feature = Virtual -_UI_AgSmvOpts_dataRef_feature = Data Ref -_UI_AgOptFields_segmentation_feature = Segmentation -_UI_AbstractDataAttribute_RefersToDAType_feature = Refers To DA Type -_UI_DAType_ReferredByAbstractDataAttribute_feature = Referred By Abstract Data Attribute -_UI_AbstractDataAttribute_ReferredByFCDA_feature = Referred By FCDA -_UI_FCDA_RefersToAbstractDataAttribute_feature = Refers To Abstract Data Attribute -_UI_ControlBlock_ReferredByExtRef_feature = Referred By Ext Ref -_UI_AbstractDataAttribute_ReferredByExtRef_feature = Referred By Ext Ref -_UI_DOType_ReferredByExtRef_feature = Referred By Ext Ref -_UI_ExtRef_RefersToAbstractDataAttribute_feature = Refers To Abstract Data Attribute -_UI_ExtRef_RefersToDOType_feature = Refers To DO Type -_UI_ExtRef_RefersToControlBlock_feature = Refers To Control Block -_UI_Control_ReferredByExtRef_feature = Referred By Ext Ref -_UI_ExtRef_RefersToControl_feature = Refers To Control -_UI_ConnectedAP_ControlBlock_feature = Control Block -_UI_AnyLN_ControlWithTriggerOpt_feature = Control With Trigger Opt +_UI_Services_SMVSettings_feature = SMVSettings +_UI_Line_nomFreq_feature = nomFreq +_UI_Line_numPhases_feature = numPhases +_UI_ClientServices_rGOOSE_feature = rGOOSE +_UI_ClientServices_rSV_feature = rSV +_UI_ClientServices_noIctBinding_feature = noIctBinding +_UI_ExtRef_pServT_feature = pServT +_UI_ExtRef_pLN_feature = pLN +_UI_ExtRef_pDO_feature = pDO +_UI_ExtRef_pDA_feature = pDA +_UI_GOOSE_goose_feature = goose +_UI_GOOSE_rGOOSE_feature = rGOOSE +_UI_SMVSettings_synchSrcId_feature = synchSrcId +_UI_SMVSettings_nofASDU_feature = nofASDU +_UI_SMVSettings_kdaParticipant_feature = kdaParticipant +_UI_SMVsc_sv_feature = sv +_UI_SMVsc_rSV_feature = rSV +_UI_SmvOpts_synchSourceId_feature = synchSourceId +_UI_TimeSyncProt_iec61850_9_3_feature = iec61850_9_3 +_UI_Terminal_lineName_feature = lineName +_UI_ServiceConfReportControl_maxBuf_feature = maxBuf +_UI_McSecurity_type = McSecurity +_UI_ClientServices_McSecurity_feature = McSecurity +_UI_GSESettings_McSecurity_feature = McSecurity +_UI_SMVSettings_McSecurity_feature = McSecurity +_UI_McSecurity_ClientServices_feature = ClientServices +_UI_McSecurity_GSESettings_feature = GSESettings +_UI_McSecurity_SMVSettings_feature = SMVSettings +_UI_McSecurity_signature_feature = signature +_UI_McSecurity_encryption_feature = encryption +_UI_GSESettings_kdaParticipant_feature = kdaParticipant +_UI_ConnectivityNode_ReferredByTerminal_feature = ReferredByTerminal +_UI_Terminal_RefersToConnectivityNode_feature = RefersToConnectivityNode +_UI_Log_ReferredByLogControl_feature = ReferredByLogControl +_UI_LogControl_RefersToLog_feature = RefersToLog +_UI_AnyLN_ReferredByLNode_feature = ReferredByLNode +_UI_LDevice_AnyLN_feature = AnyLN +_UI_LNode_RefersToAnyLN_feature = RefersToAnyLN +_UI_AgAuthentication_type = AgAuthentication +_UI_AgSmvOpts_type = AgSmvOpts +_UI_AgOptFields_type = AgOptFields +_UI_AgDesc_type = AgDesc +_UI_AgLDRef_type = AgLDRef +_UI_AgLNRef_type = AgLNRef +_UI_AgDATrgOp_type = AgDATrgOp +_UI_AgVirtual_type = AgVirtual +_UI_AgAuthentication_certificate_feature = certificate +_UI_AgAuthentication_none_feature = none +_UI_AgAuthentication_password_feature = password +_UI_AgAuthentication_strong_feature = strong +_UI_AgAuthentication_weak_feature = weak +_UI_AgSmvOpts_dataSet_feature = dataSet +_UI_AgSmvOpts_refreshTime_feature = refreshTime +_UI_AgSmvOpts_sampleRate_feature = sampleRate +_UI_AgSmvOpts_sampleSynchronized_feature = sampleSynchronized +_UI_AgSmvOpts_security_feature = security +_UI_AgSmvOpts_timestamp_feature = timestamp +_UI_AgSmvOpts_synchSourceId_feature = synchSourceId +_UI_AgOptFields_bufOvfl_feature = bufOvfl +_UI_AgOptFields_configRef_feature = configRef +_UI_AgOptFields_dataRef_feature = dataRef +_UI_AgOptFields_dataSet_feature = dataSet +_UI_AgOptFields_entryID_feature = entryID +_UI_AgOptFields_reasonCode_feature = reasonCode +_UI_AgOptFields_seqNum_feature = seqNum +_UI_AgOptFields_timeStamp_feature = timeStamp +_UI_AgDesc_desc_feature = desc +_UI_AgLDRef_iedName_feature = iedName +_UI_AgLDRef_ldInst_feature = ldInst +_UI_AgLNRef_lnClass_feature = lnClass +_UI_AgLNRef_lnInst_feature = lnInst +_UI_AgLNRef_prefix_feature = prefix +_UI_AgDATrgOp_dchg_feature = dchg +_UI_AgDATrgOp_dupd_feature = dupd +_UI_AgDATrgOp_qchg_feature = qchg +_UI_AgVirtual_virtual_feature = virtual +_UI_AgSmvOpts_dataRef_feature = dataRef +_UI_AgOptFields_segmentation_feature = segmentation +_UI_AbstractDataAttribute_RefersToDAType_feature = RefersToDAType +_UI_DAType_ReferredByAbstractDataAttribute_feature = ReferredByAbstractDataAttribute +_UI_AbstractDataAttribute_ReferredByFCDA_feature = ReferredByFCDA +_UI_FCDA_RefersToAbstractDataAttribute_feature = RefersToAbstractDataAttribute +_UI_ControlBlock_ReferredByExtRef_feature = ReferredByExtRef +_UI_AbstractDataAttribute_ReferredByExtRef_feature = ReferredByExtRef +_UI_DOType_ReferredByExtRef_feature = ReferredByExtRef +_UI_ExtRef_RefersToAbstractDataAttribute_feature = RefersToAbstractDataAttribute +_UI_ExtRef_RefersToDOType_feature = RefersToDOType +_UI_ExtRef_RefersToControlBlock_feature = RefersToControlBlock +_UI_Control_ReferredByExtRef_feature = ReferredByExtRef +_UI_ExtRef_RefersToControl_feature = RefersToControl +_UI_ConnectedAP_ControlBlock_feature = ControlBlock +_UI_AnyLN_ControlWithTriggerOpt_feature = ControlWithTriggerOpt _UI_AnyLN_Control_feature = Control -_UI_LN0_ControlWithIEDName_feature = Control With IED Name -_UI_AnyLN_ReferredByIEDName_feature = Referred By IED Name -_UI_IED_ReferredByIEDName_feature = Referred By IED Name -_UI_IEDName_RefersToIed_feature = Refers To Ied -_UI_IEDName_RefersToLDevice_feature = Refers To LDevice -_UI_LDevice_ReferredByIEDName_feature = Referred By IED Name -_UI_IEDName_RefersToIED_feature = Refers To IED -_UI_Header_ParentSCL_feature = Parent SCL -_UI_History_ParentHeader_feature = Parent Header -_UI_Hitem_ParentHistory_feature = Parent History -_UI_Line_ParentProcess_feature = Parent Process -_UI_Line_ParentSCL_feature = Parent SCL -_UI_Private_ParentBaseElement_feature = Parent Base Element -_UI_Process_ParentSCL_feature = Parent SCL -_UI_Text_ParentBaseElement_feature = Parent Base Element -_UI_Text_ParentHeader_feature = Parent Header -_UI_Address_ParentConnectedAP_feature = Parent Connected AP -_UI_Address_ParentControlBlock_feature = Parent Control Block -_UI_Communication_ParentSCL_feature = Parent SCL -_UI_ConnectedAP_ParentSubNetwork_feature = Parent Sub Network -_UI_GSE_ParentConnectedAP_feature = Parent Connected AP -_UI_P_ParentAddress_feature = Parent Address -_UI_P_PhysConn_ParentPhysConn_feature = Parent Phys Conn -_UI_PhysConn_ParentConnectedAP_feature = Parent Connected AP -_UI_SMV_ParentConnectedAP_feature = Parent Connected AP -_UI_SubNetwork_ParentCommunication_feature = Parent Communication -_UI_BDA_ParentDAType_feature = Parent DA Type -_UI_DA_ParentDOType_feature = Parent DO Type -_UI_DAType_ParentDataTypeTemplates_feature = Parent Data Type Templates -_UI_DO_ParentLNodeType_feature = Parent LNode Type -_UI_DOType_ParentDataTypeTemplates_feature = Parent Data Type Templates -_UI_DataTypeTemplates_ParentSCL_feature = Parent SCL -_UI_EnumType_ParentDataTypeTemplates_feature = Parent Data Type Templates -_UI_EnumVal_ParentEnumType_feature = Parent Enum Type -_UI_LNodeType_ParentDataTypeTemplates_feature = Parent Data Type Templates -_UI_ProtNs_ParentDA_feature = Parent DA -_UI_ProtNs_ParentDAType_feature = Parent DA Type -_UI_SDO_ParentDOType_feature = Parent DO Type -_UI_Val_ParentAbstractDataAttribute_feature = Parent Abstract Data Attribute -_UI_Val_ParentDAI_feature = Parent DAI -_UI_AccessControl_ParentLDevice_feature = Parent LDevice -_UI_AccessPoint_ParentIED_feature = Parent IED -_UI_Association_ParentServer_feature = Parent Server -_UI_Authentication_ParentServer_feature = Parent Server -_UI_ClientLN_ParentRptEnabled_feature = Parent Rpt Enabled -_UI_ClientServices_ParentServices_feature = Parent Services -_UI_CommProt_ParentServices_feature = Parent Services -_UI_ConfDataSet_ParentServices_feature = Parent Services -_UI_ConfLNs_ParentServices_feature = Parent Services -_UI_ConfLdName_ParentServices_feature = Parent Services -_UI_ConfLogControl_ParentServices_feature = Parent Services -_UI_ConfReportControl_ParentServices_feature = Parent Services -_UI_ConfSG_ParentSettingGroups_feature = Parent Setting Groups -_UI_ConfSigRef_ParentServices_feature = Parent Services -_UI_DAI_ParentDOI_feature = Parent DOI -_UI_DAI_ParentSDI_feature = Parent SDI -_UI_DOI_ParentAnyLN_feature = Parent Any LN -_UI_DataObjectDirectory_ParentServices_feature = Parent Services -_UI_DataSet_ParentAnyLN_feature = Parent Any LN -_UI_DataSetDirectory_ParentServices_feature = Parent Services -_UI_DynAssociation_ParentServices_feature = Parent Services -_UI_DynDataSet_ParentServices_feature = Parent Services -_UI_ExtRef_ParentInputs_feature = Parent Inputs -_UI_FCDA_ParentDataSet_feature = Parent Data Set -_UI_FileHandling_ParentServices_feature = Parent Services -_UI_GOOSE_ParentServices_feature = Parent Services -_UI_GOOSESecurity_ParentAccessPoint_feature = Parent Access Point -_UI_GSEControl_ParentLN0_feature = Parent LN0 -_UI_GSEDir_ParentServices_feature = Parent Services -_UI_GSESettings_ParentServices_feature = Parent Services -_UI_GSSE_ParentServices_feature = Parent Services -_UI_GetCBValues_ParentServices_feature = Parent Services -_UI_GetDataObjectDefinition_ParentServices_feature = Parent Services -_UI_GetDataSetValue_ParentServices_feature = Parent Services -_UI_GetDirectory_ParentServices_feature = Parent Services -_UI_IED_ParentSCL_feature = Parent SCL -_UI_IEDName_ParentControlWithIEDName_feature = Parent Control With IED Name -_UI_Inputs_ParentAnyLN_feature = Parent Any LN -_UI_IssuerName_ParentCertificate_feature = Parent Certificate -_UI_KDC_ParentIED_feature = Parent IED -_UI_LDevice_ParentServer_feature = Parent Server -_UI_LN_ParentAccessPoint_feature = Parent Access Point -_UI_LN_ParentLDevice_feature = Parent LDevice -_UI_LN0_ParentLDevice_feature = Parent LDevice -_UI_Log_ParentAnyLN_feature = Parent Any LN -_UI_LogControl_ParentAnyLN_feature = Parent Any LN -_UI_LogSettings_ParentServices_feature = Parent Services -_UI_OptFields_ParentReportControl_feature = Parent Report Control -_UI_Protocol_ParentControlWithIEDName_feature = Parent Control With IED Name -_UI_ReadWrite_ParentServices_feature = Parent Services -_UI_RedProt_ParentServices_feature = Parent Services -_UI_ReportControl_ParentAnyLN_feature = Parent Any LN -_UI_ReportSettings_ParentServices_feature = Parent Services -_UI_RptEnabled_ParentReportControl_feature = Parent Report Control -_UI_SDI_ParentDOI_feature = Parent DOI -_UI_SGEdit_ParentSettingGroups_feature = Parent Setting Groups -_UI_SMVSecurity_ParentAccessPoint_feature = Parent Access Point -_UI_SMVSettings_ParentServices_feature = Parent Services -_UI_SMVsc_ParentServices_feature = Parent Services -_UI_SampledValueControl_ParentLN0_feature = Parent LN0 -_UI_Server_ParentAccessPoint_feature = Parent Access Point -_UI_ServerAt_ParentAccessPoint_feature = Parent Access Point -_UI_Services_ParentAccessPoint_feature = Parent Access Point -_UI_Services_ParentIED_feature = Parent IED -_UI_SetDataSetValue_ParentServices_feature = Parent Services -_UI_SettingControl_ParentLN0_feature = Parent LN0 -_UI_SettingGroups_ParentServices_feature = Parent Services -_UI_SmvOpts_ParentSampledValueControl_feature = Parent Sampled Value Control -_UI_Subject_ParentCertificate_feature = Parent Certificate -_UI_SupSubscription_ParentServices_feature = Parent Services -_UI_TimeSyncProt_ParentClientServices_feature = Parent Client Services -_UI_TimeSyncProt_ParentServices_feature = Parent Services -_UI_TimerActivatedControl_ParentServices_feature = Parent Services -_UI_TrgOps_ParentControlWithTriggerOpt_feature = Parent Control With Trigger Opt -_UI_ValueHandling_ParentServices_feature = Parent Services -_UI_Bay_ParentVoltageLevel_feature = Parent Voltage Level -_UI_ConductingEquipment_ParentBay_feature = Parent Bay -_UI_ConductingEquipment_ParentFunction_feature = Parent Function -_UI_ConductingEquipment_ParentSubFunction_feature = Parent Sub Function -_UI_ConductingEquipment_ParentLine_feature = Parent Line -_UI_ConductingEquipment_ParentProcess_feature = Parent Process -_UI_ConnectivityNode_ParentBay_feature = Parent Bay -_UI_ConnectivityNode_ParentLine_feature = Parent Line -_UI_EqFunction_ParentConductingEquipment_feature = Parent Conducting Equipment -_UI_EqFunction_ParentGeneralEquipment_feature = Parent General Equipment -_UI_EqFunction_ParentPowerTransformer_feature = Parent Power Transformer -_UI_EqFunction_ParentSubEquipment_feature = Parent Sub Equipment -_UI_EqFunction_ParentTransformerWinding_feature = Parent Transformer Winding -_UI_EqFunction_ParentTapChanger_feature = Parent Tap Changer -_UI_EqSubFunction_ParentAbstractEqFuncSubFunc_feature = Parent Abstract Eq Func Sub Func -_UI_Function_ParentBay_feature = Parent Bay -_UI_Function_ParentGeneralEquipmentContainer_feature = Parent General Equipment Container -_UI_Function_ParentSubstation_feature = Parent Substation -_UI_Function_ParentVoltageLevel_feature = Parent Voltage Level -_UI_GeneralEquipment_ParentAbstractEqFuncSubFunc_feature = Parent Abstract Eq Func Sub Func -_UI_GeneralEquipment_ParentEquipmentContainer_feature = Parent Equipment Container -_UI_GeneralEquipment_ParentFunction_feature = Parent Function -_UI_GeneralEquipment_ParentGeneralEquipmentContainer_feature = Parent General Equipment Container -_UI_GeneralEquipment_ParentSubFunction_feature = Parent Sub Function -_UI_LNode_ParentLNodeContainer_feature = Parent LNode Container -_UI_NeutralPoint_ParentTransformerWinding_feature = Parent Transformer Winding -_UI_PowerTransformer_ParentEquipmentContainer_feature = Parent Equipment Container -_UI_SubEquipment_ParentAbstractConductingEquipment_feature = Parent Abstract Conducting Equipment -_UI_SubEquipment_ParentPowerTransformer_feature = Parent Power Transformer -_UI_SubEquipment_ParentTapChanger_feature = Parent Tap Changer -_UI_SubFunction_ParentFunction_feature = Parent Function -_UI_SubFunction_ParentSubFunction_feature = Parent Sub Function -_UI_Substation_ParentProcess_feature = Parent Process -_UI_Substation_ParentSCL_feature = Parent SCL -_UI_TapChanger_ParentTransformerWinding_feature = Parent Transformer Winding -_UI_Terminal_ParentAbstractConductingEquipment_feature = Parent Abstract Conducting Equipment -_UI_TransformerWinding_ParentPowerTransformer_feature = Parent Power Transformer -_UI_Voltage_ParentLine_feature = Parent Line -_UI_Voltage_ParentVoltageLevel_feature = Parent Voltage Level -_UI_VoltageLevel_ParentSubstation_feature = Parent Substation -_UI_BitRate_ParentSubNetwork_feature = Parent Sub Network -_UI_SmpRate_ParentSMVSettings_feature = Parent SMV Settings -_UI_SamplesPerSec_ParentSMVSettings_feature = Parent SMV Settings -_UI_SecPerSamples_ParentSMVSettings_feature = Parent SMV Settings -_UI_McSecurity_ParentClientServices_feature = Parent Client Services -_UI_McSecurity_ParentGSESettings_feature = Parent GSE Settings -_UI_McSecurity_ParentSMVSettings_feature = Parent SMV Settings -_UI_AbstractDataObject_type = Abstract Data Object -_UI_DOType_ReferredByAbstractDataObject_feature = Referred By Abstract Data Object -_UI_ExtRef_RefersToAbstractDataObject_feature = Refers To Abstract Data Object -_UI_AbstractDataObject_name_feature = Name -_UI_AbstractDataObject_type_feature = Type -_UI_AbstractDataObject_RefersToDOType_feature = Refers To DO Type -_UI_AbstractDataObject_ReferredByExtRef_feature = Referred By Ext Ref -_UI_DO_ReferredByDOI_feature = Referred By DOI -_UI_DOI_RefersToDO_feature = Refers To DO -_UI_DA_ReferredByDAI_feature = Referred By DAI -_UI_DAI_RefersToDA_feature = Refers To DA -_UI_AbstractDataAttribute_ReferredByDAI_feature = Referred By DAI -_UI_AbstractDataAttribute_ReferredBySDI_feature = Referred By SDI -_UI_SDO_ReferredBySDI_feature = Referred By SDI -_UI_DAI_RefersToAbstractDataAttribute_feature = Refers To Abstract Data Attribute -_UI_SDI_RefersToSDO_feature = Refers To SDO -_UI_SDI_RefersToAbstractDataAttribute_feature = Refers To Abstract Data Attribute -_UI_IRiseClipseConsole_type = IRise Clipse Console -_UI_SclObject_explicitLinksBuilt_feature = Explicit Links Built -_UI_LNodeType_ReferredByLNode_feature = Referred By LNode -_UI_LNode_RefersToLNodeType_feature = Refers To LNode Type -_UI_LDevice_RefersToHigherLevelLDevice_feature = Refers To Higher Level LDevice -_UI_LDevice_RefersToLowerLevelLDevices_feature = Refers To Lower Level LDevices -_UI_INamespaceGetter_type = INamespace Getter -_UI_INamespaceGetter_namespace_feature = Namespace -_UI_Private_value_feature = Value -_UI_SclObject_filename_feature = Filename -_UI_MinTime_ParentGSE_feature = Parent GSE -_UI_MaxTime_ParentGSE_feature = Parent GSE +_UI_LN0_ControlWithIEDName_feature = ControlWithIEDName +_UI_AnyLN_ReferredByIEDName_feature = ReferredByIEDName +_UI_IED_ReferredByIEDName_feature = ReferredByIEDName +_UI_IEDName_RefersToIed_feature = RefersToIed +_UI_IEDName_RefersToLDevice_feature = RefersToLDevice +_UI_LDevice_ReferredByIEDName_feature = ReferredByIEDName +_UI_IEDName_RefersToIED_feature = RefersToIED +_UI_Header_ParentSCL_feature = ParentSCL +_UI_History_ParentHeader_feature = ParentHeader +_UI_Hitem_ParentHistory_feature = ParentHistory +_UI_Line_ParentProcess_feature = ParentProcess +_UI_Line_ParentSCL_feature = ParentSCL +_UI_Private_ParentBaseElement_feature = ParentBaseElement +_UI_Process_ParentSCL_feature = ParentSCL +_UI_Text_ParentBaseElement_feature = ParentBaseElement +_UI_Text_ParentHeader_feature = ParentHeader +_UI_Address_ParentConnectedAP_feature = ParentConnectedAP +_UI_Address_ParentControlBlock_feature = ParentControlBlock +_UI_Communication_ParentSCL_feature = ParentSCL +_UI_ConnectedAP_ParentSubNetwork_feature = ParentSubNetwork +_UI_GSE_ParentConnectedAP_feature = ParentConnectedAP +_UI_P_ParentAddress_feature = ParentAddress +_UI_P_PhysConn_ParentPhysConn_feature = PhysConn_ParentPhysConn +_UI_PhysConn_ParentConnectedAP_feature = ParentConnectedAP +_UI_SMV_ParentConnectedAP_feature = ParentConnectedAP +_UI_SubNetwork_ParentCommunication_feature = ParentCommunication +_UI_BDA_ParentDAType_feature = ParentDAType +_UI_DA_ParentDOType_feature = ParentDOType +_UI_DAType_ParentDataTypeTemplates_feature = ParentDataTypeTemplates +_UI_DO_ParentLNodeType_feature = ParentLNodeType +_UI_DOType_ParentDataTypeTemplates_feature = ParentDataTypeTemplates +_UI_DataTypeTemplates_ParentSCL_feature = ParentSCL +_UI_EnumType_ParentDataTypeTemplates_feature = ParentDataTypeTemplates +_UI_EnumVal_ParentEnumType_feature = ParentEnumType +_UI_LNodeType_ParentDataTypeTemplates_feature = ParentDataTypeTemplates +_UI_ProtNs_ParentDA_feature = ParentDA +_UI_ProtNs_ParentDAType_feature = ParentDAType +_UI_SDO_ParentDOType_feature = ParentDOType +_UI_Val_ParentAbstractDataAttribute_feature = ParentAbstractDataAttribute +_UI_Val_ParentDAI_feature = ParentDAI +_UI_AccessControl_ParentLDevice_feature = ParentLDevice +_UI_AccessPoint_ParentIED_feature = ParentIED +_UI_Association_ParentServer_feature = ParentServer +_UI_Authentication_ParentServer_feature = ParentServer +_UI_ClientLN_ParentRptEnabled_feature = ParentRptEnabled +_UI_ClientServices_ParentServices_feature = ParentServices +_UI_CommProt_ParentServices_feature = ParentServices +_UI_ConfDataSet_ParentServices_feature = ParentServices +_UI_ConfLNs_ParentServices_feature = ParentServices +_UI_ConfLdName_ParentServices_feature = ParentServices +_UI_ConfLogControl_ParentServices_feature = ParentServices +_UI_ConfReportControl_ParentServices_feature = ParentServices +_UI_ConfSG_ParentSettingGroups_feature = ParentSettingGroups +_UI_ConfSigRef_ParentServices_feature = ParentServices +_UI_DAI_ParentDOI_feature = ParentDOI +_UI_DAI_ParentSDI_feature = ParentSDI +_UI_DOI_ParentAnyLN_feature = ParentAnyLN +_UI_DataObjectDirectory_ParentServices_feature = ParentServices +_UI_DataSet_ParentAnyLN_feature = ParentAnyLN +_UI_DataSetDirectory_ParentServices_feature = ParentServices +_UI_DynAssociation_ParentServices_feature = ParentServices +_UI_DynDataSet_ParentServices_feature = ParentServices +_UI_ExtRef_ParentInputs_feature = ParentInputs +_UI_FCDA_ParentDataSet_feature = ParentDataSet +_UI_FileHandling_ParentServices_feature = ParentServices +_UI_GOOSE_ParentServices_feature = ParentServices +_UI_GOOSESecurity_ParentAccessPoint_feature = ParentAccessPoint +_UI_GSEControl_ParentLN0_feature = ParentLN0 +_UI_GSEDir_ParentServices_feature = ParentServices +_UI_GSESettings_ParentServices_feature = ParentServices +_UI_GSSE_ParentServices_feature = ParentServices +_UI_GetCBValues_ParentServices_feature = ParentServices +_UI_GetDataObjectDefinition_ParentServices_feature = ParentServices +_UI_GetDataSetValue_ParentServices_feature = ParentServices +_UI_GetDirectory_ParentServices_feature = ParentServices +_UI_IED_ParentSCL_feature = ParentSCL +_UI_IEDName_ParentControlWithIEDName_feature = ParentControlWithIEDName +_UI_Inputs_ParentAnyLN_feature = ParentAnyLN +_UI_IssuerName_ParentCertificate_feature = ParentCertificate +_UI_KDC_ParentIED_feature = ParentIED +_UI_LDevice_ParentServer_feature = ParentServer +_UI_LN_ParentAccessPoint_feature = ParentAccessPoint +_UI_LN_ParentLDevice_feature = ParentLDevice +_UI_LN0_ParentLDevice_feature = ParentLDevice +_UI_Log_ParentAnyLN_feature = ParentAnyLN +_UI_LogControl_ParentAnyLN_feature = ParentAnyLN +_UI_LogSettings_ParentServices_feature = ParentServices +_UI_OptFields_ParentReportControl_feature = ParentReportControl +_UI_Protocol_ParentControlWithIEDName_feature = ParentControlWithIEDName +_UI_ReadWrite_ParentServices_feature = ParentServices +_UI_RedProt_ParentServices_feature = ParentServices +_UI_ReportControl_ParentAnyLN_feature = ParentAnyLN +_UI_ReportSettings_ParentServices_feature = ParentServices +_UI_RptEnabled_ParentReportControl_feature = ParentReportControl +_UI_SDI_ParentDOI_feature = ParentDOI +_UI_SGEdit_ParentSettingGroups_feature = ParentSettingGroups +_UI_SMVSecurity_ParentAccessPoint_feature = ParentAccessPoint +_UI_SMVSettings_ParentServices_feature = ParentServices +_UI_SMVsc_ParentServices_feature = ParentServices +_UI_SampledValueControl_ParentLN0_feature = ParentLN0 +_UI_Server_ParentAccessPoint_feature = ParentAccessPoint +_UI_ServerAt_ParentAccessPoint_feature = ParentAccessPoint +_UI_Services_ParentAccessPoint_feature = ParentAccessPoint +_UI_Services_ParentIED_feature = ParentIED +_UI_SetDataSetValue_ParentServices_feature = ParentServices +_UI_SettingControl_ParentLN0_feature = ParentLN0 +_UI_SettingGroups_ParentServices_feature = ParentServices +_UI_SmvOpts_ParentSampledValueControl_feature = ParentSampledValueControl +_UI_Subject_ParentCertificate_feature = ParentCertificate +_UI_SupSubscription_ParentServices_feature = ParentServices +_UI_TimeSyncProt_ParentClientServices_feature = ParentClientServices +_UI_TimeSyncProt_ParentServices_feature = ParentServices +_UI_TimerActivatedControl_ParentServices_feature = ParentServices +_UI_TrgOps_ParentControlWithTriggerOpt_feature = ParentControlWithTriggerOpt +_UI_ValueHandling_ParentServices_feature = ParentServices +_UI_Bay_ParentVoltageLevel_feature = ParentVoltageLevel +_UI_ConductingEquipment_ParentBay_feature = ParentBay +_UI_ConductingEquipment_ParentFunction_feature = ParentFunction +_UI_ConductingEquipment_ParentSubFunction_feature = ParentSubFunction +_UI_ConductingEquipment_ParentLine_feature = ParentLine +_UI_ConductingEquipment_ParentProcess_feature = ParentProcess +_UI_ConnectivityNode_ParentBay_feature = ParentBay +_UI_ConnectivityNode_ParentLine_feature = ParentLine +_UI_EqFunction_ParentConductingEquipment_feature = ParentConductingEquipment +_UI_EqFunction_ParentGeneralEquipment_feature = ParentGeneralEquipment +_UI_EqFunction_ParentPowerTransformer_feature = ParentPowerTransformer +_UI_EqFunction_ParentSubEquipment_feature = ParentSubEquipment +_UI_EqFunction_ParentTransformerWinding_feature = ParentTransformerWinding +_UI_EqFunction_ParentTapChanger_feature = ParentTapChanger +_UI_EqSubFunction_ParentAbstractEqFuncSubFunc_feature = ParentAbstractEqFuncSubFunc +_UI_Function_ParentBay_feature = ParentBay +_UI_Function_ParentGeneralEquipmentContainer_feature = ParentGeneralEquipmentContainer +_UI_Function_ParentSubstation_feature = ParentSubstation +_UI_Function_ParentVoltageLevel_feature = ParentVoltageLevel +_UI_GeneralEquipment_ParentAbstractEqFuncSubFunc_feature = ParentAbstractEqFuncSubFunc +_UI_GeneralEquipment_ParentEquipmentContainer_feature = ParentEquipmentContainer +_UI_GeneralEquipment_ParentFunction_feature = ParentFunction +_UI_GeneralEquipment_ParentGeneralEquipmentContainer_feature = ParentGeneralEquipmentContainer +_UI_GeneralEquipment_ParentSubFunction_feature = ParentSubFunction +_UI_LNode_ParentLNodeContainer_feature = ParentLNodeContainer +_UI_NeutralPoint_ParentTransformerWinding_feature = ParentTransformerWinding +_UI_PowerTransformer_ParentEquipmentContainer_feature = ParentEquipmentContainer +_UI_SubEquipment_ParentAbstractConductingEquipment_feature = ParentAbstractConductingEquipment +_UI_SubEquipment_ParentPowerTransformer_feature = ParentPowerTransformer +_UI_SubEquipment_ParentTapChanger_feature = ParentTapChanger +_UI_SubFunction_ParentFunction_feature = ParentFunction +_UI_SubFunction_ParentSubFunction_feature = ParentSubFunction +_UI_Substation_ParentProcess_feature = ParentProcess +_UI_Substation_ParentSCL_feature = ParentSCL +_UI_TapChanger_ParentTransformerWinding_feature = ParentTransformerWinding +_UI_Terminal_ParentAbstractConductingEquipment_feature = ParentAbstractConductingEquipment +_UI_TransformerWinding_ParentPowerTransformer_feature = ParentPowerTransformer +_UI_Voltage_ParentLine_feature = ParentLine +_UI_Voltage_ParentVoltageLevel_feature = ParentVoltageLevel +_UI_VoltageLevel_ParentSubstation_feature = ParentSubstation +_UI_BitRate_ParentSubNetwork_feature = ParentSubNetwork +_UI_SmpRate_ParentSMVSettings_feature = ParentSMVSettings +_UI_SamplesPerSec_ParentSMVSettings_feature = ParentSMVSettings +_UI_SecPerSamples_ParentSMVSettings_feature = ParentSMVSettings +_UI_McSecurity_ParentClientServices_feature = ParentClientServices +_UI_McSecurity_ParentGSESettings_feature = ParentGSESettings +_UI_McSecurity_ParentSMVSettings_feature = ParentSMVSettings +_UI_AbstractDataObject_type = AbstractDataObject +_UI_DOType_ReferredByAbstractDataObject_feature = ReferredByAbstractDataObject +_UI_ExtRef_RefersToAbstractDataObject_feature = RefersToAbstractDataObject +_UI_AbstractDataObject_name_feature = name +_UI_AbstractDataObject_type_feature = type +_UI_AbstractDataObject_RefersToDOType_feature = RefersToDOType +_UI_AbstractDataObject_ReferredByExtRef_feature = ReferredByExtRef +_UI_DO_ReferredByDOI_feature = ReferredByDOI +_UI_DOI_RefersToDO_feature = RefersToDO +_UI_DA_ReferredByDAI_feature = ReferredByDAI +_UI_DAI_RefersToDA_feature = RefersToDA +_UI_AbstractDataAttribute_ReferredByDAI_feature = ReferredByDAI +_UI_AbstractDataAttribute_ReferredBySDI_feature = ReferredBySDI +_UI_SDO_ReferredBySDI_feature = ReferredBySDI +_UI_DAI_RefersToAbstractDataAttribute_feature = RefersToAbstractDataAttribute +_UI_SDI_RefersToSDO_feature = RefersToSDO +_UI_SDI_RefersToAbstractDataAttribute_feature = RefersToAbstractDataAttribute +_UI_IRiseClipseConsole_type = IRiseClipseConsole +_UI_SclObject_explicitLinksBuilt_feature = explicitLinksBuilt +_UI_LNodeType_ReferredByLNode_feature = ReferredByLNode +_UI_LNode_RefersToLNodeType_feature = RefersToLNodeType +_UI_LDevice_RefersToHigherLevelLDevice_feature = RefersToHigherLevelLDevice +_UI_LDevice_RefersToLowerLevelLDevices_feature = RefersToLowerLevelLDevices +_UI_INamespaceGetter_type = INamespaceGetter +_UI_INamespaceGetter_namespace_feature = namespace +_UI_Private_value_feature = value +_UI_SclObject_filename_feature = filename +_UI_MinTime_ParentGSE_feature = ParentGSE +_UI_MaxTime_ParentGSE_feature = ParentGSE 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 6fc6a8f9..9c0e52d9 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 @@ -196,13 +196,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( Authentication ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_Authentication_type" ) - : getString( "_UI_Authentication_type" ) + " " + label; + return getString( "_UI_Authentication_type" ); } /** 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 c20739de..cc736bea 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 @@ -436,13 +436,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( ClientServices ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_ClientServices_type" ) - : getString( "_UI_ClientServices_type" ) + " " + label; + return getString( "_UI_ClientServices_type" ); } /** 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 984f01e7..2f47faa1 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 @@ -110,13 +110,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( Communication ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_Communication_type" ) - : getString( "_UI_Communication_type" ) + " " + label; + return getString( "_UI_Communication_type" ); } /** 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 fc1be56e..1070eb4a 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 @@ -159,13 +159,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( DAType ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_DAType_type" ) - : getString( "_UI_DAType_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_DAType_type" )); + s.append( ": " ); + + s.append( getString( "_UI_IDNaming_id_feature" )); + s.append( "=\"" ); + s.append((( DAType ) object ).getId()); + s.append( "\" "); + + s.append( "("); + s.append((( DAType ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 f717952d..d66f1774 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 @@ -204,13 +204,30 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( DOType ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_DOType_type" ) - : getString( "_UI_DOType_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_DOType_type" )); + s.append( ": " ); + + s.append( getString( "_UI_DOType_cdc_feature" )); + s.append( "=\"" ); + s.append((( DOType ) object ).getCdc()); + s.append( "\" "); + + s.append( getString( "_UI_IDNaming_id_feature" )); + s.append( "=\"" ); + s.append((( DOType ) object ).getId()); + s.append( "\" "); + + s.append( "("); + s.append((( DOType ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 9e7393d8..062d5cbd 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 @@ -114,13 +114,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( DataTypeTemplates ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_DataTypeTemplates_type" ) - : getString( "_UI_DataTypeTemplates_type" ) + " " + label; + return getString( "_UI_DataTypeTemplates_type" ); } /** 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 c9d3f0c1..da1e8af7 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 @@ -134,13 +134,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( EnumType ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_EnumType_type" ) - : getString( "_UI_EnumType_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_EnumType_type" )); + s.append( ": " ); + + s.append( getString( "_UI_IDNaming_id_feature" )); + s.append( "=\"" ); + s.append((( EnumType ) object ).getId()); + s.append( "\" "); + + s.append( "("); + s.append((( EnumType ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 592cac4d..f6e6c97b 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 @@ -148,13 +148,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( EnumVal ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_EnumVal_type" ) - : getString( "_UI_EnumVal_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_EnumVal_type" )); + s.append( ": " ); + + s.append( getString( "_UI_EnumVal_value_feature" )); + s.append( "=\"" ); + s.append((( EnumVal ) object ).getValue()); + s.append( "\" "); + + s.append( "("); + s.append((( EnumVal ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 7ddf1e76..c39a4c55 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 @@ -280,13 +280,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( FCDA ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_FCDA_type" ) - : getString( "_UI_FCDA_type" ) + " " + label; + return getString( "_UI_FCDA_type" ); } /** 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 b3218194..6b181814 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 @@ -228,13 +228,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( Header ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_Header_type" ) - : getString( "_UI_Header_type" ) + " " + label; + return getString( "_UI_Header_type" ); } /** 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 1833d5d9..db94c350 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 @@ -339,13 +339,30 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @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; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_IED_type" )); + s.append( ": " ); + + s.append( getString( "_UI_IED_name_feature" )); + s.append( "=\"" ); + s.append((( IED ) object ).getName()); + s.append( "\" "); + + s.append( getString( "_UI_IED_type_feature" )); + s.append( "=\"" ); + s.append((( IED ) object ).getType()); + s.append( "\" "); + + s.append( "("); + s.append((( IED ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 9c96fec3..85b924a4 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 @@ -252,13 +252,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( LDevice ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_LDevice_type" ) - : getString( "_UI_LDevice_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_LDevice_type" )); + s.append( ": " ); + + s.append( getString( "_UI_LDevice_inst_feature" )); + s.append( "=\"" ); + s.append((( LDevice ) object ).getInst()); + s.append( "\" "); + + s.append( "("); + s.append((( LDevice ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 9e6ded77..d5e3f045 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 @@ -112,13 +112,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( LN0 ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_LN0_type" ) - : getString( "_UI_LN0_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_LN0_type" )); + s.append( ": " ); + + s.append( getString( "_UI_AnyLN_lnType_feature" )); + s.append( "=\"" ); + s.append((( LN0 ) object ).getLnType()); + s.append( "\" "); + + s.append( "("); + s.append((( LN0 ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 7af5f5f4..66cd4b94 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 @@ -102,13 +102,30 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( LN ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_LN_type" ) - : getString( "_UI_LN_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_LN_type" )); + s.append( ": " ); + + s.append( getString( "_UI_AnyLN_lnClass_feature" )); + s.append( "=\"" ); + s.append((( LN ) object ).getLnClass()); + s.append( "\" "); + + s.append( getString( "_UI_AnyLN_lnType_feature" )); + s.append( "=\"" ); + s.append((( LN ) object ).getLnType()); + s.append( "\" "); + + s.append( "("); + s.append((( LN ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 51254c4e..1758e866 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 @@ -227,13 +227,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( LNodeType ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_LNodeType_type" ) - : getString( "_UI_LNodeType_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_LNodeType_type" )); + s.append( ": " ); + + s.append( getString( "_UI_IDNaming_id_feature" )); + s.append( "=\"" ); + s.append((( LNodeType ) object ).getId()); + s.append( "\" "); + + s.append( "("); + s.append((( LNodeType ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 df7999f9..bb3b1b35 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 @@ -150,13 +150,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( Private ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_Private_type" ) - : getString( "_UI_Private_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_Private_type" )); + s.append( ": " ); + + s.append( getString( "_UI_Private_type_feature" )); + s.append( "=\"" ); + s.append((( Private ) object ).getType()); + s.append( "\" "); + + s.append( "("); + s.append((( Private ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 74e10f05..48e681b9 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 @@ -150,13 +150,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( RedProt ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_RedProt_type" ) - : getString( "_UI_RedProt_type" ) + " " + label; + return getString( "_UI_RedProt_type" ); } /** 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 182cf2db..29dda44c 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 @@ -184,13 +184,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( SCL ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_SCL_type" ) - : getString( "_UI_SCL_type" ) + " " + label; + return getString( "_UI_SCL_type" ); } /** 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 dff03691..00a68a2d 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 @@ -126,13 +126,25 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( ServerAt ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_ServerAt_type" ) - : getString( "_UI_ServerAt_type" ) + " " + label; + StringBuilder s = new StringBuilder(); + + s.append( getString( "_UI_ServerAt_type" )); + s.append( ": " ); + + s.append( getString( "_UI_ServerAt_apName_feature" )); + s.append( "=\"" ); + s.append((( ServerAt ) object ).getApName()); + s.append( "\" "); + + s.append( "("); + s.append((( ServerAt ) object ).getLineNumber()); + s.append( ")"); + + return s.toString(); } /** 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 9ea3df3d..e0e44684 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 @@ -137,13 +137,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( Server ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_Server_type" ) - : getString( "_UI_Server_type" ) + " " + label; + return getString( "_UI_Server_type" ); } /** 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 9fd54adb..a86b4188 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 @@ -168,13 +168,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( Services ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_Services_type" ) - : getString( "_UI_Services_type" ) + " " + label; + return getString( "_UI_Services_type" ); } /** 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 3bb966be..97b83832 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 @@ -149,13 +149,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( SettingControl ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_SettingControl_type" ) - : getString( "_UI_SettingControl_type" ) + " " + label; + return getString( "_UI_SettingControl_type" ); } /** 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 231db72b..e7ce98b8 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 @@ -173,13 +173,11 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( TimeSyncProt ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_TimeSyncProt_type" ) - : getString( "_UI_TimeSyncProt_type" ) + " " + label; + return getString( "_UI_TimeSyncProt_type" ); } /** 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 b01d16b9..f5473120 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 @@ -125,13 +125,13 @@ public Object getImage( Object object ) { * This returns the label text for the adapted class. * * - * @generated + * @generated NOT */ @Override public String getText( Object object ) { - String label = ( ( Val ) object ).getFilename(); - return label == null || label.length() == 0 ? getString( "_UI_Val_type" ) - : getString( "_UI_Val_type" ) + " " + label; + String value = ( ( Val ) object ).getValue(); + return value == null || value.length() == 0 ? getString( "_UI_Val_type" ) + : getString( "_UI_Val_type" ) + " " + value; } /** From 1a3b939293ba1589825dde6781b22c1d7cba915c Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Tue, 30 Jan 2024 17:04:21 +0100 Subject: [PATCH 7/7] prepare for release --- fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/pom.xml | 2 +- .../pom.xml | 2 +- fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml | 4 ++-- pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/pom.xml index 0950ac2c..5cce48fd 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/pom.xml +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/pom.xml @@ -1,7 +1,7 @@