From 4de485986ad703e628fb7bae9b0d2a927ce9f0bd Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Fri, 15 Apr 2022 14:05:45 +0200 Subject: [PATCH 1/5] generate code with last EMF --- .../scl/impl/AbstractDataAttributeImpl.java | 40 +++-- .../iec61850/scl/impl/AnyLNImpl.java | 81 +++++----- .../iec61850/scl/impl/AssociationImpl.java | 50 +++---- .../iec61850/scl/impl/ClientLNImpl.java | 44 +++--- .../iec61850/scl/impl/ConnectedAPImpl.java | 55 +++---- .../iec61850/scl/impl/ControlBlockImpl.java | 55 ++++--- .../iec61850/scl/impl/ControlImpl.java | 41 ++--- .../riseclipse/iec61850/scl/impl/DAIImpl.java | 57 +++---- .../riseclipse/iec61850/scl/impl/DOIImpl.java | 31 ++-- .../riseclipse/iec61850/scl/impl/DOImpl.java | 40 ++--- .../iec61850/scl/impl/ExtRefImpl.java | 140 +++++++++--------- .../iec61850/scl/impl/FCDAImpl.java | 9 +- .../iec61850/scl/impl/IEDNameImpl.java | 68 ++++----- .../riseclipse/iec61850/scl/impl/KDCImpl.java | 38 ++--- .../iec61850/scl/impl/LNodeImpl.java | 74 ++++----- .../iec61850/scl/impl/LogControlImpl.java | 22 +-- .../riseclipse/iec61850/scl/impl/SDIImpl.java | 60 ++++---- .../riseclipse/iec61850/scl/impl/SDOImpl.java | 42 +++--- .../iec61850/scl/impl/SclObjectImpl.java | 12 +- .../iec61850/scl/impl/ServerAtImpl.java | 28 ++-- .../iec61850/scl/impl/TerminalImpl.java | 85 +++++------ 21 files changed, 537 insertions(+), 535 deletions(-) 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 28b21693..d3101871 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -26,14 +26,10 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; - import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EObjectWithInverseEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -826,7 +822,7 @@ public boolean isSetRefersToEnumType() { @Override public EList< Val > getVal() { if( val == null ) { - val = new EObjectContainmentWithInverseEList.Unsettable< Val >( Val.class, this, + val = new EObjectContainmentWithInverseEList.Unsettable< >( Val.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL, SclPackage.VAL__PARENT_ABSTRACT_DATA_ATTRIBUTE ); } return val; @@ -975,7 +971,7 @@ public boolean isSetRefersToDAType() { @Override public EList< FCDA > getReferredByFCDA() { if( referredByFCDA == null ) { - referredByFCDA = new EObjectWithInverseEList.Unsettable.ManyInverse< FCDA >( FCDA.class, this, + referredByFCDA = new EObjectWithInverseEList.Unsettable.ManyInverse< >( FCDA.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_FCDA, SclPackage.FCDA__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE ); } @@ -1010,7 +1006,7 @@ public boolean isSetReferredByFCDA() { @Override public EList< ExtRef > getReferredByExtRef() { if( referredByExtRef == null ) { - referredByExtRef = new EObjectWithInverseEList.Unsettable< ExtRef >( ExtRef.class, this, + referredByExtRef = new EObjectWithInverseEList.Unsettable< >( ExtRef.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_EXT_REF, SclPackage.EXT_REF__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE ); } @@ -1097,7 +1093,7 @@ public boolean isSetName() { @Override public EList< DAI > getReferredByDAI() { if( referredByDAI == null ) { - referredByDAI = new EObjectWithInverseEList.Unsettable< DAI >( DAI.class, this, + referredByDAI = new EObjectWithInverseEList.Unsettable< >( DAI.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_DAI, SclPackage.DAI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE ); } @@ -1132,7 +1128,7 @@ public boolean isSetReferredByDAI() { @Override public EList< SDI > getReferredBySDI() { if( referredBySDI == null ) { - referredBySDI = new EObjectWithInverseEList.Unsettable< SDI >( SDI.class, this, + referredBySDI = new EObjectWithInverseEList.Unsettable< >( SDI.class, this, SclPackage.ABSTRACT_DATA_ATTRIBUTE__REFERRED_BY_SDI, SclPackage.SDI__REFERS_TO_ABSTRACT_DATA_ATTRIBUTE ); } @@ -1490,14 +1486,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getType() == null ) || getType().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "type is missing" ); + messagePrefix, "type is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); + messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1513,14 +1509,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " EnumType( id = ", getType(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " EnumType( id = ", getType(), " )" ); return; } setRefersToEnumType( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "AbstractDataAttribute refers to EnumType( id = ", getType(), " ) on line ", - getRefersToEnumType().getLineNumber() ); + "AbstractDataAttribute refers to EnumType( id = ", getType(), " ) on line ", + getRefersToEnumType().getLineNumber() ); } else if( "Struct".equals( getBType() ) ) { @@ -1534,14 +1530,14 @@ else if( "Struct".equals( getBType() ) ) { if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " DAType( id = ", getType(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " DAType( id = ", getType(), " )" ); return; } setRefersToDAType( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "AbstractDataAttribute refers to EnumType( id = ", getType(), " ) on line ", - getRefersToDAType().getLineNumber() ); + console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + "AbstractDataAttribute refers to EnumType( id = ", getType(), " ) on line ", + getRefersToDAType().getLineNumber() ); } } 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 5cb2366a..1f2a8e41 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,6 +20,22 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; +import org.eclipse.emf.ecore.util.EObjectWithInverseEList; +import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.jdt.annotation.NonNull; + import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN; import fr.centralesupelec.edf.riseclipse.iec61850.scl.Association; import fr.centralesupelec.edf.riseclipse.iec61850.scl.ClientLN; @@ -41,22 +57,6 @@ import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; -import org.eclipse.emf.ecore.util.EObjectWithInverseEList; -import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jdt.annotation.NonNull; - /** * * An implementation of the model object 'Any LN'. @@ -729,7 +729,7 @@ public boolean isSetInputs() { @Override public EList< Log > getLog() { if( log == null ) { - log = new EObjectContainmentWithInverseEList.Unsettable< Log >( Log.class, this, SclPackage.ANY_LN__LOG, + log = new EObjectContainmentWithInverseEList.Unsettable< >( Log.class, this, SclPackage.ANY_LN__LOG, SclPackage.LOG__PARENT_ANY_LN ); } return log; @@ -763,7 +763,7 @@ public boolean isSetLog() { @Override public EList< DOI > getDOI() { if( doi == null ) { - doi = new EObjectContainmentWithInverseEList.Unsettable< DOI >( DOI.class, this, SclPackage.ANY_LN__DOI, + doi = new EObjectContainmentWithInverseEList.Unsettable< >( DOI.class, this, SclPackage.ANY_LN__DOI, SclPackage.DOI__PARENT_ANY_LN ); } return doi; @@ -797,7 +797,7 @@ public boolean isSetDOI() { @Override public EList< ReportControl > getReportControl() { if( reportControl == null ) { - reportControl = new EObjectContainmentWithInverseEList.Unsettable< ReportControl >( ReportControl.class, + reportControl = new EObjectContainmentWithInverseEList.Unsettable< >( ReportControl.class, this, SclPackage.ANY_LN__REPORT_CONTROL, SclPackage.REPORT_CONTROL__PARENT_ANY_LN ); } return reportControl; @@ -831,7 +831,7 @@ public boolean isSetReportControl() { @Override public EList< LogControl > getLogControl() { if( logControl == null ) { - logControl = new EObjectContainmentWithInverseEList.Unsettable< LogControl >( LogControl.class, this, + logControl = new EObjectContainmentWithInverseEList.Unsettable< >( LogControl.class, this, SclPackage.ANY_LN__LOG_CONTROL, SclPackage.LOG_CONTROL__PARENT_ANY_LN ); } return logControl; @@ -865,7 +865,7 @@ public boolean isSetLogControl() { @Override public EList< DataSet > getDataSet() { if( dataSet == null ) { - dataSet = new EObjectContainmentWithInverseEList.Unsettable< DataSet >( DataSet.class, this, + dataSet = new EObjectContainmentWithInverseEList.Unsettable< >( DataSet.class, this, SclPackage.ANY_LN__DATA_SET, SclPackage.DATA_SET__PARENT_ANY_LN ); } return dataSet; @@ -899,7 +899,7 @@ public boolean isSetDataSet() { @Override public EList< ClientLN > getReferredByClientLN() { if( referredByClientLN == null ) { - referredByClientLN = new EObjectWithInverseEList.Unsettable< ClientLN >( ClientLN.class, this, + referredByClientLN = new EObjectWithInverseEList.Unsettable< >( ClientLN.class, this, SclPackage.ANY_LN__REFERRED_BY_CLIENT_LN, SclPackage.CLIENT_LN__REFERS_TO_ANY_LN ); } return referredByClientLN; @@ -933,7 +933,7 @@ public boolean isSetReferredByClientLN() { @Override public EList< LogControl > getReferredByLogControl() { if( referredByLogControl == null ) { - referredByLogControl = new EObjectWithInverseEList.Unsettable< LogControl >( LogControl.class, this, + referredByLogControl = new EObjectWithInverseEList.Unsettable< >( LogControl.class, this, SclPackage.ANY_LN__REFERRED_BY_LOG_CONTROL, SclPackage.LOG_CONTROL__REFERS_TO_ANY_LN ); } return referredByLogControl; @@ -967,7 +967,7 @@ public boolean isSetReferredByLogControl() { @Override public EList< Association > getReferredByAssociation() { if( referredByAssociation == null ) { - referredByAssociation = new EObjectWithInverseEList.Unsettable< Association >( Association.class, this, + referredByAssociation = new EObjectWithInverseEList.Unsettable< >( Association.class, this, SclPackage.ANY_LN__REFERRED_BY_ASSOCIATION, SclPackage.ASSOCIATION__REFERS_TO_ANY_LN ); } return referredByAssociation; @@ -1001,7 +1001,7 @@ public boolean isSetReferredByAssociation() { @Override public EList< IEDName > getReferredByIEDName() { if( referredByIEDName == null ) { - referredByIEDName = new EObjectWithInverseEList.Unsettable< IEDName >( IEDName.class, this, + referredByIEDName = new EObjectWithInverseEList.Unsettable< >( IEDName.class, this, SclPackage.ANY_LN__REFERRED_BY_IED_NAME, SclPackage.IED_NAME__REFERS_TO_ANY_LN ); } return referredByIEDName; @@ -1035,7 +1035,7 @@ public boolean isSetReferredByIEDName() { @Override public EList< LNode > getReferredByLNode() { if( referredByLNode == null ) { - referredByLNode = new EObjectWithInverseEList.Unsettable< LNode >( LNode.class, this, + referredByLNode = new EObjectWithInverseEList.Unsettable< >( LNode.class, this, SclPackage.ANY_LN__REFERRED_BY_LNODE, SclPackage.LNODE__REFERS_TO_ANY_LN ); } return referredByLNode; @@ -1068,7 +1068,8 @@ public boolean isSetReferredByLNode() { */ @Override public LDevice getParentLDevice() { - AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), "AnyLNImpl.getParentLDevice() called" ); + AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + "AnyLNImpl.getParentLDevice() called" ); return null; } @@ -1080,14 +1081,14 @@ public LDevice getParentLDevice() { @Override public String getNamespace() { //@formatter:off - + // The attribute lnNs shall be a DataAttribute of the name plate NamPlt of a logical node. // // 1. AnyLN.DOI["NamPlt"].DAI["lnNs"].value if present // 2. AnyLN.LNodeType.namespace if not null // 3. AnyLN.ParentLDevice.ldNs otherwise - + List< DOI > namPltDoi = getDOI() .stream() @@ -1517,13 +1518,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getLnType() == null ) || getLnType().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "lnType is missing" ); + messagePrefix, "lnType is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); + messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1535,19 +1536,19 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " LNodeType( id = ", getLnType(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " LNodeType( id = ", getLnType(), " )" ); return; } setRefersToLNodeType( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "AnyLN on line ", getLineNumber(), " refers to LNodeType( id = ", getLnType(), - " ) on line ", getRefersToLNodeType().getLineNumber() ); + "AnyLN on line ", getLineNumber(), " refers to LNodeType( id = ", getLnType(), + " ) on line ", getRefersToLNodeType().getLineNumber() ); - if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() )) { + if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", - getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); + messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", + getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java index dd06ddd3..6104587c 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,6 +20,15 @@ */ 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; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.jdt.annotation.NonNull; + import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDesc; import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLDRef; import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgLNRef; @@ -33,15 +42,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; -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; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jdt.annotation.NonNull; - /** * * An implementation of the model object 'Association'. @@ -1261,17 +1261,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "iedName is missing " ); + messagePrefix, "iedName is missing " ); return; } if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "ldInst is missing " ); + messagePrefix, "ldInst is missing " ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "lnClass is missing " ); + messagePrefix, "lnClass is missing " ); return; } @@ -1280,26 +1280,26 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getIedName(), " )" ); + messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), + " IED( name = ", getIedName(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found IED( name = ", getIedName(), " ) on line ", - ied.getLeft().getLineNumber() ); + messagePrefix, "found IED( name = ", getIedName(), " ) on line ", + ied.getLeft().getLineNumber() ); // find inside an LDevice with // LDevice.name == Association.ldInst Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); + messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), + " LDevice( inst = ", getLdInst(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found ", "LDevice( inst = ", getLdInst(), " )", " on line ", - lDevice.getLeft().getLineNumber() ); + messagePrefix, "found ", "LDevice( inst = ", getLdInst(), " )", " on line ", + lDevice.getLeft().getLineNumber() ); Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() ); @@ -1311,13 +1311,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { mess += " )"; if( anyLN.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); + messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "Association on line ", getLineNumber(), " refers to ", mess, " on line ", - getRefersToAnyLN().getLineNumber() ); + "Association on line ", getLineNumber(), " refers to ", mess, " on line ", + getRefersToAnyLN().getLineNumber() ); } } //AssociationImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java index e7130a72..e9bd59f0 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -1167,17 +1167,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "iedName is missing" ); + messagePrefix, "iedName is missing" ); return; } if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "ldInst is missing" ); + messagePrefix, "ldInst is missing" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "lnClass is missing" ); + messagePrefix, "lnClass is missing" ); return; } @@ -1186,24 +1186,24 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ied.getRight() == 0 ) ? "cannot find " : "found several " ), - "IED( name = ", getIedName(), " )" ); + messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find " : "found several " ), + "IED( name = ", getIedName(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found IED( name = ", getIedName(), " ) on line ", ied.getLeft().getLineNumber() ); + messagePrefix, "found IED( name = ", getIedName(), " ) on line ", ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = null; if( ( getApRef() == null ) || getApRef().isEmpty() ) { if( ied.getLeft().getAccessPoint().size() == 0 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); + messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); return; } if( ied.getLeft().getAccessPoint().size() > 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), - " ) but apRef not specified" ); + messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), + " ) but apRef not specified" ); return; } ap = Pair.of( ied.getLeft().getAccessPoint().get( 0 ), 1 ); @@ -1212,13 +1212,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { ap = SclUtilities.getAccessPoint( ied.getLeft(), getApRef() ); if( ap.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApRef(), " )" ); + messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), + " AccessPoint( name = ", getApRef(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found ", "AccessPoint( name = ", getApRef(), " ) on line ", - ap.getLeft().getLineNumber() ); + messagePrefix, "found ", "AccessPoint( name = ", getApRef(), " ) on line ", + ap.getLeft().getLineNumber() ); } Pair< AnyLN, Integer > anyLN = null; @@ -1231,13 +1231,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ap.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); + messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), + " LDevice( inst = ", getLdInst(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", - lDevice.getLeft().getLineNumber() ); + messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", + lDevice.getLeft().getLineNumber() ); anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() ); } @@ -1249,13 +1249,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { mess += " )"; if( anyLN.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); + messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ClientLN on line ", getLineNumber(), " refers to ", mess, " on line ", - getRefersToAnyLN().getLineNumber() ); + "ClientLN on line ", getLineNumber(), " refers to ", mess, " on line ", + getRefersToAnyLN().getLineNumber() ); } } //ClientLNImpl 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 d9df7dde..28ac53e9 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,19 +20,8 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.Address; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSE; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.PhysConn; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SMV; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SubNetwork; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - 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; @@ -45,6 +34,18 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.Address; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSE; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.PhysConn; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SMV; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SubNetwork; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'Connected AP'. @@ -679,7 +680,7 @@ public boolean isSetRefersToAccessPoint() { @Override public EList< PhysConn > getPhysConn() { if( physConn == null ) { - physConn = new EObjectContainmentWithInverseEList.Unsettable< PhysConn >( PhysConn.class, this, + physConn = new EObjectContainmentWithInverseEList.Unsettable< >( PhysConn.class, this, SclPackage.CONNECTED_AP__PHYS_CONN, SclPackage.PHYS_CONN__PARENT_CONNECTED_AP ); } return physConn; @@ -713,7 +714,7 @@ public boolean isSetPhysConn() { @Override public EList< GSE > getGSE() { if( gse == null ) { - gse = new EObjectContainmentWithInverseEList.Unsettable< GSE >( GSE.class, this, + gse = new EObjectContainmentWithInverseEList.Unsettable< >( GSE.class, this, SclPackage.CONNECTED_AP__GSE, SclPackage.GSE__PARENT_CONNECTED_AP ); } return gse; @@ -747,7 +748,7 @@ public boolean isSetGSE() { @Override public EList< SMV > getSMV() { if( smv == null ) { - smv = new EObjectContainmentWithInverseEList.Unsettable< SMV >( SMV.class, this, + smv = new EObjectContainmentWithInverseEList.Unsettable< >( SMV.class, this, SclPackage.CONNECTED_AP__SMV, SclPackage.SMV__PARENT_CONNECTED_AP ); } return smv; @@ -1032,12 +1033,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "iedName is missing" ); + messagePrefix, "iedName is missing" ); return; } if( ( getApName() == null ) || getApName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "apName is missing" ); + messagePrefix, "apName is missing" ); return; } @@ -1046,24 +1047,24 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getIedName(), " )" ); + messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), + " IED( name = ", getIedName(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found IED( name = ", getIedName(), " ) on line ", - ied.getLeft().getLineNumber() ); + messagePrefix, "found IED( name = ", getIedName(), " ) on line ", + ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied.getLeft(), getApName() ); if( ap.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApName(), " )" ); + messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), + " AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ConnectedAP on line refers to AccessPoint( name = ", getApName(), " ) on line ", - getRefersToAccessPoint().getLineNumber() ); + "ConnectedAP on line refers to AccessPoint( name = ", getApName(), " ) on line ", + getRefersToAccessPoint().getLineNumber() ); } } //ConnectedAPImpl 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 5153c25f..b3a2484a 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,10 +20,20 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; 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; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.jdt.annotation.NonNull; + import fr.centralesupelec.edf.riseclipse.iec61850.scl.Address; import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectedAP; import fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlBlock; @@ -35,17 +45,6 @@ import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; -import java.lang.reflect.InvocationTargetException; - -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; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jdt.annotation.NonNull; - /** * * An implementation of the model object 'Control Block'. @@ -518,7 +517,8 @@ public boolean isSetRefersToControlWithIEDName() { */ @Override public ConnectedAP getParentConnectedAP() { - AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), "ControlBlock.getParentConnectedAP() called" ); + AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + "ControlBlock.getParentConnectedAP() called" ); return null; } @@ -706,18 +706,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "ldInst is missing" ); + messagePrefix, "ldInst is missing" ); return; } if( ( getCbName() == null ) || getCbName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "cbName is missing" ); + messagePrefix, "cbName is missing" ); return; } // No error or warning messages here: if this happens, error should have been detected before - if( getParentConnectedAP() == null ) return; - if( getParentConnectedAP().getRefersToAccessPoint() == null ) return; + if( ( getParentConnectedAP() == null ) || ( getParentConnectedAP().getRefersToAccessPoint() == null ) ) return; IED ied = getParentConnectedAP().getRefersToAccessPoint().getParentIED(); if( ied == null ) return; @@ -726,23 +725,23 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied, getLdInst() ); if( lDevice.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); + messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), + " LDevice( inst = ", getLdInst(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", - lDevice.getLeft().getLineNumber() ); + messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", + lDevice.getLeft().getLineNumber() ); // Find a ControlWithIEDName inside LN0 of LDevice with // ControlWithIEDName.name == ControlBlock.bName if( lDevice.getLeft().getLN0() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "LN0 is missing" ); + messagePrefix, "LN0 is missing" ); return; } - List< ControlWithIEDName > l2 = new ArrayList< ControlWithIEDName >(); + List< ControlWithIEDName > l2 = new ArrayList< >(); l2.addAll( lDevice.getLeft().getLN0().getGSEControl() ); l2.addAll( lDevice.getLeft().getLN0().getSampledValueControl() ); @@ -753,14 +752,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res2.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res2.size() == 0 ) ? "cannot find" : "found several" ), - " ControlWithIEDName( name = ", getCbName(), " )" ); + messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), + " ControlWithIEDName( name = ", getCbName(), " )" ); return; } setRefersToControlWithIEDName( res2.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ControlBlock refers to ControlWithIEDName( name = ", getCbName(), " ) on line ", - getRefersToControlWithIEDName().getLineNumber() ); + "ControlBlock refers to ControlWithIEDName( name = ", getCbName(), " ) on line ", + getRefersToControlWithIEDName().getLineNumber() ); } } //ControlBlockImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java index 06a9ae5a..3566f605 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,19 +20,11 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.Control; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSet; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -43,6 +35,14 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.Control; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataSet; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.ExtRef; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'Control'. @@ -391,7 +391,7 @@ public boolean isSetName() { @Override public EList< ExtRef > getReferredByExtRef() { if( referredByExtRef == null ) { - referredByExtRef = new EObjectWithInverseEList.Unsettable< ExtRef >( ExtRef.class, this, + referredByExtRef = new EObjectWithInverseEList.Unsettable< >( ExtRef.class, this, SclPackage.CONTROL__REFERRED_BY_EXT_REF, SclPackage.EXT_REF__REFERS_TO_CONTROL ); } return referredByExtRef; @@ -424,7 +424,8 @@ public boolean isSetReferredByExtRef() { */ @Override public AnyLN getParentAnyLN() { - AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), "Control.getParentAnyLN() called" ); + AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + "Control.getParentAnyLN() called" ); return null; } @@ -601,7 +602,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { super.doBuildExplicitLinks( console ); // name Name of the report control block. This name is relative to the LN hosting the RCB, and shall be unique within the LN - // desc The description text + // desc The description text // datSet The name of the data set to be sent by the report control block; datSet should only be missing within an ICD-File, // or to indicate an unused control block. The referenced data set must be in the same LN as the control block. @@ -609,7 +610,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getDatSet() == null ) || getDatSet().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "datSet is missing" ); + messagePrefix, "datSet is missing" ); return; } @@ -626,14 +627,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " DataSet( name = ", getDatSet(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " DataSet( name = ", getDatSet(), " )" ); return; } setRefersToDataSet( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "Control refers to DataSet( name = ", getDatSet(), " ) on line ", - getRefersToDataSet().getLineNumber() ); + "Control refers to DataSet( name = ", getDatSet(), " ) on line ", + getRefersToDataSet().getLineNumber() ); } } //ControlImpl 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 a8076fe4..efeaaffd 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,9 +20,6 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.BDA; - import java.util.Collection; import java.util.List; import java.util.stream.Collectors; @@ -38,6 +35,8 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.BDA; import fr.centralesupelec.edf.riseclipse.iec61850.scl.DA; import fr.centralesupelec.edf.riseclipse.iec61850.scl.DAI; import fr.centralesupelec.edf.riseclipse.iec61850.scl.DAType; @@ -481,7 +480,7 @@ public boolean isSetValKind() { @Override public EList< Val > getVal() { if( val == null ) { - val = new EObjectContainmentWithInverseEList.Unsettable< Val >( Val.class, this, SclPackage.DAI__VAL, + val = new EObjectContainmentWithInverseEList.Unsettable< >( Val.class, this, SclPackage.DAI__VAL, SclPackage.VAL__PARENT_DAI ); } return val; @@ -1020,7 +1019,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getName() == null ) || getName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "name is missing" ); + messagePrefix, "name is missing" ); return; } @@ -1035,19 +1034,20 @@ else if( getParentSDI() != null ) { } } - private void doBuildExplicitLinkWithParentDOI( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { + private void doBuildExplicitLinkWithParentDOI( @NonNull IRiseClipseConsole console, + @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; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DO on line ", do_.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; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DOType on line ", dot.getLineNumber() ); + messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< DA > res = dot .getDA() @@ -1057,17 +1057,18 @@ private void doBuildExplicitLinkWithParentDOI( @NonNull IRiseClipseConsole conso if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " DA( name = ", getName(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " DA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "DAI refers to DA( name = " + getName(), " ) on line ", - getRefersToAbstractDataAttribute().getLineNumber() ); + "DAI refers to DA( name = " + getName(), " ) on line ", + getRefersToAbstractDataAttribute().getLineNumber() ); } - private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { + private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole console, + @NonNull String messagePrefix ) { // No error or warning messages here: if this happens, error should have been detected before AbstractDataAttribute att = getParentSDI().getRefersToAbstractDataAttribute(); if( att == null ) { @@ -1076,12 +1077,12 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso if( sdo == null ) return; sdo.buildExplicitLinks( console, false ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found SDO on line ", sdo.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; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DOType on line ", dot.getLineNumber() ); + messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< DA > res = dot .getDA() @@ -1091,25 +1092,25 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " DA( name = ", getName(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " DA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "DAI refers to DA( name = ", getName(), " ) on line ", - getRefersToAbstractDataAttribute().getLineNumber() ); + "DAI refers to DA( name = ", getName(), " ) on line ", + getRefersToAbstractDataAttribute().getLineNumber() ); return; } att.buildExplicitLinks( console, false ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found AbstractDataAttribute on line ", att.getLineNumber() ); + console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + messagePrefix, "found AbstractDataAttribute on line ", att.getLineNumber() ); DAType dat = att.getRefersToDAType(); // No error or warning message here: if this happens, error should have been detected before if( dat == null ) return; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DAType on line ", dat.getLineNumber() ); + messagePrefix, "found DAType on line ", dat.getLineNumber() ); List< BDA > res = dat .getBDA() @@ -1119,14 +1120,14 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " BDA( name = ", getName(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " BDA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "DAI refers to ", "BDA( name = " + getName() + " )", " on line ", - getRefersToAbstractDataAttribute().getLineNumber() ); + "DAI refers to ", "BDA( name = " + getName() + " )", " on line ", + getRefersToAbstractDataAttribute().getLineNumber() ); } } //DAIImpl 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 143ea609..b9bf3f3b 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -326,7 +326,7 @@ else if( eNotificationRequired() ) @Override public EList< DAI > getDAI() { if( dai == null ) { - dai = new EObjectContainmentWithInverseEList.Unsettable< DAI >( DAI.class, this, SclPackage.DOI__DAI, + dai = new EObjectContainmentWithInverseEList.Unsettable< >( DAI.class, this, SclPackage.DOI__DAI, SclPackage.DAI__PARENT_DOI ); } return dai; @@ -360,7 +360,7 @@ public boolean isSetDAI() { @Override public EList< SDI > getSDI() { if( sdi == null ) { - sdi = new EObjectContainmentWithInverseEList.Unsettable< SDI >( SDI.class, this, SclPackage.DOI__SDI, + sdi = new EObjectContainmentWithInverseEList.Unsettable< >( SDI.class, this, SclPackage.DOI__SDI, SclPackage.SDI__PARENT_DOI ); } return sdi; @@ -610,9 +610,9 @@ public boolean isSetRefersToDO() { @Override public String getNamespace() { //@formatter:off - + // The attribute dataNs shall be a DataAttribute of the data. - // + // // 1. DOI.DAI["dataNs"].value if present // 2. DOI.DO.DOType.DA["dataNs"].value if present // 3. DOI.AnyLN.namespace otherwise @@ -640,7 +640,7 @@ public String getNamespace() { .stream() .filter( da -> "dataNs".equals( da.getName() )) .collect( Collectors.toList() ); - + if( dataNsDa.size() == 1 ) { if(( dataNsDa.get( 0 ).getVal().size() == 1 ) && ( dataNsDa.get( 0 ).getVal().get( 0 ).getValue() != null ) @@ -649,7 +649,7 @@ public String getNamespace() { } } } - + if( getParentAnyLN() != null ) { return getParentAnyLN().getNamespace(); } @@ -919,16 +919,15 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getName() == null ) || getName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "name is missing" ); + messagePrefix, "name is missing" ); return; } // No error or warning message here: if this happens, error should have been detected before - if( getParentAnyLN() == null ) return; - if( getParentAnyLN().getRefersToLNodeType() == null ) return; + if( ( getParentAnyLN() == null ) || ( getParentAnyLN().getRefersToLNodeType() == null ) ) return; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LNodeType on line ", - getParentAnyLN().getRefersToLNodeType().getLineNumber() ); + messagePrefix, "found LNodeType on line ", + getParentAnyLN().getRefersToLNodeType().getLineNumber() ); List< DO > res = getParentAnyLN() .getRefersToLNodeType() @@ -939,13 +938,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " DO( name = ", getName(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " DO( name = ", getName(), " )" ); return; } setRefersToDO( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "DOI refers to DO( name = ", getName(), " ) on line ", getRefersToDO().getLineNumber() ); + "DOI refers to DO( name = ", getName(), " ) on line ", getRefersToDO().getLineNumber() ); } } //DOIImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java index 59cd899b..97ae42e3 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,19 +20,9 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; +import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DO; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.INamespaceGetter; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - -import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -45,6 +35,16 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DO; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOI; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.INamespaceGetter; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'DO'. @@ -318,7 +318,7 @@ public boolean isSetAccessControl() { @Override public EList< DOI > getReferredByDOI() { if( referredByDOI == null ) { - referredByDOI = new EObjectWithInverseEList.Unsettable< DOI >( DOI.class, this, + referredByDOI = new EObjectWithInverseEList.Unsettable< >( DOI.class, this, SclPackage.DO__REFERRED_BY_DOI, SclPackage.DOI__REFERS_TO_DO ); } return referredByDOI; @@ -565,7 +565,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getType() == null ) || getType().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "type is missing" ); + messagePrefix, "type is missing" ); return; } // No error or warning message here: if this happens, error should have been detected before @@ -580,19 +580,19 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " DOType( id = ", getType(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " DOType( id = ", getType(), " )" ); return; } setRefersToDOType( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "DO refers to DOType( id = ", getType(), " ) on line ", getRefersToDOType().getLineNumber() ); + "DO refers to DOType( id = ", getType(), " ) on line ", getRefersToDOType().getLineNumber() ); } @Override public String getNamespace() { //@formatter:off - + // The attribute dataNs shall be a DataAttribute of the data. // // 1. DO.DOType.namespace if not null @@ -602,7 +602,7 @@ public String getNamespace() { String ns = getRefersToDOType().getNamespace(); if( ns != null ) return ns; } - + if( getParentLNodeType() != null ) { return getParentLNodeType().getNamespace(); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java index b46703b7..20990886 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,6 +20,19 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; +import java.util.ArrayList; +import java.util.List; +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; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.jdt.annotation.NonNull; + import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataAttribute; import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject; import fr.centralesupelec.edf.riseclipse.iec61850.scl.AgDesc; @@ -39,19 +52,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; -import java.util.ArrayList; -import java.util.List; -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; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jdt.annotation.NonNull; - /** * * An implementation of the model object 'Ext Ref'. @@ -2596,7 +2596,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { doBuildExplicitCBLink( console, messagePrefix, args ); } - private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsole console, @NonNull String mPrefix ) { + private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsole console, + @NonNull String mPrefix ) { String messagePrefix = mPrefix + "(looking for data) "; @@ -2604,7 +2605,7 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol // ldInst The LD instance name from where the input comes // prefix The LN prefix // lnClass The LN class according to IEC 61850-7-x - // lnInst The instance id of this LN instance of above LN class in the IED; missing for a reference in LLN0. For backwards compatibility also the + // lnInst The instance id of this LN instance of above LN class in the IED; missing for a reference in LLN0. For backwards compatibility also the // empty string shall be accepted for LLN0 // doName A name identifying the DO (within the LN).In case of structured DO, the name parts are concatenated by dots (.) // daName The attribute designating the input. The IED tool should use an empty value if it has some default binding (intAddr) for all process @@ -2617,14 +2618,14 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol if( ( getIedName() == null ) || getIedName().isEmpty() ) { // no warning if no iedName console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "do not look for DA because iedName is missing" ); + messagePrefix, "do not look for DA because iedName is missing" ); return Pair.of( null, null ); } if( ( getDoName() == null ) || getDoName().isEmpty() ) { // No link if no doName console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "doName is absent" ); + messagePrefix, "doName is absent" ); return Pair.of( null, null ); } @@ -2637,36 +2638,36 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol } if( ied.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ied.getRight() == 0 ) ? "cannot find" : "found several" ), + messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), " IED( name = ", getIedName(), " )" ); return Pair.of( null, null ); } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found IED ( name = ", ied.getLeft().getName(), " ) on line ", - ied.getLeft().getLineNumber() ); + messagePrefix, "found IED ( name = ", ied.getLeft().getName(), " ) on line ", + ied.getLeft().getLineNumber() ); // Only now so that we can give back ied if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "ldInst is missing" ); + messagePrefix, "ldInst is missing" ); return Pair.of( ied.getLeft(), null ); } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "lnClass is missing" ); + messagePrefix, "lnClass is missing" ); return Pair.of( ied.getLeft(), null ); } Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), + messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return Pair.of( ied.getLeft(), null ); } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", - lDevice.getLeft().getLineNumber() ); + messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", + lDevice.getLeft().getLineNumber() ); Pair< IED, LDevice > finalRes = Pair.of( ied.getLeft(), lDevice.getLeft() ); @@ -2680,20 +2681,20 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol mess += " )"; if( anyLN.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), + messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return finalRes; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found ", mess, " on line ", - anyLN.getLeft().getLineNumber() ); + messagePrefix, "found ", mess, " on line ", + anyLN.getLeft().getLineNumber() ); anyLN.getLeft().buildExplicitLinks( console, false ); // No error or warning message here: if this happens, error should have been detected before if( anyLN.getLeft().getRefersToLNodeType() == null ) return finalRes; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LNodeType on line ", - anyLN.getLeft().getRefersToLNodeType().getLineNumber() ); + messagePrefix, "found LNodeType on line ", + anyLN.getLeft().getRefersToLNodeType().getLineNumber() ); // doName and daName are structured using . as separator // The first doName let us find the DO inside the LNodeType @@ -2713,21 +2714,21 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol if( res1.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res1.size() == 0 ) ? "cannot find" : "found several" ), - " DO ( name = ", doNames[0], " )" ); + messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), + " DO ( name = ", doNames[0], " )" ); return finalRes; } AbstractDataObject ado = res1.get( 0 ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found ", "DO ( name = ", doNames[0], " )", " on line ", ado.getLineNumber() ); + messagePrefix, "found ", "DO ( name = ", doNames[0], " )", " on line ", ado.getLineNumber() ); ado.buildExplicitLinks( console, false ); for( int i = 1; i < doNames.length; ++i ) { DOType doType = ado.getRefersToDOType(); if( doType == null ) return finalRes; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DOType on line ", doType.getLineNumber() ); + messagePrefix, "found DOType on line ", doType.getLineNumber() ); String name = doNames[i]; List< SDO > res2 = doType .getSDO() @@ -2737,14 +2738,14 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol if( res2.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res2.size() == 0 ) ? "cannot find" : "found several" ), - " SDO ( name = ", name, " ) in DOType on line ", doType.getLineNumber() ); + messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), + " SDO ( name = ", name, " ) in DOType on line ", doType.getLineNumber() ); return finalRes; } ado = res2.get( 0 ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found SDO ( name = ", name, " ) in DOType on line ", - doType.getLineNumber(), " on line ", ado.getLineNumber() ); + messagePrefix, "found SDO ( name = ", name, " ) in DOType on line ", + doType.getLineNumber(), " on line ", ado.getLineNumber() ); ado.buildExplicitLinks( console, false ); } @@ -2752,8 +2753,8 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol if( getDaName() == null ) { setRefersToAbstractDataObject( ado ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ExtRef refers to AbstractDataObject ( name = ", - ado.getName(), " ) on line ", ado.getLineNumber() ); + "ExtRef refers to AbstractDataObject ( name = ", + ado.getName(), " ) on line ", ado.getLineNumber() ); return finalRes; } @@ -2761,7 +2762,7 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol // No error or warning message here: if this happens, error should have been detected before if( doType == null ) return finalRes; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DOType on line ", doType.getLineNumber() ); + messagePrefix, "found DOType on line ", doType.getLineNumber() ); // The first daName gives us the DA inside the DOType // If daName is structured, find the DAType and its BDA using remaining daName @@ -2775,14 +2776,14 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol if( res3.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res3.size() == 0 ) ? "cannot find" : "found several" ), + messagePrefix, ( ( res3.size() == 0 ) ? "cannot find" : "found several" ), " DA ( name = ", daNames[0], " ) in DOType" ); return finalRes; } AbstractDataAttribute da = res3.get( 0 ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DA ( name = ", daNames[0], " ) in DOType on line ", - da.getLineNumber() ); + messagePrefix, "found DA ( name = ", daNames[0], " ) in DOType on line ", + da.getLineNumber() ); for( int i = 1; i < daNames.length; ++i ) { da.buildExplicitLinks( console, false ); @@ -2797,32 +2798,33 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol if( res4.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res4.size() == 0 ) ? "cannot find" : "found several" ), - " BDA ( name = ", name, " ) in DAType on line ", - da.getRefersToDAType().getLineNumber() ); + messagePrefix, ( ( res4.size() == 0 ) ? "cannot find" : "found several" ), + " BDA ( name = ", name, " ) in DAType on line ", + da.getRefersToDAType().getLineNumber() ); return finalRes; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found BDA ( name = ", name, " ) in DAType on line ", - da.getRefersToDAType().getLineNumber(), " on line ", res4.get( 0 ).getLineNumber() ); + messagePrefix, "found BDA ( name = ", name, " ) in DAType on line ", + da.getRefersToDAType().getLineNumber(), " on line ", res4.get( 0 ).getLineNumber() ); da = res4.get( 0 ); } console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ExtRef refers to AbstractDataAttribute ( name = ", - da.getName(), " ) on line ", da.getLineNumber() ); + "ExtRef refers to AbstractDataAttribute ( name = ", + da.getName(), " ) on line ", da.getLineNumber() ); setRefersToAbstractDataAttribute( da ); return finalRes; } - private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNull String mPrefix, @NonNull Pair< IED, LDevice > args ) { + private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNull String mPrefix, + @NonNull Pair< IED, LDevice > args ) { String messagePrefix = mPrefix + "(looking for control) "; // srcLDInst The LD inst of the source control block – if missing, same as ldInst above // srcPrefix The prefix of the LN instance, where the source control block resides; if missing, no prefix - // srcLNClass The LN class of the LN, where the source control block resides; if missing, LLN0 + // srcLNClass The LN class of the LN, where the source control block resides; if missing, LLN0 // srcLNInst The LN instance number of the LN where the source control block resides – if missing, no instance number exists (LLN0) // srcCBName The source CB name; if missing, then all othere srcXX attributes should also be missing, i.e. no source control block is given. @@ -2833,7 +2835,7 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul if( ( getSrcCBName() == null ) || getSrcCBName().isEmpty() ) { console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "srcCBName is absent" ); + messagePrefix, "srcCBName is absent" ); return; } @@ -2841,14 +2843,14 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul Pair< LDevice, Integer > lDevice1 = SclUtilities.getLDevice( ied, getSrcLDInst() ); if( lDevice1.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), + messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = " + getSrcLDInst() + " )" ); return; } lDevice = lDevice1.getLeft(); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LDevice( inst = ", getSrcLDInst(), " ) on line ", - lDevice.getLineNumber() ); + messagePrefix, "found LDevice( inst = ", getSrcLDInst(), " ) on line ", + lDevice.getLineNumber() ); } if( lDevice == null ) return; @@ -2865,14 +2867,14 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul mess += " )"; if( anyLN.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); + messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), + mess ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found", mess, " on line ", anyLN.getLeft().getLineNumber() ); + messagePrefix, "found", mess, " on line ", anyLN.getLeft().getLineNumber() ); - List< Control > listControls = new ArrayList< Control >(); + List< Control > listControls = new ArrayList< >(); listControls.addAll( anyLN.getLeft().getLogControl() ); listControls.addAll( anyLN.getLeft().getReportControl() ); if( "LLN0".equals( cbLNClass ) ) { @@ -2881,8 +2883,8 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul } if( listControls.size() == 0 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "control not found because there are none of them in AnyLN line ", - anyLN.getLeft().getLineNumber() ); + messagePrefix, "control not found because there are none of them in AnyLN line ", + anyLN.getLeft().getLineNumber() ); return; } @@ -2892,14 +2894,14 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul .collect( Collectors.toList() ); if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " Control( name = ", getSrcCBName(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " Control( name = ", getSrcCBName(), " )" ); return; } setRefersToControl( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ExtRef refers to Control( name = ", getSrcCBName(), " ) on line ", - getRefersToControl().getLineNumber() ); + "ExtRef refers to Control( name = ", getSrcCBName(), " ) on line ", + getRefersToControl().getLineNumber() ); } } //ExtRefImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java index a35182dc..e0f6031d 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -1293,7 +1293,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( attributeLookedFor != null ) { attributeLookedFor.buildExplicitLinks( console, false ); - + List< BDA > res5 = attributeLookedFor .getRefersToDAType() @@ -1361,7 +1361,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { //@formatter:on } - private Set< DA > getAllDAInDOTypeWithFC( @NonNull DOType doType, @NonNull FCEnum fc, @NonNull IRiseClipseConsole console ) { + private Set< DA > getAllDAInDOTypeWithFC( @NonNull DOType doType, @NonNull FCEnum fc, + @NonNull IRiseClipseConsole console ) { //@formatter:off Set< DA > das = new HashSet<>(); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java index d717dac6..9b1eb8b6 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,6 +20,15 @@ */ 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; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.jdt.annotation.NonNull; + import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint; import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN; import fr.centralesupelec.edf.riseclipse.iec61850.scl.ControlWithIEDName; @@ -30,15 +39,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; -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; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jdt.annotation.NonNull; - /** * * An implementation of the model object 'IED Name'. @@ -1287,7 +1287,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getValue() == null ) || getValue().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "value is missing" ); + messagePrefix, "value is missing" ); return; } @@ -1296,34 +1296,34 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getValue() ); if( ied.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getValue(), " )" ); + messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), + " IED( name = ", getValue(), " )" ); return; } if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { setRefersToIED( ied.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "IEDName to IED( name = ", getValue(), " ) on line ", - ied.getLeft().getLineNumber() ); + "IEDName to IED( name = ", getValue(), " ) on line ", + ied.getLeft().getLineNumber() ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found IED( name = ", getValue(), " ) on line ", - ied.getLeft().getLineNumber() ); + messagePrefix, "found IED( name = ", getValue(), " ) on line ", + ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = null; if( ( getApRef() == null ) || getApRef().isEmpty() ) { if( ied.getLeft().getAccessPoint().size() == 0 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); + messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); return; } if( ied.getLeft().getAccessPoint().size() > 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), - " ) but apRef not specified" ); + messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), + " ) but apRef not specified" ); return; } ap = Pair.of( ied.getLeft().getAccessPoint().get( 0 ), 1 ); @@ -1332,31 +1332,31 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { ap = SclUtilities.getAccessPoint( ied.getLeft(), getApRef() ); if( ap.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApRef(), " )" ); + messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), + " AccessPoint( name = ", getApRef(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found AccessPoint( name = ", getApRef(), " ) on line ", - ap.getLeft().getLineNumber() ); + messagePrefix, "found AccessPoint( name = ", getApRef(), " ) on line ", + ap.getLeft().getLineNumber() ); } Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); + messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), + " LDevice( inst = ", getLdInst(), " )" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { setRefersToLDevice( lDevice.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "IEDName refers to LDevice( inst = ", getLdInst(), " ) on line ", - getRefersToLDevice().getLineNumber() ); + "IEDName refers to LDevice( inst = ", getLdInst(), " ) on line ", + getRefersToLDevice().getLineNumber() ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", - lDevice.getLeft().getLineNumber() ); + messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", + lDevice.getLeft().getLineNumber() ); Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice.getLeft(), getLnClass(), getLnInst(), getPrefix() ); @@ -1368,13 +1368,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { mess += " )"; if( anyLN.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); + messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), + mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ClientLN refers to", mess, " on line ", getRefersToAnyLN().getLineNumber() ); + "ClientLN refers to", mess, " on line ", getRefersToAnyLN().getLineNumber() ); } } //IEDNameImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java index fe9df8c8..73c9a340 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,13 +20,6 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.KDC; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - import org.apache.commons.lang3.tuple.Pair; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -36,6 +29,13 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.KDC; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'KDC'. @@ -585,12 +585,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "iedName is missing" ); + messagePrefix, "iedName is missing" ); return; } if( ( getApName() == null ) || getApName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "apName is missing" ); + messagePrefix, "apName is missing" ); return; } @@ -599,25 +599,25 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - "IED( name = ", getIedName(), " )" ); + messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), + "IED( name = ", getIedName(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found IED( name = ", getIedName(), " ) on line ", - ied.getLeft().getLineNumber() ); + messagePrefix, "found IED( name = ", getIedName(), " ) on line ", + ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied.getLeft(), getApName() ); if( ap.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - "AccessPoint( name = ", getApName(), " )" ); + messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), + "AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "KDC refers to AccessPoint( name = ", getApName(), " ) on line ", - getRefersToAccessPoint().getLineNumber() ); + "KDC refers to AccessPoint( name = ", getApName(), " ) on line ", + getRefersToAccessPoint().getLineNumber() ); } } //KDCImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java index 1ed7bf84..8fa2779f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,17 +20,6 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeContainer; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - import java.util.List; import java.util.stream.Collectors; @@ -43,6 +32,17 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.AnyLN; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.LDevice; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNode; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeContainer; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.LNodeType; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'LNode'. @@ -1151,13 +1151,13 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri // Default value is None if( ( getIedName() == null ) || getIedName().isEmpty() || "None".equals( getIedName() ) ) { console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "link to AnyLN not resolved because iedName is absent or None" ); + messagePrefix, "link to AnyLN not resolved because iedName is absent or None" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "lnClass is missing" ); + messagePrefix, "lnClass is missing" ); return; } @@ -1166,26 +1166,26 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getIedName(), " )" ); + messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), + " IED( name = ", getIedName(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found IED( name = ", getIedName(), " ) on line ", - ied.getLeft().getLineNumber() ); + messagePrefix, "found IED( name = ", getIedName(), " ) on line ", + ied.getLeft().getLineNumber() ); // find inside an LDevice with // LDevice.name == LNode.ldInst Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); + messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), + " LDevice( inst = ", getLdInst(), " )" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", - lDevice.getLeft().getLineNumber() ); + messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", + lDevice.getLeft().getLineNumber() ); // find inside an LN with // LN.lnClass == LNode.lnClass @@ -1201,13 +1201,13 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri mess += " )"; if( anyLN.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); + messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), + mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "LNode refers to ", mess, " on line ", getRefersToAnyLN().getLineNumber() ); + "LNode refers to ", mess, " on line ", getRefersToAnyLN().getLineNumber() ); } private void doBuildExplicitLNodeTypeLink( @NonNull IRiseClipseConsole console, @NonNull String mPrefix ) { @@ -1218,37 +1218,37 @@ private void doBuildExplicitLNodeTypeLink( @NonNull IRiseClipseConsole console, if( ( getLnType() == null ) || getLnType().isEmpty() ) { console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "link not resolved because lnType is missing" ); + messagePrefix, "link not resolved because lnType is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); + messagePrefix, "DataTypeTemplates is missing" ); return; } List< LNodeType > res = dtt .getLNodeType() .stream() - .filter( lnt -> getLnType().equals( lnt.getId() )) + .filter( lnt -> getLnType().equals( lnt.getId() ) ) .collect( Collectors.toList() ); if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " LNodeType( id = ", getLnType(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " LNodeType( id = ", getLnType(), " )" ); return; } - setRefersToLNodeType( res.get( 0 )); + setRefersToLNodeType( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "AnyLN refers to LNodeType( id = ", getLnType(), " ) on line ", - getRefersToLNodeType().getLineNumber() ); + "AnyLN refers to LNodeType( id = ", getLnType(), " ) on line ", + getRefersToLNodeType().getLineNumber() ); - if(( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() )) { + if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", - getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); + messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", + getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); } } 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 3b667888..97f6fc20 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -1332,7 +1332,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getLogName() == null ) || getLogName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "logName is missing" ); + messagePrefix, "logName is missing" ); return; } @@ -1346,14 +1346,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< LDevice, Integer > lDevice1 = SclUtilities.getLDevice( ied, getLdInst() ); if( lDevice1.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), - "LDevice( inst = ", getLdInst(), " )" ); + messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), + "LDevice( inst = ", getLdInst(), " )" ); return; } lDevice = lDevice1.getLeft(); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", - lDevice.getLineNumber() ); + messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", + lDevice.getLineNumber() ); } Pair< AnyLN, Integer > anyLN = SclUtilities.getAnyLN( lDevice, getLnClass(), getLnInst(), getPrefix() ); @@ -1365,14 +1365,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { mess += " )"; if( anyLN.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); + messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), + mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "LogControl refers to ", mess, " on line ", - getRefersToAnyLN().getLineNumber() ); + "LogControl refers to ", mess, " on line ", + getRefersToAnyLN().getLineNumber() ); } 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 70b8d9bf..d4133c63 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -1164,7 +1164,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getName() == null ) || getName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "name is missing" ); + messagePrefix, "name is missing" ); return; } @@ -1184,14 +1184,14 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N // No error or warning message here: if this happens, error should have been detected before if( do_ == null ) return; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DO on line ", do_.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; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DOType on line ", dot.getLineNumber() ); + messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< SDO > res1 = dot .getSDO() @@ -1202,15 +1202,15 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N // Not an error if res1.size() == 0: will look for a DA if( res1.size() > 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found several SDO( name = ", getName(), - " ) using ParentDOI" ); + messagePrefix, "found several SDO( name = ", getName(), + " ) using ParentDOI" ); return; } if( res1.size() == 1 ) { setRefersToSDO( res1.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "SDI refers to SDO( name = ", getName(), " ) on line ", - getRefersToSDO().getLineNumber() ); + "SDI refers to SDO( name = ", getName(), " ) on line ", + getRefersToSDO().getLineNumber() ); return; } @@ -1223,33 +1223,33 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N // Specific message if res2.size() == 0 if( res2.size() == 0 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "no SDO or DA found using ParentDOI" ); + messagePrefix, "no SDO or DA found using ParentDOI" ); return; } if( res2.size() > 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found several DA( name = ", getName(), - " ) using ParentDOI" ); + messagePrefix, "found several DA( name = ", getName(), + " ) using ParentDOI" ); return; } setRefersToAbstractDataAttribute( res2.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "SDI refers to DA( name = ", getName(), " ) on line ", - getRefersToAbstractDataAttribute().getLineNumber() ); + "SDI refers to DA( name = ", getName(), " ) on line ", + getRefersToAbstractDataAttribute().getLineNumber() ); } private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { SDO sdo = getParentSDI().getRefersToSDO(); if( sdo != null ) { console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found SDO on line ", sdo.getLineNumber() ); + messagePrefix, "found SDO on line ", sdo.getLineNumber() ); sdo.buildExplicitLinks( console, false ); DOType dot = sdo.getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before if( dot == null ) return; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DOType on line ", dot.getLineNumber() ); + messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< SDO > res1 = dot .getSDO() @@ -1260,14 +1260,14 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N // Not an error if res1.size() == 0: will look for a DA if( res1.size() > 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found several SDO( name = ", getName(), " ) using ParentSDI" ); + messagePrefix, "found several SDO( name = ", getName(), " ) using ParentSDI" ); return; } if( res1.size() == 1 ) { setRefersToSDO( res1.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "SDI refers to SDO( name = ", getName(), " ) on line ", - getRefersToSDO().getLineNumber() ); + "SDI refers to SDO( name = ", getName(), " ) on line ", + getRefersToSDO().getLineNumber() ); return; } @@ -1280,18 +1280,18 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N // Specific message if res2.size() == 0 if( res2.size() == 0 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), messagePrefix, - "no SDO or DA found using ParentSDI" ); + "no SDO or DA found using ParentSDI" ); return; } if( res2.size() > 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found several DA( name = ", getName(), " ) using ParentSDI" ); + messagePrefix, "found several DA( name = ", getName(), " ) using ParentSDI" ); return; } setRefersToAbstractDataAttribute( res2.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "SDI refers to DA( name = ", getName(), " ) on line ", - getRefersToAbstractDataAttribute().getLineNumber() ); + "SDI refers to DA( name = ", getName(), " ) on line ", + getRefersToAbstractDataAttribute().getLineNumber() ); return; } @@ -1300,18 +1300,18 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N AbstractDataAttribute att = getParentSDI().getRefersToAbstractDataAttribute(); if( att == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "cannot find SDO or AbstractDataAttribute using ParentSDI" ); + messagePrefix, "cannot find SDO or AbstractDataAttribute using ParentSDI" ); return; } console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found AbstractDataAttribute on line ", att.getLineNumber() ); + messagePrefix, "found AbstractDataAttribute on line ", att.getLineNumber() ); 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; console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found DAType on line ", dat.getLineNumber() ); + messagePrefix, "found DAType on line ", dat.getLineNumber() ); List< BDA > res = dat .getBDA() @@ -1321,14 +1321,14 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " BDA( name = ", getName(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " BDA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "SDI refers to BDA( name = ", getName(), " ) on line ", - getRefersToAbstractDataAttribute().getLineNumber() ); + "SDI refers to BDA( name = ", getName(), " ) on line ", + getRefersToAbstractDataAttribute().getLineNumber() ); } } //SDIImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java index e49a4f15..f3e1a997 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,19 +20,10 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; +import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.INamespaceGetter; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SDO; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - -import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -44,6 +35,15 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DOType; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataTypeTemplates; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.INamespaceGetter; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SDI; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SDO; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'SDO'. @@ -137,7 +137,7 @@ protected EClass eStaticClass() { @Override public String getNamespace() { //@formatter:off - + // The attribute dataNs shall be a DataAttribute of the data. // // 1. SDO.DOType.namespace If not null @@ -147,7 +147,7 @@ public String getNamespace() { if( getRefersToDOType() != null ) { return getRefersToDOType().getNamespace(); } - + return null; //@formatter:on @@ -259,7 +259,7 @@ else if( eNotificationRequired() ) @Override public EList< SDI > getReferredBySDI() { if( referredBySDI == null ) { - referredBySDI = new EObjectWithInverseEList.Unsettable< SDI >( SDI.class, this, + referredBySDI = new EObjectWithInverseEList.Unsettable< >( SDI.class, this, SclPackage.SDO__REFERRED_BY_SDI, SclPackage.SDI__REFERS_TO_SDO ); } return referredBySDI; @@ -491,13 +491,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getType() == null ) || getType().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "type is missing" ); + messagePrefix, "type is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); + messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -509,14 +509,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res.size() == 0 ) ? "cannot find" : "found several" ), - " DOType( id = ", getType(), " )" ); + messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), + " DOType( id = ", getType(), " )" ); return; } setRefersToDOType( res.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "SDO refers to DOType( id = ", getType(), " ) on line ", - getRefersToDOType().getLineNumber() ); + "SDO refers to DOType( id = ", getType(), " ) on line ", + getRefersToDOType().getLineNumber() ); } } //SDOImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java index be57419b..c2cd90a9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,8 +20,9 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; -import org.eclipse.emf.common.notify.Notification; +import java.lang.reflect.InvocationTargetException; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EClass; @@ -33,7 +34,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; -import java.lang.reflect.InvocationTargetException; /** * @@ -50,9 +50,9 @@ * @generated */ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container implements SclObject { - + protected static final String EXPLICIT_LINK_CATEGORY = "SCL/ExplicitLinks"; - + /** * The default value of the '{@link #getLineNumber() Line Number}' attribute. * diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java index 3a8ff8fb..1fe367b4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,13 +20,6 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServerAt; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - import org.apache.commons.lang3.tuple.Pair; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -36,6 +29,13 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.AccessPoint; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.IED; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServerAt; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'Server At'. @@ -493,7 +493,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getApName() == null ) || getApName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "apName is missing" ); + messagePrefix, "apName is missing" ); return; } @@ -504,14 +504,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied, getApName() ); if( ap.getLeft() == null ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApName(), " )" ); + messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), + " AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ServerAt refers to AccessPoint( name = ", getApName(), " ) on line ", - getRefersToAccessPoint().getLineNumber() ); + "ServerAt refers to AccessPoint( name = ", getApName(), " ) on line ", + getRefersToAccessPoint().getLineNumber() ); } } //ServerAtImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java index 34a07648..fb97c593 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,17 +20,6 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractConductingEquipment; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.Line; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.Substation; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.VoltageLevel; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; - import java.util.List; import java.util.stream.Collectors; @@ -42,6 +31,17 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jdt.annotation.NonNull; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractConductingEquipment; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.Bay; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.ConnectivityNode; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.Line; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.Substation; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.Terminal; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.VoltageLevel; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * An implementation of the model object 'Terminal'. @@ -1193,7 +1193,8 @@ else if( getLineName() != null ) { } } - private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { + private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole console, + @NonNull String messagePrefix ) { // name The optional relative name of the terminal at this Equipment. The default is the empty string, which means that the name // of the ConnectivityNode is also the terminal identification. @@ -1208,17 +1209,17 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons if( ( getCNodeName() == null ) || getCNodeName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "cNodeName is missing" ); + messagePrefix, "cNodeName is missing" ); return; } if( ( getVoltageLevelName() == null ) || getVoltageLevelName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "voltageLevelName is missing" ); + messagePrefix, "voltageLevelName is missing" ); return; } if( ( getBayName() == null ) || getBayName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "bayName is missing" ); + messagePrefix, "bayName is missing" ); return; } @@ -1233,14 +1234,14 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons if( res1.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res1.size() == 0 ) ? "cannot find" : "found several" ), - " Substation( name = ", getSubstationName(), " )" ); + messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), + " Substation( name = ", getSubstationName(), " )" ); return; } Substation substation = res1.get( 0 ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found Substation( name = ", getSubstationName(), " ) on line ", - substation.getLineNumber() ); + messagePrefix, "found Substation( name = ", getSubstationName(), " ) on line ", + substation.getLineNumber() ); // find a VoltageLevel with // VoltageLevel.name == Terminal.voltageLevelName @@ -1252,14 +1253,14 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons if( res2.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res2.size() == 0 ) ? "cannot find" : "found several" ), - " VoltageLevel( name = ", getVoltageLevelName(), " )" ); + messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), + " VoltageLevel( name = ", getVoltageLevelName(), " )" ); return; } VoltageLevel voltageLevel = res2.get( 0 ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found VoltageLevel( name = ", getVoltageLevelName(), " ) on line ", - voltageLevel.getLineNumber() ); + messagePrefix, "found VoltageLevel( name = ", getVoltageLevelName(), " ) on line ", + voltageLevel.getLineNumber() ); // find a Bay with // Bay.name == Terminal.bayName @@ -1271,14 +1272,14 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons if( res3.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res3.size() == 0 ) ? "cannot find" : "found several" ), - " Bay( name = ", getBayName(), " )" ); + messagePrefix, ( ( res3.size() == 0 ) ? "cannot find" : "found several" ), + " Bay( name = ", getBayName(), " )" ); return; } Bay bay = res3.get( 0 ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found Bay( name = ", getBayName(), " ) on line ", - voltageLevel.getLineNumber() ); + messagePrefix, "found Bay( name = ", getBayName(), " ) on line ", + voltageLevel.getLineNumber() ); // find a ConnectivityNode with // ConnectivityNode.name == Terminal.bayName @@ -1290,20 +1291,20 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons if( res4.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res4.size() == 0 ) ? "cannot find" : "found several" ), - " ConnectivityNode( name = ", getCNodeName(), " )" ); + messagePrefix, ( ( res4.size() == 0 ) ? "cannot find" : "found several" ), + " ConnectivityNode( name = ", getCNodeName(), " )" ); return; } setRefersToConnectivityNode( res4.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "Terminal refers to ConnectivityNode( name = ", getCNodeName(), " ) on line ", - getRefersToConnectivityNode().getLineNumber() ); + "Terminal refers to ConnectivityNode( name = ", getCNodeName(), " ) on line ", + getRefersToConnectivityNode().getLineNumber() ); } private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { if( ( getCNodeName() == null ) || getCNodeName().isEmpty() ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "cNodeName is missing" ); + messagePrefix, "cNodeName is missing" ); return; } @@ -1318,14 +1319,14 @@ private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @ if( res1.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res1.size() == 0 ) ? "cannot find" : "found several" ), - " Line( name = ", getLineName(), " )" ); + messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), + " Line( name = ", getLineName(), " )" ); return; } Line line = res1.get( 0 ); console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, "found Line( name = ", getLineName(), " ) on line ", - line.getLineNumber() ); + messagePrefix, "found Line( name = ", getLineName(), " ) on line ", + line.getLineNumber() ); // find a ConnectivityNode with // ConnectivityNode.name == Terminal.bayName @@ -1336,14 +1337,14 @@ private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @ if( res2.size() != 1 ) { console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, (( res2.size() == 0 ) ? "cannot find" : "found several" ), - " ConnectivityNode( name = ", getCNodeName(), " )" ); + messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), + " ConnectivityNode( name = ", getCNodeName(), " )" ); return; } setRefersToConnectivityNode( res2.get( 0 ) ); console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "Terminal refers to ConnectivityNode( name = ", getCNodeName(), " )", " on line ", - getRefersToConnectivityNode().getLineNumber() ); + "Terminal refers to ConnectivityNode( name = ", getCNodeName(), " )", " on line ", + getRefersToConnectivityNode().getLineNumber() ); } } //TerminalImpl From a0dc693425ab9afe3601b39615d5babe764a7308 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Fri, 15 Apr 2022 14:19:03 +0200 Subject: [PATCH 2/5] add filename attribute to SclObject --- .../plugin.properties | 1 + .../provider/AccessControlItemProvider.java | 9 +- .../scl/provider/AddressItemProvider.java | 10 +- ...ContentFromOtherNamespaceItemProvider.java | 11 +- .../scl/provider/AnyLNItemProvider.java | 7 +- .../scl/provider/AssociationItemProvider.java | 7 +- .../provider/AuthenticationItemProvider.java | 10 +- .../scl/provider/BaseElementItemProvider.java | 10 +- .../BitRateInMbPerSecItemProvider.java | 10 +- .../scl/provider/BitRateItemProvider.java | 9 +- .../scl/provider/CertItemProvider.java | 7 +- .../scl/provider/ClientLNItemProvider.java | 7 +- .../provider/ClientServicesItemProvider.java | 8 +- .../scl/provider/CommProtItemProvider.java | 10 +- .../provider/CommunicationItemProvider.java | 10 +- .../scl/provider/ConfDataSetItemProvider.java | 9 +- .../scl/provider/ConfLNsItemProvider.java | 10 +- .../scl/provider/ConfLdNameItemProvider.java | 9 +- .../provider/ConfLogControlItemProvider.java | 9 +- .../ConfReportControlItemProvider.java | 9 +- .../scl/provider/ConfSGItemProvider.java | 10 +- .../scl/provider/ConfSigRefItemProvider.java | 9 +- .../scl/provider/ConnectedAPItemProvider.java | 7 +- .../provider/ControlBlockItemProvider.java | 7 +- .../scl/provider/DATypeItemProvider.java | 7 +- .../scl/provider/DOTypeItemProvider.java | 7 +- .../DataObjectDirectoryItemProvider.java | 9 +- .../DataSetDirectoryItemProvider.java | 9 +- .../DataTypeTemplatesItemProvider.java | 10 +- .../DurationInMilliSecItemProvider.java | 10 +- .../provider/DurationInSecItemProvider.java | 9 +- .../provider/DynAssociationItemProvider.java | 9 +- .../scl/provider/DynDataSetItemProvider.java | 9 +- .../scl/provider/EnumTypeItemProvider.java | 7 +- .../scl/provider/EnumValItemProvider.java | 10 +- .../scl/provider/ExtRefItemProvider.java | 7 +- .../scl/provider/FCDAItemProvider.java | 7 +- .../provider/FileHandlingItemProvider.java | 10 +- .../scl/provider/GOOSEItemProvider.java | 10 +- .../scl/provider/GSEDirItemProvider.java | 9 +- .../scl/provider/GSEItemProvider.java | 7 +- .../scl/provider/GSESettingsItemProvider.java | 9 +- .../scl/provider/GSSEItemProvider.java | 9 +- .../scl/provider/GetCBValuesItemProvider.java | 9 +- .../GetDataObjectDefinitionItemProvider.java | 9 +- .../provider/GetDataSetValueItemProvider.java | 9 +- .../provider/GetDirectoryItemProvider.java | 9 +- .../scl/provider/HeaderItemProvider.java | 7 +- .../scl/provider/HistoryItemProvider.java | 10 +- .../scl/provider/HitemItemProvider.java | 10 +- .../scl/provider/IDNamingItemProvider.java | 7 +- .../scl/provider/IEDNameItemProvider.java | 10 +- .../scl/provider/InputsItemProvider.java | 10 +- .../scl/provider/IssuerNameItemProvider.java | 6 +- .../scl/provider/KDCItemProvider.java | 7 +- .../scl/provider/LDeviceItemProvider.java | 7 +- .../scl/provider/LN0ItemProvider.java | 7 +- .../iec61850/scl/provider/LNItemProvider.java | 7 +- .../scl/provider/LNodeItemProvider.java | 7 +- .../scl/provider/LNodeTypeItemProvider.java | 7 +- .../scl/provider/LogSettingsItemProvider.java | 9 +- .../scl/provider/MaxTimeItemProvider.java | 9 +- .../scl/provider/McSecurityItemProvider.java | 16 +- .../scl/provider/MinTimeItemProvider.java | 9 +- .../scl/provider/OptFieldsItemProvider.java | 10 +- .../scl/provider/PAddrItemProvider.java | 10 +- .../iec61850/scl/provider/PItemProvider.java | 9 +- .../scl/provider/P_PhysConnItemProvider.java | 9 +- .../scl/provider/PhysConnItemProvider.java | 10 +- .../scl/provider/PrivateItemProvider.java | 10 +- .../scl/provider/ProtNsItemProvider.java | 10 +- .../scl/provider/ProtocolItemProvider.java | 10 +- .../scl/provider/ReadWriteItemProvider.java | 9 +- .../scl/provider/RedProtItemProvider.java | 10 +- .../provider/ReportSettingsItemProvider.java | 9 +- .../scl/provider/RptEnabledItemProvider.java | 10 +- .../scl/provider/SCLItemProvider.java | 10 +- .../scl/provider/SGEditItemProvider.java | 10 +- .../scl/provider/SMVItemProvider.java | 6 +- .../scl/provider/SMVSettingsItemProvider.java | 9 +- .../scl/provider/SMVscItemProvider.java | 10 +- .../provider/SamplesPerSecItemProvider.java | 10 +- .../scl/provider/SclObjectItemProvider.java | 35 +- .../provider/SecPerSamplesItemProvider.java | 10 +- .../scl/provider/ServerAtItemProvider.java | 7 +- .../scl/provider/ServerItemProvider.java | 10 +- .../ServiceConfReportControlItemProvider.java | 10 +- .../ServiceForConfDataSetItemProvider.java | 10 +- .../provider/ServiceSettingsItemProvider.java | 9 +- ...ceWithMaxAndMaxAttributesItemProvider.java | 11 +- .../ServiceWithMaxAndModifyItemProvider.java | 10 +- .../provider/ServiceWithMaxItemProvider.java | 10 +- .../ServiceWithMaxNonZeroItemProvider.java | 10 +- .../ServiceWithOptionalMaxItemProvider.java | 10 +- .../provider/ServiceYesNoItemProvider.java | 9 +- .../scl/provider/ServicesItemProvider.java | 8 +- .../provider/SetDataSetValueItemProvider.java | 9 +- .../provider/SettingControlItemProvider.java | 10 +- .../provider/SettingGroupsItemProvider.java | 10 +- .../scl/provider/SmpRateItemProvider.java | 10 +- .../scl/provider/SmvOptsItemProvider.java | 10 +- .../scl/provider/SubjectItemProvider.java | 6 +- .../provider/SupSubscriptionItemProvider.java | 10 +- .../scl/provider/TextItemProvider.java | 10 +- .../provider/TimeSyncProtItemProvider.java | 10 +- .../TimerActivatedControlItemProvider.java | 9 +- .../scl/provider/TrgOpsItemProvider.java | 10 +- .../scl/provider/UnNamingItemProvider.java | 10 +- .../scl/provider/ValItemProvider.java | 10 +- .../provider/ValueHandlingItemProvider.java | 10 +- .../provider/ValueWithUnitItemProvider.java | 10 +- .../scl/provider/VoltageItemProvider.java | 9 +- .../model/SCL.ecore | 3 + .../model/SCL.genmodel | 1 + .../riseclipse/iec61850/scl/SclObject.java | 31 +- .../riseclipse/iec61850/scl/SclPackage.java | 1482 ++++++++++++++++- .../iec61850/scl/impl/ControlBlockImpl.java | 2 +- .../iec61850/scl/impl/ExtRefImpl.java | 2 +- .../iec61850/scl/impl/SclObjectImpl.java | 57 + .../iec61850/scl/impl/SclPackageImpl.java | 15 +- .../riseclipse/iec61850/scl/impl/scl.ecore | 3 + 121 files changed, 2166 insertions(+), 463 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties index 841e258b..167d7dee 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.properties @@ -1299,3 +1299,4 @@ _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 diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java index fa22a83e..24bd0c8a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AccessControlItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - AccessControl accessControl = ( AccessControl ) object; - return getString( "_UI_AccessControl_type" ) + " " + accessControl.getLineNumber(); + String label = ( ( AccessControl ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_AccessControl_type" ) + : getString( "_UI_AccessControl_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java index 9b95a061..d443ab23 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AddressItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -114,8 +115,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Address address = ( Address ) object; - return getString( "_UI_Address_type" ) + " " + address.getLineNumber(); + String label = ( ( Address ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Address_type" ) + : getString( "_UI_Address_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java index b963da1e..505b49fc 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyContentFromOtherNamespaceItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -106,9 +107,9 @@ protected EStructuralFeature getChildFeature( Object object, Object child ) { */ @Override public String getText( Object object ) { - AnyContentFromOtherNamespace anyContentFromOtherNamespace = ( AnyContentFromOtherNamespace ) object; - return getString( "_UI_AnyContentFromOtherNamespace_type" ) + " " - + anyContentFromOtherNamespace.getLineNumber(); + String label = ( ( AnyContentFromOtherNamespace ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_AnyContentFromOtherNamespace_type" ) + : getString( "_UI_AnyContentFromOtherNamespace_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java index 956f5226..839017e1 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AnyLNItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -348,7 +349,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( AnyLN ) object ).getNamespace(); + String label = ( ( AnyLN ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_AnyLN_type" ) : getString( "_UI_AnyLN_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java index f12944d2..37ede7a9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/AssociationItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -289,7 +290,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( Association ) object ).getIedName(); + String label = ( ( Association ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_Association_type" ) : getString( "_UI_Association_type" ) + " " + label; } 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 9adacffb..6fc6a8f9 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -199,8 +200,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Authentication authentication = ( Authentication ) object; - return getString( "_UI_Authentication_type" ) + " " + authentication.getLineNumber(); + String label = ( ( Authentication ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Authentication_type" ) + : getString( "_UI_Authentication_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java index 952c337f..1d74f70d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BaseElementItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -117,8 +118,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - BaseElement baseElement = ( BaseElement ) object; - return getString( "_UI_BaseElement_type" ) + " " + baseElement.getLineNumber(); + String label = ( ( BaseElement ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_BaseElement_type" ) + : getString( "_UI_BaseElement_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java index bcdd0f8e..0af7354b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateInMbPerSecItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -153,8 +154,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - BitRateInMbPerSec bitRateInMbPerSec = ( BitRateInMbPerSec ) object; - return getString( "_UI_BitRateInMbPerSec_type" ) + " " + bitRateInMbPerSec.getLineNumber(); + String label = ( ( BitRateInMbPerSec ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_BitRateInMbPerSec_type" ) + : getString( "_UI_BitRateInMbPerSec_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java index 7e297eae..1b78f0c4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/BitRateItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - BitRate bitRate = ( BitRate ) object; - return getString( "_UI_BitRate_type" ) + " " + bitRate.getLineNumber(); + String label = ( ( BitRate ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_BitRate_type" ) + : getString( "_UI_BitRate_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java index 2b1cfab2..1363e1d2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CertItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -131,7 +130,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( Cert ) object ).getCommonName(); + String label = ( ( Cert ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_Cert_type" ) : getString( "_UI_Cert_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java index e437120b..d44753b6 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ClientLNItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -266,7 +267,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( ClientLN ) object ).getIedName(); + String label = ( ( ClientLN ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ClientLN_type" ) : getString( "_UI_ClientLN_type" ) + " " + label; } 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 7fcce3ec..c20739de 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -439,8 +440,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Boolean labelValue = ( ( ClientServices ) object ).getSupportsLdName(); - String label = labelValue == null ? null : labelValue.toString(); + String label = ( ( ClientServices ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ClientServices_type" ) : getString( "_UI_ClientServices_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java index e5456488..cd7bce1d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/CommProtItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -107,8 +108,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - CommProt commProt = ( CommProt ) object; - return getString( "_UI_CommProt_type" ) + " " + commProt.getLineNumber(); + String label = ( ( CommProt ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_CommProt_type" ) + : getString( "_UI_CommProt_type" ) + " " + label; } /** 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 1b8e562a..984f01e7 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -113,8 +114,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Communication communication = ( Communication ) object; - return getString( "_UI_Communication_type" ) + " " + communication.getLineNumber(); + String label = ( ( Communication ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Communication_type" ) + : getString( "_UI_Communication_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java index e1143b96..d9d9982c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfDataSetItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ConfDataSet confDataSet = ( ConfDataSet ) object; - return getString( "_UI_ConfDataSet_type" ) + " " + confDataSet.getLineNumber(); + String label = ( ( ConfDataSet ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ConfDataSet_type" ) + : getString( "_UI_ConfDataSet_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java index f39788aa..de77efc6 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLNsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -130,8 +131,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ConfLNs confLNs = ( ConfLNs ) object; - return getString( "_UI_ConfLNs_type" ) + " " + confLNs.getLineNumber(); + String label = ( ( ConfLNs ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ConfLNs_type" ) + : getString( "_UI_ConfLNs_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java index 413b5ac9..e0b63a77 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLdNameItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ConfLdName confLdName = ( ConfLdName ) object; - return getString( "_UI_ConfLdName_type" ) + " " + confLdName.getLineNumber(); + String label = ( ( ConfLdName ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ConfLdName_type" ) + : getString( "_UI_ConfLdName_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java index 6ecf4a0f..5de48f99 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfLogControlItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ConfLogControl confLogControl = ( ConfLogControl ) object; - return getString( "_UI_ConfLogControl_type" ) + " " + confLogControl.getLineNumber(); + String label = ( ( ConfLogControl ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ConfLogControl_type" ) + : getString( "_UI_ConfLogControl_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java index 2c271f2f..571e3562 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfReportControlItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ConfReportControl confReportControl = ( ConfReportControl ) object; - return getString( "_UI_ConfReportControl_type" ) + " " + confReportControl.getLineNumber(); + String label = ( ( ConfReportControl ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ConfReportControl_type" ) + : getString( "_UI_ConfReportControl_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java index 2dfe747a..df585a21 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSGItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -107,8 +108,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ConfSG confSG = ( ConfSG ) object; - return getString( "_UI_ConfSG_type" ) + " " + confSG.getLineNumber(); + String label = ( ( ConfSG ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ConfSG_type" ) + : getString( "_UI_ConfSG_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java index f3472bdf..18749452 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConfSigRefItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ConfSigRef confSigRef = ( ConfSigRef ) object; - return getString( "_UI_ConfSigRef_type" ) + " " + confSigRef.getLineNumber(); + String label = ( ( ConfSigRef ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ConfSigRef_type" ) + : getString( "_UI_ConfSigRef_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java index 44d255c9..b63c8fb2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ConnectedAPItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -210,7 +211,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( ConnectedAP ) object ).getApName(); + String label = ( ( ConnectedAP ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ConnectedAP_type" ) : getString( "_UI_ConnectedAP_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java index c943423c..e08bea08 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ControlBlockItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -184,7 +185,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( ControlBlock ) object ).getCbName(); + String label = ( ( ControlBlock ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ControlBlock_type" ) : getString( "_UI_ControlBlock_type" ) + " " + label; } 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 e20a6ce9..fc1be56e 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -162,7 +163,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( DAType ) object ).getId(); + String label = ( ( DAType ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_DAType_type" ) : getString( "_UI_DAType_type" ) + " " + label; } 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 92169a19..f717952d 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -207,7 +208,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( DOType ) object ).getId(); + String label = ( ( DOType ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_DOType_type" ) : getString( "_UI_DOType_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java index b3d87690..ef133259 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataObjectDirectoryItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - DataObjectDirectory dataObjectDirectory = ( DataObjectDirectory ) object; - return getString( "_UI_DataObjectDirectory_type" ) + " " + dataObjectDirectory.getLineNumber(); + String label = ( ( DataObjectDirectory ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_DataObjectDirectory_type" ) + : getString( "_UI_DataObjectDirectory_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java index 3ce0e9c6..2ed2297b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DataSetDirectoryItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - DataSetDirectory dataSetDirectory = ( DataSetDirectory ) object; - return getString( "_UI_DataSetDirectory_type" ) + " " + dataSetDirectory.getLineNumber(); + String label = ( ( DataSetDirectory ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_DataSetDirectory_type" ) + : getString( "_UI_DataSetDirectory_type" ) + " " + label; } /** 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 7d4ca442..9e7393d8 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -117,8 +118,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - DataTypeTemplates dataTypeTemplates = ( DataTypeTemplates ) object; - return getString( "_UI_DataTypeTemplates_type" ) + " " + dataTypeTemplates.getLineNumber(); + String label = ( ( DataTypeTemplates ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_DataTypeTemplates_type" ) + : getString( "_UI_DataTypeTemplates_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java index 88329459..5f098dbf 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInMilliSecItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -153,8 +154,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - DurationInMilliSec durationInMilliSec = ( DurationInMilliSec ) object; - return getString( "_UI_DurationInMilliSec_type" ) + " " + durationInMilliSec.getLineNumber(); + String label = ( ( DurationInMilliSec ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_DurationInMilliSec_type" ) + : getString( "_UI_DurationInMilliSec_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java index 2b606c12..84959017 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DurationInSecItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - DurationInSec durationInSec = ( DurationInSec ) object; - return getString( "_UI_DurationInSec_type" ) + " " + durationInSec.getLineNumber(); + String label = ( ( DurationInSec ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_DurationInSec_type" ) + : getString( "_UI_DurationInSec_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java index dd7c6e54..5c2b3e62 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynAssociationItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - DynAssociation dynAssociation = ( DynAssociation ) object; - return getString( "_UI_DynAssociation_type" ) + " " + dynAssociation.getLineNumber(); + String label = ( ( DynAssociation ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_DynAssociation_type" ) + : getString( "_UI_DynAssociation_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java index 7bcad34b..82bd5998 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/DynDataSetItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - DynDataSet dynDataSet = ( DynDataSet ) object; - return getString( "_UI_DynDataSet_type" ) + " " + dynDataSet.getLineNumber(); + String label = ( ( DynDataSet ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_DynDataSet_type" ) + : getString( "_UI_DynDataSet_type" ) + " " + label; } /** 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 5c9014e6..c9d3f0c1 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -137,7 +138,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( EnumType ) object ).getId(); + String label = ( ( EnumType ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_EnumType_type" ) : getString( "_UI_EnumType_type" ) + " " + label; } 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 4c767b78..592cac4d 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -151,8 +152,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - EnumVal enumVal = ( EnumVal ) object; - return getString( "_UI_EnumVal_type" ) + " " + enumVal.getLineNumber(); + String label = ( ( EnumVal ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_EnumVal_type" ) + : getString( "_UI_EnumVal_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java index 6afa49c4..8f9072f2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ExtRefItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -585,7 +586,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( ExtRef ) object ).getDaName(); + String label = ( ( ExtRef ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ExtRef_type" ) : getString( "_UI_ExtRef_type" ) + " " + label; } 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 573ec1a1..7ddf1e76 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -283,7 +284,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( FCDA ) object ).getDaName(); + String label = ( ( FCDA ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_FCDA_type" ) : getString( "_UI_FCDA_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java index ed294326..4f964f75 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/FileHandlingItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -153,8 +154,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - FileHandling fileHandling = ( FileHandling ) object; - return getString( "_UI_FileHandling_type" ) + " " + fileHandling.getLineNumber(); + String label = ( ( FileHandling ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_FileHandling_type" ) + : getString( "_UI_FileHandling_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java index b16d720d..c7313f10 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GOOSEItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -150,8 +151,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - GOOSE goose = ( GOOSE ) object; - return getString( "_UI_GOOSE_type" ) + " " + goose.getLineNumber(); + String label = ( ( GOOSE ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_GOOSE_type" ) + : getString( "_UI_GOOSE_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java index 3ce69b42..7213d9fd 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEDirItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - GSEDir gseDir = ( GSEDir ) object; - return getString( "_UI_GSEDir_type" ) + " " + gseDir.getLineNumber(); + String label = ( ( GSEDir ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_GSEDir_type" ) + : getString( "_UI_GSEDir_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java index 26b133ff..a987ebf1 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSEItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -114,7 +115,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( GSE ) object ).getCbName(); + String label = ( ( GSE ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_GSE_type" ) : getString( "_UI_GSE_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java index bf00d602..7bdd8df5 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSESettingsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -33,7 +34,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclFactory; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettingsNoDynEnum; /** * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.GSESettings} object. @@ -185,8 +185,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceSettingsNoDynEnum labelValue = ( ( GSESettings ) object ).getCbName(); - String label = labelValue == null ? null : labelValue.toString(); + String label = ( ( GSESettings ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_GSESettings_type" ) : getString( "_UI_GSESettings_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java index fd775604..9459fa65 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GSSEItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - GSSE gsse = ( GSSE ) object; - return getString( "_UI_GSSE_type" ) + " " + gsse.getLineNumber(); + String label = ( ( GSSE ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_GSSE_type" ) + : getString( "_UI_GSSE_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java index 4698ca28..04b8fb4a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetCBValuesItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - GetCBValues getCBValues = ( GetCBValues ) object; - return getString( "_UI_GetCBValues_type" ) + " " + getCBValues.getLineNumber(); + String label = ( ( GetCBValues ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_GetCBValues_type" ) + : getString( "_UI_GetCBValues_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java index ab5e2c1c..a1237614 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataObjectDefinitionItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - GetDataObjectDefinition getDataObjectDefinition = ( GetDataObjectDefinition ) object; - return getString( "_UI_GetDataObjectDefinition_type" ) + " " + getDataObjectDefinition.getLineNumber(); + String label = ( ( GetDataObjectDefinition ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_GetDataObjectDefinition_type" ) + : getString( "_UI_GetDataObjectDefinition_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java index c562192a..94aa9131 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDataSetValueItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - GetDataSetValue getDataSetValue = ( GetDataSetValue ) object; - return getString( "_UI_GetDataSetValue_type" ) + " " + getDataSetValue.getLineNumber(); + String label = ( ( GetDataSetValue ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_GetDataSetValue_type" ) + : getString( "_UI_GetDataSetValue_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java index 3c4a89fb..4c88ace0 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/GetDirectoryItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - GetDirectory getDirectory = ( GetDirectory ) object; - return getString( "_UI_GetDirectory_type" ) + " " + getDirectory.getLineNumber(); + String label = ( ( GetDirectory ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_GetDirectory_type" ) + : getString( "_UI_GetDirectory_type" ) + " " + label; } /** 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 681e0f3b..b3218194 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -231,7 +232,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( Header ) object ).getId(); + String label = ( ( Header ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_Header_type" ) : getString( "_UI_Header_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java index 9c7fbdb6..8b93d4c9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HistoryItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -114,8 +115,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - History history = ( History ) object; - return getString( "_UI_History_type" ) + " " + history.getLineNumber(); + String label = ( ( History ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_History_type" ) + : getString( "_UI_History_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java index bc1e5c04..8a85a123 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/HitemItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -218,8 +219,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Hitem hitem = ( Hitem ) object; - return getString( "_UI_Hitem_type" ) + " " + hitem.getLineNumber(); + String label = ( ( Hitem ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Hitem_type" ) + : getString( "_UI_Hitem_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java index 3c62f902..c26955d2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IDNamingItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -128,7 +129,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( IDNaming ) object ).getId(); + String label = ( ( IDNaming ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_IDNaming_type" ) : getString( "_UI_IDNaming_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java index 53339e0a..9875ce32 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IEDNameItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -291,8 +292,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - IEDName iedName = ( IEDName ) object; - return getString( "_UI_IEDName_type" ) + " " + iedName.getLineNumber(); + String label = ( ( IEDName ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_IEDName_type" ) + : getString( "_UI_IEDName_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java index c397d995..036f4bfa 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/InputsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -113,8 +114,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Inputs inputs = ( Inputs ) object; - return getString( "_UI_Inputs_type" ) + " " + inputs.getLineNumber(); + String label = ( ( Inputs ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Inputs_type" ) + : getString( "_UI_Inputs_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java index 73ebb7c7..acab380b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/IssuerNameItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,7 +81,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( IssuerName ) object ).getCommonName(); + String label = ( ( IssuerName ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_IssuerName_type" ) : getString( "_UI_IssuerName_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java index c3079e6b..b558cac2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/KDCItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -151,7 +152,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( KDC ) object ).getApName(); + String label = ( ( KDC ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_KDC_type" ) : getString( "_UI_KDC_type" ) + " " + label; } 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 c133c60a..9c96fec3 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -255,7 +256,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( LDevice ) object ).getLdName(); + String label = ( ( LDevice ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_LDevice_type" ) : getString( "_UI_LDevice_type" ) + " " + label; } 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 36e9a157..9e6ded77 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -115,7 +116,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( LN0 ) object ).getNamespace(); + String label = ( ( LN0 ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_LN0_type" ) : getString( "_UI_LN0_type" ) + " " + label; } 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 8379d88a..7af5f5f4 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -105,7 +106,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( LN ) object ).getNamespace(); + String label = ( ( LN ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_LN_type" ) : getString( "_UI_LN_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java index 1fe064b9..7d0e3d5d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LNodeItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -263,7 +264,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( LNode ) object ).getIedName(); + String label = ( ( LNode ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_LNode_type" ) : getString( "_UI_LNode_type" ) + " " + label; } 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 e0675b5c..51254c4e 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -230,7 +231,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( LNodeType ) object ).getId(); + String label = ( ( LNodeType ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_LNodeType_type" ) : getString( "_UI_LNodeType_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java index ce2df9c9..36595633 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/LogSettingsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -31,7 +32,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.LogSettings; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettingsNoDynEnum; /** * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.LogSettings} object. @@ -153,8 +153,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceSettingsNoDynEnum labelValue = ( ( LogSettings ) object ).getCbName(); - String label = labelValue == null ? null : labelValue.toString(); + String label = ( ( LogSettings ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_LogSettings_type" ) : getString( "_UI_LogSettings_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java index e582b3b6..bd684333 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MaxTimeItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - MaxTime maxTime = ( MaxTime ) object; - return getString( "_UI_MaxTime_type" ) + " " + maxTime.getLineNumber(); + String label = ( ( MaxTime ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_MaxTime_type" ) + : getString( "_UI_MaxTime_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java index 0428d18c..787a915a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/McSecurityItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,20 +20,19 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.McSecurity; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; - import java.util.Collection; import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ViewerNotification; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.McSecurity; +import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; + /** * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.McSecurity} object. * @@ -131,8 +130,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - McSecurity mcSecurity = ( McSecurity ) object; - return getString( "_UI_McSecurity_type" ) + " " + mcSecurity.getLineNumber(); + String label = ( ( McSecurity ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_McSecurity_type" ) + : getString( "_UI_McSecurity_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java index 84e1532a..9f80431f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/MinTimeItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - MinTime minTime = ( MinTime ) object; - return getString( "_UI_MinTime_type" ) + " " + minTime.getLineNumber(); + String label = ( ( MinTime ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_MinTime_type" ) + : getString( "_UI_MinTime_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java index 060c5fd9..8e77d8fb 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/OptFieldsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -291,8 +292,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - OptFields optFields = ( OptFields ) object; - return getString( "_UI_OptFields_type" ) + " " + optFields.getLineNumber(); + String label = ( ( OptFields ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_OptFields_type" ) + : getString( "_UI_OptFields_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java index b9e647c1..cb82e5f9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PAddrItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -128,8 +129,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - PAddr pAddr = ( PAddr ) object; - return getString( "_UI_PAddr_type" ) + " " + pAddr.getLineNumber(); + String label = ( ( PAddr ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_PAddr_type" ) + : getString( "_UI_PAddr_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java index c9fcce49..4cc4ecbf 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - P p = ( P ) object; - return getString( "_UI_P_type" ) + " " + p.getLineNumber(); + String label = ( ( P ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_P_type" ) + : getString( "_UI_P_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java index c3be363f..c9511ce6 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/P_PhysConnItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - P_PhysConn p_PhysConn = ( P_PhysConn ) object; - return getString( "_UI_P_PhysConn_type" ) + " " + p_PhysConn.getLineNumber(); + String label = ( ( P_PhysConn ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_P_PhysConn_type" ) + : getString( "_UI_P_PhysConn_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java index 8824b8e5..c447b0c3 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/PhysConnItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -138,8 +139,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - PhysConn physConn = ( PhysConn ) object; - return getString( "_UI_PhysConn_type" ) + " " + physConn.getLineNumber(); + String label = ( ( PhysConn ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_PhysConn_type" ) + : getString( "_UI_PhysConn_type" ) + " " + label; } /** 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 6e634010..df7999f9 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -153,8 +154,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Private private_ = ( Private ) object; - return getString( "_UI_Private_type" ) + " " + private_.getLineNumber(); + String label = ( ( Private ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Private_type" ) + : getString( "_UI_Private_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java index 9a6f276e..1609986c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtNsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -129,8 +130,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ProtNs protNs = ( ProtNs ) object; - return getString( "_UI_ProtNs_type" ) + " " + protNs.getLineNumber(); + String label = ( ( ProtNs ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ProtNs_type" ) + : getString( "_UI_ProtNs_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java index 93031854..5ba27063 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ProtocolItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -107,8 +108,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Protocol protocol = ( Protocol ) object; - return getString( "_UI_Protocol_type" ) + " " + protocol.getLineNumber(); + String label = ( ( Protocol ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Protocol_type" ) + : getString( "_UI_Protocol_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java index f50a1aaf..9d093ae4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReadWriteItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ReadWrite readWrite = ( ReadWrite ) object; - return getString( "_UI_ReadWrite_type" ) + " " + readWrite.getLineNumber(); + String label = ( ( ReadWrite ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ReadWrite_type" ) + : getString( "_UI_ReadWrite_type" ) + " " + label; } /** 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 cef4a5f6..74e10f05 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -153,8 +154,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - RedProt redProt = ( RedProt ) object; - return getString( "_UI_RedProt_type" ) + " " + redProt.getLineNumber(); + String label = ( ( RedProt ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_RedProt_type" ) + : getString( "_UI_RedProt_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java index 4a6b5500..1285a3a7 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ReportSettingsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -31,7 +32,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.ReportSettings; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettingsNoDynEnum; /** * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ReportSettings} object. @@ -245,8 +245,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceSettingsNoDynEnum labelValue = ( ( ReportSettings ) object ).getCbName(); - String label = labelValue == null ? null : labelValue.toString(); + String label = ( ( ReportSettings ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ReportSettings_type" ) : getString( "_UI_ReportSettings_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java index 659d2fb7..ed6c4448 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/RptEnabledItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -138,8 +139,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - RptEnabled rptEnabled = ( RptEnabled ) object; - return getString( "_UI_RptEnabled_type" ) + " " + rptEnabled.getLineNumber(); + String label = ( ( RptEnabled ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_RptEnabled_type" ) + : getString( "_UI_RptEnabled_type" ) + " " + label; } /** 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 cc39cbab..182cf2db 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -187,8 +188,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SCL scl = ( SCL ) object; - return getString( "_UI_SCL_type" ) + " " + scl.getLineNumber(); + String label = ( ( SCL ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SCL_type" ) + : getString( "_UI_SCL_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java index 13f84864..209696c4 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SGEditItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -107,8 +108,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SGEdit sgEdit = ( SGEdit ) object; - return getString( "_UI_SGEdit_type" ) + " " + sgEdit.getLineNumber(); + String label = ( ( SGEdit ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SGEdit_type" ) + : getString( "_UI_SGEdit_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java index d523b47e..4c561ac9 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,7 +80,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( SMV ) object ).getCbName(); + String label = ( ( SMV ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_SMV_type" ) : getString( "_UI_SMV_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java index 3fbc5c75..c6b69975 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVSettingsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -33,7 +34,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclFactory; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettingsNoDynEnum; /** * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SMVSettings} object. @@ -303,8 +303,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceSettingsNoDynEnum labelValue = ( ( SMVSettings ) object ).getCbName(); - String label = labelValue == null ? null : labelValue.toString(); + String label = ( ( SMVSettings ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_SMVSettings_type" ) : getString( "_UI_SMVSettings_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java index 4b70b3a8..7ff97c75 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SMVscItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -173,8 +174,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SMVsc smVsc = ( SMVsc ) object; - return getString( "_UI_SMVsc_type" ) + " " + smVsc.getLineNumber(); + String label = ( ( SMVsc ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SMVsc_type" ) + : getString( "_UI_SMVsc_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java index 63bda481..3329e7aa 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SamplesPerSecItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -108,8 +107,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SamplesPerSec samplesPerSec = ( SamplesPerSec ) object; - return getString( "_UI_SamplesPerSec_type" ) + " " + samplesPerSec.getLineNumber(); + String label = ( ( SamplesPerSec ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SamplesPerSec_type" ) + : getString( "_UI_SamplesPerSec_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java index 89199578..c4cf43ec 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SclObjectItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,9 +25,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -79,6 +77,7 @@ public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) { addLineNumberPropertyDescriptor( object ); addExplicitLinksBuiltPropertyDescriptor( object ); + addFilenamePropertyDescriptor( object ); } return itemPropertyDescriptors; } @@ -127,6 +126,28 @@ protected void addExplicitLinksBuiltPropertyDescriptor( Object object ) { null ) ); } + /** + * This adds a property descriptor for the Filename feature. + * + * + * @generated + */ + protected void addFilenamePropertyDescriptor( Object object ) { + itemPropertyDescriptors.add( + createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(), + getResourceLocator(), + getString( "_UI_SclObject_filename_feature" ), + getString( "_UI_PropertyDescriptor_description", "_UI_SclObject_filename_feature", + "_UI_SclObject_type" ), + SclPackage.eINSTANCE.getSclObject_Filename(), + true, + false, + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null ) ); + } + /** * This returns the label text for the adapted class. * @@ -135,8 +156,9 @@ protected void addExplicitLinksBuiltPropertyDescriptor( Object object ) { */ @Override public String getText( Object object ) { - SclObject sclObject = ( SclObject ) object; - return getString( "_UI_SclObject_type" ) + " " + sclObject.getLineNumber(); + String label = ( ( SclObject ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SclObject_type" ) + : getString( "_UI_SclObject_type" ) + " " + label; } /** @@ -153,6 +175,7 @@ public void notifyChanged( Notification notification ) { switch( notification.getFeatureID( SclObject.class ) ) { case SclPackage.SCL_OBJECT__LINE_NUMBER: case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT: + case SclPackage.SCL_OBJECT__FILENAME: fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) ); return; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java index 3f741bb5..bbb0b9d7 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SecPerSamplesItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -108,8 +107,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SecPerSamples secPerSamples = ( SecPerSamples ) object; - return getString( "_UI_SecPerSamples_type" ) + " " + secPerSamples.getLineNumber(); + String label = ( ( SecPerSamples ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SecPerSamples_type" ) + : getString( "_UI_SecPerSamples_type" ) + " " + label; } /** 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 57535127..dff03691 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -129,7 +130,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( ServerAt ) object ).getApName(); + String label = ( ( ServerAt ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ServerAt_type" ) : getString( "_UI_ServerAt_type" ) + " " + label; } 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 b54b2eeb..9ea3df3d 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -140,8 +141,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Server server = ( Server ) object; - return getString( "_UI_Server_type" ) + " " + server.getLineNumber(); + String label = ( ( Server ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Server_type" ) + : getString( "_UI_Server_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java index 2c57c18e..0d69c7d1 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceConfReportControlItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -154,8 +153,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceConfReportControl serviceConfReportControl = ( ServiceConfReportControl ) object; - return getString( "_UI_ServiceConfReportControl_type" ) + " " + serviceConfReportControl.getLineNumber(); + String label = ( ( ServiceConfReportControl ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceConfReportControl_type" ) + : getString( "_UI_ServiceConfReportControl_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java index 7a980acc..696a039c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceForConfDataSetItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -108,8 +107,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceForConfDataSet serviceForConfDataSet = ( ServiceForConfDataSet ) object; - return getString( "_UI_ServiceForConfDataSet_type" ) + " " + serviceForConfDataSet.getLineNumber(); + String label = ( ( ServiceForConfDataSet ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceForConfDataSet_type" ) + : getString( "_UI_ServiceForConfDataSet_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java index 1c6ddbbb..79899241 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceSettingsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -31,7 +32,6 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettings; -import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettingsNoDynEnum; /** * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceSettings} object. @@ -131,8 +131,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceSettingsNoDynEnum labelValue = ( ( ServiceSettings ) object ).getCbName(); - String label = labelValue == null ? null : labelValue.toString(); + String label = ( ( ServiceSettings ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_ServiceSettings_type" ) : getString( "_UI_ServiceSettings_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java index e19fd021..a8a54df8 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndMaxAttributesItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -109,9 +108,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceWithMaxAndMaxAttributes serviceWithMaxAndMaxAttributes = ( ServiceWithMaxAndMaxAttributes ) object; - return getString( "_UI_ServiceWithMaxAndMaxAttributes_type" ) + " " - + serviceWithMaxAndMaxAttributes.getLineNumber(); + String label = ( ( ServiceWithMaxAndMaxAttributes ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceWithMaxAndMaxAttributes_type" ) + : getString( "_UI_ServiceWithMaxAndMaxAttributes_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java index 99258f89..b1d89f94 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxAndModifyItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -108,8 +107,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceWithMaxAndModify serviceWithMaxAndModify = ( ServiceWithMaxAndModify ) object; - return getString( "_UI_ServiceWithMaxAndModify_type" ) + " " + serviceWithMaxAndModify.getLineNumber(); + String label = ( ( ServiceWithMaxAndModify ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceWithMaxAndModify_type" ) + : getString( "_UI_ServiceWithMaxAndModify_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java index d0bc03fd..12e8aee6 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -107,8 +108,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceWithMax serviceWithMax = ( ServiceWithMax ) object; - return getString( "_UI_ServiceWithMax_type" ) + " " + serviceWithMax.getLineNumber(); + String label = ( ( ServiceWithMax ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceWithMax_type" ) + : getString( "_UI_ServiceWithMax_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java index 0988a0f0..75354413 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithMaxNonZeroItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -108,8 +107,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceWithMaxNonZero serviceWithMaxNonZero = ( ServiceWithMaxNonZero ) object; - return getString( "_UI_ServiceWithMaxNonZero_type" ) + " " + serviceWithMaxNonZero.getLineNumber(); + String label = ( ( ServiceWithMaxNonZero ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceWithMaxNonZero_type" ) + : getString( "_UI_ServiceWithMaxNonZero_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java index 17f0a030..7daa7b80 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceWithOptionalMaxItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -108,8 +107,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceWithOptionalMax serviceWithOptionalMax = ( ServiceWithOptionalMax ) object; - return getString( "_UI_ServiceWithOptionalMax_type" ) + " " + serviceWithOptionalMax.getLineNumber(); + String label = ( ( ServiceWithOptionalMax ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceWithOptionalMax_type" ) + : getString( "_UI_ServiceWithOptionalMax_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java index 968e522b..32948c40 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ServiceYesNoItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -80,8 +80,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ServiceYesNo serviceYesNo = ( ServiceYesNo ) object; - return getString( "_UI_ServiceYesNo_type" ) + " " + serviceYesNo.getLineNumber(); + String label = ( ( ServiceYesNo ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ServiceYesNo_type" ) + : getString( "_UI_ServiceYesNo_type" ) + " " + label; } /** 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 1812d3c6..9fd54adb 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -171,8 +172,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Integer labelValue = ( ( Services ) object ).getNameLength(); - String label = labelValue == null ? null : labelValue.toString(); + String label = ( ( Services ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_Services_type" ) : getString( "_UI_Services_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java index b0c8a5a3..ef8cd621 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SetDataSetValueItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SetDataSetValue setDataSetValue = ( SetDataSetValue ) object; - return getString( "_UI_SetDataSetValue_type" ) + " " + setDataSetValue.getLineNumber(); + String label = ( ( SetDataSetValue ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SetDataSetValue_type" ) + : getString( "_UI_SetDataSetValue_type" ) + " " + label; } /** 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 f9ffb2fa..3bb966be 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -152,8 +153,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SettingControl settingControl = ( SettingControl ) object; - return getString( "_UI_SettingControl_type" ) + " " + settingControl.getLineNumber(); + String label = ( ( SettingControl ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SettingControl_type" ) + : getString( "_UI_SettingControl_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java index 23c968d4..a626bcfb 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SettingGroupsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; @@ -115,8 +116,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SettingGroups settingGroups = ( SettingGroups ) object; - return getString( "_UI_SettingGroups_type" ) + " " + settingGroups.getLineNumber(); + String label = ( ( SettingGroups ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SettingGroups_type" ) + : getString( "_UI_SettingGroups_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java index 96ce3974..a62f2597 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmpRateItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -108,8 +107,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SmpRate smpRate = ( SmpRate ) object; - return getString( "_UI_SmpRate_type" ) + " " + smpRate.getLineNumber(); + String label = ( ( SmpRate ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SmpRate_type" ) + : getString( "_UI_SmpRate_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java index 73782e19..db6e774a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SmvOptsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -268,8 +269,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SmvOpts smvOpts = ( SmvOpts ) object; - return getString( "_UI_SmvOpts_type" ) + " " + smvOpts.getLineNumber(); + String label = ( ( SmvOpts ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SmvOpts_type" ) + : getString( "_UI_SmvOpts_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java index 5c2cf2b0..93d1125c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SubjectItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,7 +81,7 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - String label = ( ( Subject ) object ).getCommonName(); + String label = ( ( Subject ) object ).getFilename(); return label == null || label.length() == 0 ? getString( "_UI_Subject_type" ) : getString( "_UI_Subject_type" ) + " " + label; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java index 3d0bd6fb..4b12c96c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/SupSubscriptionItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -130,8 +131,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - SupSubscription supSubscription = ( SupSubscription ) object; - return getString( "_UI_SupSubscription_type" ) + " " + supSubscription.getLineNumber(); + String label = ( ( SupSubscription ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_SupSubscription_type" ) + : getString( "_UI_SupSubscription_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java index aec46afb..ccf74a56 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TextItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -128,8 +129,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Text text = ( Text ) object; - return getString( "_UI_Text_type" ) + " " + text.getLineNumber(); + String label = ( ( Text ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Text_type" ) + : getString( "_UI_Text_type" ) + " " + label; } /** 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 a831fcb4..231db72b 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -176,8 +177,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - TimeSyncProt timeSyncProt = ( TimeSyncProt ) object; - return getString( "_UI_TimeSyncProt_type" ) + " " + timeSyncProt.getLineNumber(); + String label = ( ( TimeSyncProt ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_TimeSyncProt_type" ) + : getString( "_UI_TimeSyncProt_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java index 5b1d23d3..9f33d9ff 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TimerActivatedControlItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - TimerActivatedControl timerActivatedControl = ( TimerActivatedControl ) object; - return getString( "_UI_TimerActivatedControl_type" ) + " " + timerActivatedControl.getLineNumber(); + String label = ( ( TimerActivatedControl ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_TimerActivatedControl_type" ) + : getString( "_UI_TimerActivatedControl_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java index d2d70d79..364de283 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/TrgOpsItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -195,8 +196,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - TrgOps trgOps = ( TrgOps ) object; - return getString( "_UI_TrgOps_type" ) + " " + trgOps.getLineNumber(); + String label = ( ( TrgOps ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_TrgOps_type" ) + : getString( "_UI_TrgOps_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java index 84032b93..1328e1e3 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/UnNamingItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -96,8 +95,9 @@ protected void addDescPropertyDescriptor( Object object ) { */ @Override public String getText( Object object ) { - UnNaming unNaming = ( UnNaming ) object; - return getString( "_UI_UnNaming_type" ) + " " + unNaming.getLineNumber(); + String label = ( ( UnNaming ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_UnNaming_type" ) + : getString( "_UI_UnNaming_type" ) + " " + label; } /** 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 58e9aed3..b01d16b9 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -128,8 +129,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Val val = ( Val ) object; - return getString( "_UI_Val_type" ) + " " + val.getLineNumber(); + String label = ( ( Val ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Val_type" ) + : getString( "_UI_Val_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java index 9c7f52a4..588b5a2c 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueHandlingItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.List; + import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -107,8 +108,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ValueHandling valueHandling = ( ValueHandling ) object; - return getString( "_UI_ValueHandling_type" ) + " " + valueHandling.getLineNumber(); + String label = ( ( ValueHandling ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ValueHandling_type" ) + : getString( "_UI_ValueHandling_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java index 525dc0b6..8810bd0a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/ValueWithUnitItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -25,7 +25,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -154,8 +153,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - ValueWithUnit valueWithUnit = ( ValueWithUnit ) object; - return getString( "_UI_ValueWithUnit_type" ) + " " + valueWithUnit.getLineNumber(); + String label = ( ( ValueWithUnit ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_ValueWithUnit_type" ) + : getString( "_UI_ValueWithUnit_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java index 99da06d7..0321cd5d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/provider/VoltageItemProvider.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -81,8 +81,9 @@ public Object getImage( Object object ) { */ @Override public String getText( Object object ) { - Voltage voltage = ( Voltage ) object; - return getString( "_UI_Voltage_type" ) + " " + voltage.getLineNumber(); + String label = ( ( Voltage ) object ).getFilename(); + return label == null || label.length() == 0 ? getString( "_UI_Voltage_type" ) + : getString( "_UI_Voltage_type" ) + " " + label; } /** diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.ecore b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.ecore index d510f875..19bda1ed 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.ecore +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.ecore @@ -2091,6 +2091,9 @@ + diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel index 9aa0a52f..6e4a4c2e 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/model/SCL.genmodel @@ -1024,6 +1024,7 @@ + diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java index bac56f0d..47ccad6b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclObject.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -20,9 +20,10 @@ */ package fr.centralesupelec.edf.riseclipse.iec61850.scl; -import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; import org.eclipse.emf.ecore.EObject; +import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; + /** * * A representation of the model object 'Object'. @@ -34,6 +35,7 @@ *
    *
  • {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject#getLineNumber Line Number}
    • *
  • {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject#isExplicitLinksBuilt Explicit Links Built}
    • + *
  • {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject#getFilename Filename}
    • *
* * @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getSclObject() @@ -91,6 +93,29 @@ public interface SclObject extends EObject { */ void setExplicitLinksBuilt( boolean value ); + /** + * Returns the value of the 'Filename' attribute. + * The default value is "". + * + * + * @return the value of the 'Filename' attribute. + * @see #setFilename(String) + * @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage#getSclObject_Filename() + * @model default="" required="true" transient="true" + * @generated + */ + String getFilename(); + + /** + * Sets the value of the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject#getFilename Filename}' attribute. + * + * + * @param value the new value of the 'Filename' attribute. + * @see #getFilename() + * @generated + */ + void setFilename( String value ); + /** * * diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclPackage.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclPackage.java index abc473f8..bc1d5e99 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclPackage.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/SclPackage.java @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -104,6 +104,15 @@ public interface SclPackage extends EPackage { */ int SCL_OBJECT__EXPLICIT_LINKS_BUILT = 1; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SCL_OBJECT__FILENAME = 2; + /** * The number of structural features of the 'Object' class. * @@ -111,7 +120,7 @@ public interface SclPackage extends EPackage { * @generated * @ordered */ - int SCL_OBJECT_FEATURE_COUNT = 2; + int SCL_OBJECT_FEATURE_COUNT = 3; /** * The operation id for the 'Build Explicit Links' operation. @@ -159,6 +168,15 @@ public interface SclPackage extends EPackage { */ int ANY_CONTENT_FROM_OTHER_NAMESPACE__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ANY_CONTENT_FROM_OTHER_NAMESPACE__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Mixed' attribute list. * @@ -250,6 +268,15 @@ public interface SclPackage extends EPackage { */ int BASE_ELEMENT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int BASE_ELEMENT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -341,6 +368,15 @@ public interface SclPackage extends EPackage { */ int HEADER__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int HEADER__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Id' attribute. * @@ -468,6 +504,15 @@ public interface SclPackage extends EPackage { */ int HISTORY__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int HISTORY__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Parent Header' container reference. * @@ -541,6 +586,15 @@ public interface SclPackage extends EPackage { */ int HITEM__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int HITEM__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Revision' attribute. * @@ -659,6 +713,15 @@ public interface SclPackage extends EPackage { */ int ID_NAMING__EXPLICIT_LINKS_BUILT = BASE_ELEMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ID_NAMING__FILENAME = BASE_ELEMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -768,6 +831,15 @@ public interface SclPackage extends EPackage { */ int NAMING__EXPLICIT_LINKS_BUILT = BASE_ELEMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int NAMING__FILENAME = BASE_ELEMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -877,6 +949,15 @@ public interface SclPackage extends EPackage { */ int LNODE_CONTAINER__EXPLICIT_LINKS_BUILT = NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LNODE_CONTAINER__FILENAME = NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -995,6 +1076,15 @@ public interface SclPackage extends EPackage { */ int POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT = LNODE_CONTAINER__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int POWER_SYSTEM_RESOURCE__FILENAME = LNODE_CONTAINER__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -1113,6 +1203,15 @@ public interface SclPackage extends EPackage { */ int GENERAL_EQUIPMENT_CONTAINER__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GENERAL_EQUIPMENT_CONTAINER__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -1249,6 +1348,15 @@ public interface SclPackage extends EPackage { */ int LINE__EXPLICIT_LINKS_BUILT = GENERAL_EQUIPMENT_CONTAINER__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LINE__FILENAME = GENERAL_EQUIPMENT_CONTAINER__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -1457,6 +1565,15 @@ public interface SclPackage extends EPackage { */ int PRIVATE__EXPLICIT_LINKS_BUILT = ANY_CONTENT_FROM_OTHER_NAMESPACE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int PRIVATE__FILENAME = ANY_CONTENT_FROM_OTHER_NAMESPACE__FILENAME; + /** * The feature id for the 'Mixed' attribute list. * @@ -1584,6 +1701,15 @@ public interface SclPackage extends EPackage { */ int PROCESS__EXPLICIT_LINKS_BUILT = GENERAL_EQUIPMENT_CONTAINER__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int PROCESS__FILENAME = GENERAL_EQUIPMENT_CONTAINER__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -1783,6 +1909,15 @@ public interface SclPackage extends EPackage { */ int SCL__EXPLICIT_LINKS_BUILT = BASE_ELEMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SCL__FILENAME = BASE_ELEMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -1964,6 +2099,15 @@ public interface SclPackage extends EPackage { */ int TEXT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int TEXT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Source' attribute. * @@ -2055,6 +2199,15 @@ public interface SclPackage extends EPackage { */ int ADDRESS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ADDRESS__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Parent Connected AP' container reference. * @@ -3387,6 +3540,15 @@ public interface SclPackage extends EPackage { */ int UN_NAMING__EXPLICIT_LINKS_BUILT = BASE_ELEMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int UN_NAMING__FILENAME = BASE_ELEMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -3477,6 +3639,15 @@ public interface SclPackage extends EPackage { */ int COMMUNICATION__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int COMMUNICATION__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -3585,6 +3756,15 @@ public interface SclPackage extends EPackage { */ int CONTROL_BLOCK__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONTROL_BLOCK__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -3720,6 +3900,15 @@ public interface SclPackage extends EPackage { */ int CONNECTED_AP__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONNECTED_AP__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -3891,6 +4080,15 @@ public interface SclPackage extends EPackage { */ int GSE__EXPLICIT_LINKS_BUILT = CONTROL_BLOCK__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GSE__FILENAME = CONTROL_BLOCK__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -4053,6 +4251,15 @@ public interface SclPackage extends EPackage { */ int PADDR__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int PADDR__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Type' attribute. * @@ -4116,6 +4323,15 @@ public interface SclPackage extends EPackage { */ int P__EXPLICIT_LINKS_BUILT = PADDR__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int P__FILENAME = PADDR__FILENAME; + /** * The feature id for the 'Type' attribute. * @@ -4188,6 +4404,15 @@ public interface SclPackage extends EPackage { */ int PPHYS_CONN__EXPLICIT_LINKS_BUILT = PADDR__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int PPHYS_CONN__FILENAME = PADDR__FILENAME; + /** * The feature id for the 'Type' attribute. * @@ -4260,6 +4485,15 @@ public interface SclPackage extends EPackage { */ int PHYS_CONN__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int PHYS_CONN__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -4377,6 +4611,15 @@ public interface SclPackage extends EPackage { */ int SMV__EXPLICIT_LINKS_BUILT = CONTROL_BLOCK__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SMV__FILENAME = CONTROL_BLOCK__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -4521,6 +4764,15 @@ public interface SclPackage extends EPackage { */ int SUB_NETWORK__EXPLICIT_LINKS_BUILT = NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SUB_NETWORK__FILENAME = NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -4656,6 +4908,15 @@ public interface SclPackage extends EPackage { */ int ABSTRACT_DATA_ATTRIBUTE__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ABSTRACT_DATA_ATTRIBUTE__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -4872,6 +5133,15 @@ public interface SclPackage extends EPackage { */ int BDA__EXPLICIT_LINKS_BUILT = ABSTRACT_DATA_ATTRIBUTE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int BDA__FILENAME = ABSTRACT_DATA_ATTRIBUTE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -5097,6 +5367,15 @@ public interface SclPackage extends EPackage { */ int DA__EXPLICIT_LINKS_BUILT = ABSTRACT_DATA_ATTRIBUTE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DA__FILENAME = ABSTRACT_DATA_ATTRIBUTE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -5367,6 +5646,15 @@ public interface SclPackage extends EPackage { */ int DA_TYPE__EXPLICIT_LINKS_BUILT = ID_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DA_TYPE__FILENAME = ID_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -5521,6 +5809,15 @@ public interface SclPackage extends EPackage { */ int ABSTRACT_DATA_OBJECT__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ABSTRACT_DATA_OBJECT__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -5647,6 +5944,15 @@ public interface SclPackage extends EPackage { */ int DO__EXPLICIT_LINKS_BUILT = ABSTRACT_DATA_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DO__FILENAME = ABSTRACT_DATA_OBJECT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -5818,6 +6124,15 @@ public interface SclPackage extends EPackage { */ int DO_TYPE__EXPLICIT_LINKS_BUILT = ID_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DO_TYPE__FILENAME = ID_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -5980,6 +6295,15 @@ public interface SclPackage extends EPackage { */ int DATA_TYPE_TEMPLATES__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DATA_TYPE_TEMPLATES__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'DA Type' containment reference list. * @@ -6071,16 +6395,25 @@ public interface SclPackage extends EPackage { int ENUM_TYPE__EXPLICIT_LINKS_BUILT = ID_NAMING__EXPLICIT_LINKS_BUILT; /** - * The feature id for the 'Private' containment reference list. + * The feature id for the 'Filename' attribute. * * * @generated * @ordered */ - int ENUM_TYPE__PRIVATE = ID_NAMING__PRIVATE; + int ENUM_TYPE__FILENAME = ID_NAMING__FILENAME; /** - * The feature id for the 'Text' containment reference. + * The feature id for the 'Private' containment reference list. + * + * + * @generated + * @ordered + */ + int ENUM_TYPE__PRIVATE = ID_NAMING__PRIVATE; + + /** + * The feature id for the 'Text' containment reference. * * * @generated @@ -6196,6 +6529,15 @@ public interface SclPackage extends EPackage { */ int ENUM_VAL__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ENUM_VAL__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Desc' attribute. * @@ -6277,6 +6619,15 @@ public interface SclPackage extends EPackage { */ int LNODE_TYPE__EXPLICIT_LINKS_BUILT = ID_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LNODE_TYPE__FILENAME = ID_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -6439,6 +6790,15 @@ public interface SclPackage extends EPackage { */ int PROT_NS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int PROT_NS__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Type' attribute. * @@ -6520,6 +6880,15 @@ public interface SclPackage extends EPackage { */ int SDO__EXPLICIT_LINKS_BUILT = ABSTRACT_DATA_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SDO__FILENAME = ABSTRACT_DATA_OBJECT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -6682,6 +7051,15 @@ public interface SclPackage extends EPackage { */ int VAL__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int VAL__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'SGroup' attribute. * @@ -6783,6 +7161,15 @@ public interface SclPackage extends EPackage { */ int ACCESS_CONTROL__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ACCESS_CONTROL__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Parent LDevice' container reference. * @@ -6837,6 +7224,15 @@ public interface SclPackage extends EPackage { */ int ACCESS_POINT__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ACCESS_POINT__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -7053,6 +7449,15 @@ public interface SclPackage extends EPackage { */ int ANY_LN__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ANY_LN__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -7296,6 +7701,15 @@ public interface SclPackage extends EPackage { */ int ASSOCIATION__EXPLICIT_LINKS_BUILT = BASE_ELEMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ASSOCIATION__FILENAME = BASE_ELEMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -7467,6 +7881,15 @@ public interface SclPackage extends EPackage { */ int AUTHENTICATION__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int AUTHENTICATION__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Certificate' attribute. * @@ -7566,6 +7989,15 @@ public interface SclPackage extends EPackage { */ int CERTIFICATE__EXPLICIT_LINKS_BUILT = NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CERTIFICATE__FILENAME = NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -7701,6 +8133,15 @@ public interface SclPackage extends EPackage { */ int CLIENT_LN__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CLIENT_LN__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Desc' attribute. * @@ -7827,6 +8268,15 @@ public interface SclPackage extends EPackage { */ int CLIENT_SERVICES__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CLIENT_SERVICES__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Buf Report' attribute. * @@ -8025,6 +8475,15 @@ public interface SclPackage extends EPackage { */ int COMM_PROT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int COMM_PROT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Ipv6' attribute. * @@ -8088,6 +8547,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_WITH_MAX__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_WITH_MAX__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8152,6 +8620,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__FILENAME = SERVICE_WITH_MAX__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8225,6 +8702,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_FOR_CONF_DATA_SET__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_FOR_CONF_DATA_SET__FILENAME = SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8297,6 +8783,15 @@ public interface SclPackage extends EPackage { */ int CONF_DATA_SET__EXPLICIT_LINKS_BUILT = SERVICE_FOR_CONF_DATA_SET__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONF_DATA_SET__FILENAME = SERVICE_FOR_CONF_DATA_SET__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8378,6 +8873,15 @@ public interface SclPackage extends EPackage { */ int CONF_LNS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONF_LNS__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Fix Ln Inst' attribute. * @@ -8460,6 +8964,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_YES_NO__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_YES_NO__FILENAME = SCL_OBJECT__FILENAME; + /** * The number of structural features of the 'Service Yes No' class. * @@ -8505,6 +9018,15 @@ public interface SclPackage extends EPackage { */ int CONF_LD_NAME__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONF_LD_NAME__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -8569,6 +9091,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_WITH_MAX_NON_ZERO__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_WITH_MAX_NON_ZERO__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8623,6 +9154,15 @@ public interface SclPackage extends EPackage { */ int CONF_LOG_CONTROL__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX_NON_ZERO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONF_LOG_CONTROL__FILENAME = SERVICE_WITH_MAX_NON_ZERO__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8696,6 +9236,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_CONF_REPORT_CONTROL__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_CONF_REPORT_CONTROL__FILENAME = SERVICE_WITH_MAX__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8777,6 +9326,15 @@ public interface SclPackage extends EPackage { */ int CONF_REPORT_CONTROL__EXPLICIT_LINKS_BUILT = SERVICE_CONF_REPORT_CONTROL__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONF_REPORT_CONTROL__FILENAME = SERVICE_CONF_REPORT_CONTROL__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8867,6 +9425,15 @@ public interface SclPackage extends EPackage { */ int CONF_SG__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONF_SG__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Resv Tms' attribute. * @@ -8930,6 +9497,15 @@ public interface SclPackage extends EPackage { */ int CONF_SIG_REF__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX_NON_ZERO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONF_SIG_REF__FILENAME = SERVICE_WITH_MAX_NON_ZERO__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -8993,6 +9569,15 @@ public interface SclPackage extends EPackage { */ int CONTROL__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONTROL__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -9128,6 +9713,15 @@ public interface SclPackage extends EPackage { */ int CONTROL_WITH_IED_NAME__EXPLICIT_LINKS_BUILT = CONTROL__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONTROL_WITH_IED_NAME__FILENAME = CONTROL__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -9299,6 +9893,15 @@ public interface SclPackage extends EPackage { */ int CONTROL_WITH_TRIGGER_OPT__EXPLICIT_LINKS_BUILT = CONTROL__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONTROL_WITH_TRIGGER_OPT__FILENAME = CONTROL__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -9452,6 +10055,15 @@ public interface SclPackage extends EPackage { */ int DAI__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DAI__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -9623,6 +10235,15 @@ public interface SclPackage extends EPackage { */ int DOI__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DOI__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -9785,6 +10406,15 @@ public interface SclPackage extends EPackage { */ int DATA_OBJECT_DIRECTORY__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DATA_OBJECT_DIRECTORY__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -9839,6 +10469,15 @@ public interface SclPackage extends EPackage { */ int DATA_SET__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DATA_SET__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -9965,6 +10604,15 @@ public interface SclPackage extends EPackage { */ int DATA_SET_DIRECTORY__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DATA_SET_DIRECTORY__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -10029,6 +10677,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_WITH_OPTIONAL_MAX__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_WITH_OPTIONAL_MAX__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -10083,6 +10740,15 @@ public interface SclPackage extends EPackage { */ int DYN_ASSOCIATION__EXPLICIT_LINKS_BUILT = SERVICE_WITH_OPTIONAL_MAX__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DYN_ASSOCIATION__FILENAME = SERVICE_WITH_OPTIONAL_MAX__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -10146,6 +10812,15 @@ public interface SclPackage extends EPackage { */ int DYN_DATA_SET__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DYN_DATA_SET__FILENAME = SERVICE_WITH_MAX_AND_MAX_ATTRIBUTES__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -10218,6 +10893,15 @@ public interface SclPackage extends EPackage { */ int EXT_REF__EXPLICIT_LINKS_BUILT = BASE_ELEMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int EXT_REF__FILENAME = BASE_ELEMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -10506,6 +11190,15 @@ public interface SclPackage extends EPackage { */ int FCDA__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int FCDA__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Da Name' attribute. * @@ -10641,6 +11334,15 @@ public interface SclPackage extends EPackage { */ int FILE_HANDLING__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int FILE_HANDLING__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Ftp' attribute. * @@ -10722,6 +11424,15 @@ public interface SclPackage extends EPackage { */ int GOOSE__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GOOSE__FILENAME = SERVICE_WITH_MAX__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -10812,6 +11523,15 @@ public interface SclPackage extends EPackage { */ int GOOSE_SECURITY__EXPLICIT_LINKS_BUILT = CERTIFICATE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GOOSE_SECURITY__FILENAME = CERTIFICATE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -10956,6 +11676,15 @@ public interface SclPackage extends EPackage { */ int GSE_CONTROL__EXPLICIT_LINKS_BUILT = CONTROL_WITH_IED_NAME__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GSE_CONTROL__FILENAME = CONTROL_WITH_IED_NAME__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -11172,6 +11901,15 @@ public interface SclPackage extends EPackage { */ int GSE_DIR__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GSE_DIR__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -11226,6 +11964,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_SETTINGS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_SETTINGS__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Cb Name' attribute. * @@ -11289,6 +12036,15 @@ public interface SclPackage extends EPackage { */ int GSE_SETTINGS__EXPLICIT_LINKS_BUILT = SERVICE_SETTINGS__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GSE_SETTINGS__FILENAME = SERVICE_SETTINGS__FILENAME; + /** * The feature id for the 'Cb Name' attribute. * @@ -11397,6 +12153,15 @@ public interface SclPackage extends EPackage { */ int GSSE__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GSSE__FILENAME = SERVICE_WITH_MAX__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -11460,6 +12225,15 @@ public interface SclPackage extends EPackage { */ int GET_CB_VALUES__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GET_CB_VALUES__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -11514,6 +12288,15 @@ public interface SclPackage extends EPackage { */ int GET_DATA_OBJECT_DEFINITION__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GET_DATA_OBJECT_DEFINITION__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -11568,6 +12351,15 @@ public interface SclPackage extends EPackage { */ int GET_DATA_SET_VALUE__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GET_DATA_SET_VALUE__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -11622,6 +12414,15 @@ public interface SclPackage extends EPackage { */ int GET_DIRECTORY__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GET_DIRECTORY__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -11668,13 +12469,22 @@ public interface SclPackage extends EPackage { int IED__LINE_NUMBER = UN_NAMING__LINE_NUMBER; /** - * The feature id for the 'Explicit Links Built' attribute. + * The feature id for the 'Explicit Links Built' attribute. + * + * + * @generated + * @ordered + */ + int IED__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + + /** + * The feature id for the 'Filename' attribute. * * * @generated * @ordered */ - int IED__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + int IED__FILENAME = UN_NAMING__FILENAME; /** * The feature id for the 'Private' containment reference list. @@ -11892,6 +12702,15 @@ public interface SclPackage extends EPackage { */ int IED_NAME__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int IED_NAME__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Ap Ref' attribute. * @@ -12027,6 +12846,15 @@ public interface SclPackage extends EPackage { */ int INPUTS__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int INPUTS__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -12145,6 +12973,15 @@ public interface SclPackage extends EPackage { */ int CERT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CERT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Common Name' attribute. * @@ -12208,6 +13045,15 @@ public interface SclPackage extends EPackage { */ int ISSUER_NAME__EXPLICIT_LINKS_BUILT = CERT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ISSUER_NAME__FILENAME = CERT__FILENAME; + /** * The feature id for the 'Common Name' attribute. * @@ -12280,6 +13126,15 @@ public interface SclPackage extends EPackage { */ int KDC__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int KDC__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Ap Name' attribute. * @@ -12361,6 +13216,15 @@ public interface SclPackage extends EPackage { */ int LDEVICE__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LDEVICE__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -12541,6 +13405,15 @@ public interface SclPackage extends EPackage { */ int LN__EXPLICIT_LINKS_BUILT = ANY_LN__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LN__FILENAME = ANY_LN__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -12811,6 +13684,15 @@ public interface SclPackage extends EPackage { */ int LN0__EXPLICIT_LINKS_BUILT = ANY_LN__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LN0__FILENAME = ANY_LN__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -13090,6 +13972,15 @@ public interface SclPackage extends EPackage { */ int LOG__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LOG__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -13207,6 +14098,15 @@ public interface SclPackage extends EPackage { */ int LOG_CONTROL__EXPLICIT_LINKS_BUILT = CONTROL_WITH_TRIGGER_OPT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LOG_CONTROL__FILENAME = CONTROL_WITH_TRIGGER_OPT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -13459,6 +14359,15 @@ public interface SclPackage extends EPackage { */ int LOG_SETTINGS__EXPLICIT_LINKS_BUILT = SERVICE_SETTINGS__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LOG_SETTINGS__FILENAME = SERVICE_SETTINGS__FILENAME; + /** * The feature id for the 'Cb Name' attribute. * @@ -13558,6 +14467,15 @@ public interface SclPackage extends EPackage { */ int OPT_FIELDS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int OPT_FIELDS__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Buf Ovfl' attribute. * @@ -13693,6 +14611,15 @@ public interface SclPackage extends EPackage { */ int PROTOCOL__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int PROTOCOL__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Must Understand' attribute. * @@ -13756,6 +14683,15 @@ public interface SclPackage extends EPackage { */ int READ_WRITE__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int READ_WRITE__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -13810,6 +14746,15 @@ public interface SclPackage extends EPackage { */ int RED_PROT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int RED_PROT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Hsr' attribute. * @@ -13891,6 +14836,15 @@ public interface SclPackage extends EPackage { */ int REPORT_CONTROL__EXPLICIT_LINKS_BUILT = CONTROL_WITH_TRIGGER_OPT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int REPORT_CONTROL__FILENAME = CONTROL_WITH_TRIGGER_OPT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -14116,6 +15070,15 @@ public interface SclPackage extends EPackage { */ int REPORT_SETTINGS__EXPLICIT_LINKS_BUILT = SERVICE_SETTINGS__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int REPORT_SETTINGS__FILENAME = SERVICE_SETTINGS__FILENAME; + /** * The feature id for the 'Cb Name' attribute. * @@ -14251,6 +15214,15 @@ public interface SclPackage extends EPackage { */ int RPT_ENABLED__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int RPT_ENABLED__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -14368,6 +15340,15 @@ public interface SclPackage extends EPackage { */ int SDI__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SDI__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -14548,6 +15529,15 @@ public interface SclPackage extends EPackage { */ int SG_EDIT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SG_EDIT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Resv Tms' attribute. * @@ -14611,6 +15601,15 @@ public interface SclPackage extends EPackage { */ int SMV_SECURITY__EXPLICIT_LINKS_BUILT = CERTIFICATE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SMV_SECURITY__FILENAME = CERTIFICATE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -14755,6 +15754,15 @@ public interface SclPackage extends EPackage { */ int SMV_SETTINGS__EXPLICIT_LINKS_BUILT = SERVICE_SETTINGS__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SMV_SETTINGS__FILENAME = SERVICE_SETTINGS__FILENAME; + /** * The feature id for the 'Cb Name' attribute. * @@ -14935,6 +15943,15 @@ public interface SclPackage extends EPackage { */ int SM_VSC__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SM_VSC__FILENAME = SERVICE_WITH_MAX__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -15034,6 +16051,15 @@ public interface SclPackage extends EPackage { */ int SAMPLED_VALUE_CONTROL__EXPLICIT_LINKS_BUILT = CONTROL_WITH_IED_NAME__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SAMPLED_VALUE_CONTROL__FILENAME = CONTROL_WITH_IED_NAME__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -15277,6 +16303,15 @@ public interface SclPackage extends EPackage { */ int SERVER__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVER__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -15412,6 +16447,15 @@ public interface SclPackage extends EPackage { */ int SERVER_AT__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVER_AT__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -15529,6 +16573,15 @@ public interface SclPackage extends EPackage { */ int SERVICES__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICES__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Name Length' attribute. * @@ -15898,6 +16951,15 @@ public interface SclPackage extends EPackage { */ int SET_DATA_SET_VALUE__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SET_DATA_SET_VALUE__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -15952,6 +17014,15 @@ public interface SclPackage extends EPackage { */ int SETTING_CONTROL__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SETTING_CONTROL__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -16078,6 +17149,15 @@ public interface SclPackage extends EPackage { */ int SETTING_GROUPS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SETTING_GROUPS__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Conf SG' containment reference. * @@ -16150,6 +17230,15 @@ public interface SclPackage extends EPackage { */ int SMV_OPTS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SMV_OPTS__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Data Set' attribute. * @@ -16276,6 +17365,15 @@ public interface SclPackage extends EPackage { */ int SUBJECT__EXPLICIT_LINKS_BUILT = CERT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SUBJECT__FILENAME = CERT__FILENAME; + /** * The feature id for the 'Common Name' attribute. * @@ -16348,6 +17446,15 @@ public interface SclPackage extends EPackage { */ int SUP_SUBSCRIPTION__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SUP_SUBSCRIPTION__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Max Go' attribute. * @@ -16420,6 +17527,15 @@ public interface SclPackage extends EPackage { */ int TIME_SYNC_PROT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int TIME_SYNC_PROT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'C37 238' attribute. * @@ -16519,6 +17635,15 @@ public interface SclPackage extends EPackage { */ int TIMER_ACTIVATED_CONTROL__EXPLICIT_LINKS_BUILT = SERVICE_YES_NO__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int TIMER_ACTIVATED_CONTROL__FILENAME = SERVICE_YES_NO__FILENAME; + /** * The feature id for the 'Parent Services' container reference. * @@ -16562,16 +17687,25 @@ public interface SclPackage extends EPackage { * @generated * @ordered */ - int TRG_OPS__LINE_NUMBER = SCL_OBJECT__LINE_NUMBER; + int TRG_OPS__LINE_NUMBER = SCL_OBJECT__LINE_NUMBER; + + /** + * The feature id for the 'Explicit Links Built' attribute. + * + * + * @generated + * @ordered + */ + int TRG_OPS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; /** - * The feature id for the 'Explicit Links Built' attribute. + * The feature id for the 'Filename' attribute. * * * @generated * @ordered */ - int TRG_OPS__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + int TRG_OPS__FILENAME = SCL_OBJECT__FILENAME; /** * The feature id for the 'Dchg' attribute. @@ -16672,6 +17806,15 @@ public interface SclPackage extends EPackage { */ int VALUE_HANDLING__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int VALUE_HANDLING__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Set To RO' attribute. * @@ -16735,6 +17878,15 @@ public interface SclPackage extends EPackage { */ int EQUIPMENT__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int EQUIPMENT__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -16852,6 +18004,15 @@ public interface SclPackage extends EPackage { */ int ABSTRACT_CONDUCTING_EQUIPMENT__EXPLICIT_LINKS_BUILT = EQUIPMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ABSTRACT_CONDUCTING_EQUIPMENT__FILENAME = EQUIPMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -16987,6 +18148,15 @@ public interface SclPackage extends EPackage { */ int ABSTRACT_EQ_FUNC_SUB_FUNC__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int ABSTRACT_EQ_FUNC_SUB_FUNC__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -17122,6 +18292,15 @@ public interface SclPackage extends EPackage { */ int EQUIPMENT_CONTAINER__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int EQUIPMENT_CONTAINER__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -17248,6 +18427,15 @@ public interface SclPackage extends EPackage { */ int BAY__EXPLICIT_LINKS_BUILT = EQUIPMENT_CONTAINER__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int BAY__FILENAME = EQUIPMENT_CONTAINER__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -17410,6 +18598,15 @@ public interface SclPackage extends EPackage { */ int CONDUCTING_EQUIPMENT__EXPLICIT_LINKS_BUILT = ABSTRACT_CONDUCTING_EQUIPMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONDUCTING_EQUIPMENT__FILENAME = ABSTRACT_CONDUCTING_EQUIPMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -17608,6 +18805,15 @@ public interface SclPackage extends EPackage { */ int CONNECTIVITY_NODE__EXPLICIT_LINKS_BUILT = LNODE_CONTAINER__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int CONNECTIVITY_NODE__FILENAME = LNODE_CONTAINER__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -17752,6 +18958,15 @@ public interface SclPackage extends EPackage { */ int EQ_FUNCTION__EXPLICIT_LINKS_BUILT = ABSTRACT_EQ_FUNC_SUB_FUNC__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int EQ_FUNCTION__FILENAME = ABSTRACT_EQ_FUNC_SUB_FUNC__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -17941,6 +19156,15 @@ public interface SclPackage extends EPackage { */ int EQ_SUB_FUNCTION__EXPLICIT_LINKS_BUILT = ABSTRACT_EQ_FUNC_SUB_FUNC__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int EQ_SUB_FUNCTION__FILENAME = ABSTRACT_EQ_FUNC_SUB_FUNC__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -18085,6 +19309,15 @@ public interface SclPackage extends EPackage { */ int FUNCTION__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int FUNCTION__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -18265,6 +19498,15 @@ public interface SclPackage extends EPackage { */ int GENERAL_EQUIPMENT__EXPLICIT_LINKS_BUILT = EQUIPMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int GENERAL_EQUIPMENT__FILENAME = EQUIPMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -18445,6 +19687,15 @@ public interface SclPackage extends EPackage { */ int LNODE__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int LNODE__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -18616,6 +19867,15 @@ public interface SclPackage extends EPackage { */ int TERMINAL__EXPLICIT_LINKS_BUILT = UN_NAMING__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int TERMINAL__FILENAME = UN_NAMING__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -18796,6 +20056,15 @@ public interface SclPackage extends EPackage { */ int NEUTRAL_POINT__EXPLICIT_LINKS_BUILT = TERMINAL__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int NEUTRAL_POINT__FILENAME = TERMINAL__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -18985,6 +20254,15 @@ public interface SclPackage extends EPackage { */ int POWER_TRANSFORMER__EXPLICIT_LINKS_BUILT = EQUIPMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int POWER_TRANSFORMER__FILENAME = EQUIPMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -19147,6 +20425,15 @@ public interface SclPackage extends EPackage { */ int SUB_EQUIPMENT__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SUB_EQUIPMENT__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -19309,6 +20596,15 @@ public interface SclPackage extends EPackage { */ int SUB_FUNCTION__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SUB_FUNCTION__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -19471,6 +20767,15 @@ public interface SclPackage extends EPackage { */ int SUBSTATION__EXPLICIT_LINKS_BUILT = EQUIPMENT_CONTAINER__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SUBSTATION__FILENAME = EQUIPMENT_CONTAINER__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -19633,6 +20938,15 @@ public interface SclPackage extends EPackage { */ int TAP_CHANGER__EXPLICIT_LINKS_BUILT = POWER_SYSTEM_RESOURCE__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int TAP_CHANGER__FILENAME = POWER_SYSTEM_RESOURCE__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -19786,6 +21100,15 @@ public interface SclPackage extends EPackage { */ int TRANSFORMER_WINDING__EXPLICIT_LINKS_BUILT = ABSTRACT_CONDUCTING_EQUIPMENT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int TRANSFORMER_WINDING__FILENAME = ABSTRACT_CONDUCTING_EQUIPMENT__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -19976,6 +21299,15 @@ public interface SclPackage extends EPackage { */ int VALUE_WITH_UNIT__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int VALUE_WITH_UNIT__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20048,6 +21380,15 @@ public interface SclPackage extends EPackage { */ int VOLTAGE__EXPLICIT_LINKS_BUILT = VALUE_WITH_UNIT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int VOLTAGE__FILENAME = VALUE_WITH_UNIT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20138,6 +21479,15 @@ public interface SclPackage extends EPackage { */ int VOLTAGE_LEVEL__EXPLICIT_LINKS_BUILT = EQUIPMENT_CONTAINER__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int VOLTAGE_LEVEL__FILENAME = EQUIPMENT_CONTAINER__FILENAME; + /** * The feature id for the 'Private' containment reference list. * @@ -20328,6 +21678,15 @@ public interface SclPackage extends EPackage { */ int SERVICE_WITH_MAX_AND_MODIFY__EXPLICIT_LINKS_BUILT = SERVICE_WITH_MAX__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SERVICE_WITH_MAX_AND_MODIFY__FILENAME = SERVICE_WITH_MAX__FILENAME; + /** * The feature id for the 'Max' attribute. * @@ -20401,6 +21760,15 @@ public interface SclPackage extends EPackage { */ int DURATION_IN_SEC__EXPLICIT_LINKS_BUILT = VALUE_WITH_UNIT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DURATION_IN_SEC__FILENAME = VALUE_WITH_UNIT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20473,6 +21841,15 @@ public interface SclPackage extends EPackage { */ int DURATION_IN_MILLI_SEC__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int DURATION_IN_MILLI_SEC__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20545,6 +21922,15 @@ public interface SclPackage extends EPackage { */ int BIT_RATE_IN_MB_PER_SEC__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int BIT_RATE_IN_MB_PER_SEC__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20617,6 +22003,15 @@ public interface SclPackage extends EPackage { */ int MIN_TIME__EXPLICIT_LINKS_BUILT = DURATION_IN_MILLI_SEC__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int MIN_TIME__FILENAME = DURATION_IN_MILLI_SEC__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20689,6 +22084,15 @@ public interface SclPackage extends EPackage { */ int MAX_TIME__EXPLICIT_LINKS_BUILT = DURATION_IN_MILLI_SEC__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int MAX_TIME__FILENAME = DURATION_IN_MILLI_SEC__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20771,6 +22175,15 @@ public interface SclPackage extends EPackage { */ int BIT_RATE__EXPLICIT_LINKS_BUILT = BIT_RATE_IN_MB_PER_SEC__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int BIT_RATE__FILENAME = BIT_RATE_IN_MB_PER_SEC__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20862,6 +22275,15 @@ public interface SclPackage extends EPackage { */ int SMP_RATE__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SMP_RATE__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -20935,6 +22357,15 @@ public interface SclPackage extends EPackage { */ int SAMPLES_PER_SEC__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SAMPLES_PER_SEC__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -21008,6 +22439,15 @@ public interface SclPackage extends EPackage { */ int SEC_PER_SAMPLES__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int SEC_PER_SAMPLES__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Value' attribute. * @@ -21081,6 +22521,15 @@ public interface SclPackage extends EPackage { */ int MC_SECURITY__EXPLICIT_LINKS_BUILT = SCL_OBJECT__EXPLICIT_LINKS_BUILT; + /** + * The feature id for the 'Filename' attribute. + * + * + * @generated + * @ordered + */ + int MC_SECURITY__FILENAME = SCL_OBJECT__FILENAME; + /** * The feature id for the 'Parent Client Services' container reference. * @@ -31029,6 +32478,17 @@ public interface SclPackage extends EPackage { */ EAttribute getSclObject_ExplicitLinksBuilt(); + /** + * Returns the meta object for the attribute '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject#getFilename Filename}'. + * + * + * @return the meta object for the attribute 'Filename'. + * @see fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject#getFilename() + * @see #getSclObject() + * @generated + */ + EAttribute getSclObject_Filename(); + /** * Returns the meta object for the '{@link fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject#buildExplicitLinks(fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole, java.lang.Boolean) Build Explicit Links}' operation. * 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 b3a2484a..f055c760 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 @@ -741,7 +741,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { return; } - List< ControlWithIEDName > l2 = new ArrayList< >(); + List< ControlWithIEDName > l2 = new ArrayList<>(); l2.addAll( lDevice.getLeft().getLN0().getGSEControl() ); l2.addAll( lDevice.getLeft().getLN0().getSampledValueControl() ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java index 20990886..23fbe0a2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java @@ -2874,7 +2874,7 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), messagePrefix, "found", mess, " on line ", anyLN.getLeft().getLineNumber() ); - List< Control > listControls = new ArrayList< >(); + List< Control > listControls = new ArrayList<>(); listControls.addAll( anyLN.getLeft().getLogControl() ); listControls.addAll( anyLN.getLeft().getReportControl() ); if( "LLN0".equals( cbLNClass ) ) { diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java index c2cd90a9..6c16006b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java @@ -45,6 +45,7 @@ *
    *
  • {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.SclObjectImpl#getLineNumber Line Number}
    • *
  • {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.SclObjectImpl#isExplicitLinksBuilt Explicit Links Built}
    • + *
  • {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.impl.SclObjectImpl#getFilename Filename}
    • *
* * @generated @@ -93,6 +94,26 @@ public abstract class SclObjectImpl extends MinimalEObjectImpl.Container impleme */ protected boolean explicitLinksBuilt = EXPLICIT_LINKS_BUILT_EDEFAULT; + /** + * The default value of the '{@link #getFilename() Filename}' attribute. + * + * + * @see #getFilename() + * @generated + * @ordered + */ + protected static final String FILENAME_EDEFAULT = ""; + + /** + * The cached value of the '{@link #getFilename() Filename}' attribute. + * + * + * @see #getFilename() + * @generated + * @ordered + */ + protected String filename = FILENAME_EDEFAULT; + /** * * @@ -160,6 +181,30 @@ public void setExplicitLinksBuilt( boolean newExplicitLinksBuilt ) { oldExplicitLinksBuilt, explicitLinksBuilt ) ); } + /** + * + * + * @generated + */ + @Override + public String getFilename() { + return filename; + } + + /** + * + * + * @generated + */ + @Override + public void setFilename( String newFilename ) { + String oldFilename = filename; + filename = newFilename; + if( eNotificationRequired() ) + eNotify( new ENotificationImpl( this, Notification.SET, SclPackage.SCL_OBJECT__FILENAME, oldFilename, + filename ) ); + } + /** * * @@ -207,6 +252,8 @@ public Object eGet( int featureID, boolean resolve, boolean coreType ) { return getLineNumber(); case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT: return isExplicitLinksBuilt(); + case SclPackage.SCL_OBJECT__FILENAME: + return getFilename(); } return super.eGet( featureID, resolve, coreType ); } @@ -225,6 +272,9 @@ public void eSet( int featureID, Object newValue ) { case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT: setExplicitLinksBuilt( ( Boolean ) newValue ); return; + case SclPackage.SCL_OBJECT__FILENAME: + setFilename( ( String ) newValue ); + return; } super.eSet( featureID, newValue ); } @@ -243,6 +293,9 @@ public void eUnset( int featureID ) { case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT: setExplicitLinksBuilt( EXPLICIT_LINKS_BUILT_EDEFAULT ); return; + case SclPackage.SCL_OBJECT__FILENAME: + setFilename( FILENAME_EDEFAULT ); + return; } super.eUnset( featureID ); } @@ -259,6 +312,8 @@ public boolean eIsSet( int featureID ) { return lineNumber != LINE_NUMBER_EDEFAULT; case SclPackage.SCL_OBJECT__EXPLICIT_LINKS_BUILT: return explicitLinksBuilt != EXPLICIT_LINKS_BUILT_EDEFAULT; + case SclPackage.SCL_OBJECT__FILENAME: + return FILENAME_EDEFAULT == null ? filename != null : !FILENAME_EDEFAULT.equals( filename ); } return super.eIsSet( featureID ); } @@ -291,6 +346,8 @@ public String toString() { result.append( lineNumber ); result.append( ", explicitLinksBuilt: " ); result.append( explicitLinksBuilt ); + result.append( ", filename: " ); + result.append( filename ); 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 5d2a7388..98c578a4 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 @@ -5,9 +5,9 @@ ** are made available under the terms of the Eclipse Public License v2.0 ** which accompanies this distribution, and is available at ** https://www.eclipse.org/legal/epl-v20.html -** +** ** This file is part of the RiseClipse tool -** +** ** Contributors: ** Computer Science Department, CentraleSupélec ** EDF R&D @@ -22,6 +22,7 @@ import java.io.IOException; import java.net.URL; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.WrappedException; import org.eclipse.emf.ecore.EAttribute; @@ -10491,6 +10492,16 @@ public EAttribute getSclObject_ExplicitLinksBuilt() { return ( EAttribute ) getSclObject().getEStructuralFeatures().get( 1 ); } + /** + * + * + * @generated + */ + @Override + public EAttribute getSclObject_Filename() { + return ( EAttribute ) getSclObject().getEStructuralFeatures().get( 2 ); + } + /** * * diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/scl.ecore b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/scl.ecore index d510f875..19bda1ed 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/scl.ecore +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/scl.ecore @@ -2091,6 +2091,9 @@ + From fe38f801789de6ed76a89679e150259e22570b80 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Fri, 15 Apr 2022 14:56:00 +0200 Subject: [PATCH 3/5] set filename and use it in doExplicitLinks() messages --- .../scl/impl/AbstractDataAttributeImpl.java | 14 ++-- .../iec61850/scl/impl/AnyLNImpl.java | 16 ++--- .../iec61850/scl/impl/AssociationImpl.java | 22 +++---- .../iec61850/scl/impl/ClientLNImpl.java | 30 ++++----- .../iec61850/scl/impl/ConnectedAPImpl.java | 14 ++-- .../iec61850/scl/impl/ControlBlockImpl.java | 18 +++--- .../iec61850/scl/impl/ControlImpl.java | 10 +-- .../riseclipse/iec61850/scl/impl/DAIImpl.java | 28 ++++---- .../riseclipse/iec61850/scl/impl/DOIImpl.java | 10 +-- .../riseclipse/iec61850/scl/impl/DOImpl.java | 8 +-- .../iec61850/scl/impl/ExtRefImpl.java | 64 +++++++++---------- .../iec61850/scl/impl/FCDAImpl.java | 56 ++++++++-------- .../iec61850/scl/impl/IEDNameImpl.java | 28 ++++---- .../riseclipse/iec61850/scl/impl/KDCImpl.java | 14 ++-- .../iec61850/scl/impl/LDeviceImpl.java | 24 +++---- .../iec61850/scl/impl/LNodeImpl.java | 28 ++++---- .../iec61850/scl/impl/LogControlImpl.java | 12 ++-- .../riseclipse/iec61850/scl/impl/SDIImpl.java | 42 ++++++------ .../riseclipse/iec61850/scl/impl/SDOImpl.java | 10 +-- .../iec61850/scl/impl/SclObjectImpl.java | 4 +- .../iec61850/scl/impl/ServerAtImpl.java | 8 +-- .../iec61850/scl/impl/TerminalImpl.java | 34 +++++----- .../iec61850/scl/util/SCLXMLHandler.java | 14 ++-- 23 files changed, 255 insertions(+), 253 deletions(-) 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 d3101871..1b7f9980 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 @@ -1463,7 +1463,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "AbstractDataAttributeImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AbstractDataAttributeImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1485,14 +1485,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from AbstractDataAttribute: "; if( ( getType() == null ) || getType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "type is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1508,13 +1508,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " EnumType( id = ", getType(), " )" ); return; } setRefersToEnumType( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AbstractDataAttribute refers to EnumType( id = ", getType(), " ) on line ", getRefersToEnumType().getLineNumber() ); } @@ -1529,13 +1529,13 @@ else if( "Struct".equals( getBType() ) ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " DAType( id = ", getType(), " )" ); return; } setRefersToDAType( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AbstractDataAttribute refers to EnumType( id = ", getType(), " ) on line ", getRefersToDAType().getLineNumber() ); } 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 1f2a8e41..424dc057 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 @@ -1068,7 +1068,7 @@ public boolean isSetReferredByLNode() { */ @Override public LDevice getParentLDevice() { - AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AnyLNImpl.getParentLDevice() called" ); return null; } @@ -1505,7 +1505,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "AnyLNImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AnyLNImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1517,13 +1517,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from AnyLN on line: "; if( ( getLnType() == null ) || getLnType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnType is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1535,18 +1535,18 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " LNodeType( id = ", getLnType(), " )" ); return; } setRefersToLNodeType( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "AnyLN on line ", getLineNumber(), " refers to LNodeType( id = ", getLnType(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "AnyLN refers to LNodeType( id = ", getLnType(), " ) on line ", getRefersToLNodeType().getLineNumber() ); if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java index 6104587c..9f36257d 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 @@ -1244,7 +1244,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "AssociationImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AssociationImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1260,17 +1260,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from Association: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "iedName is missing " ); return; } if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "ldInst is missing " ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnClass is missing " ); return; } @@ -1279,12 +1279,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // IED.name == Association.iedName Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), " IED( name = ", getIedName(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found IED( name = ", getIedName(), " ) on line ", ied.getLeft().getLineNumber() ); @@ -1292,12 +1292,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // LDevice.name == Association.ldInst Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found ", "LDevice( inst = ", getLdInst(), " )", " on line ", lDevice.getLeft().getLineNumber() ); @@ -1310,13 +1310,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "Association on line ", getLineNumber(), " refers to ", mess, " on line ", + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "Association refers to ", mess, " on line ", getRefersToAnyLN().getLineNumber() ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java index e9bd59f0..fdf90698 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java @@ -1150,7 +1150,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "ClientLNImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ClientLNImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1166,17 +1166,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from ClientLN: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "iedName is missing" ); return; } if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "ldInst is missing" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnClass is missing" ); return; } @@ -1185,23 +1185,23 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // IED.name == ClientLN.iedName Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find " : "found several " ), "IED( name = ", getIedName(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found IED( name = ", getIedName(), " ) on line ", ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = null; if( ( getApRef() == null ) || getApRef().isEmpty() ) { if( ied.getLeft().getAccessPoint().size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); return; } if( ied.getLeft().getAccessPoint().size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), " ) but apRef not specified" ); return; @@ -1211,12 +1211,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { else { ap = SclUtilities.getAccessPoint( ied.getLeft(), getApRef() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), " AccessPoint( name = ", getApRef(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found ", "AccessPoint( name = ", getApRef(), " ) on line ", ap.getLeft().getLineNumber() ); } @@ -1230,12 +1230,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { else { Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ap.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", lDevice.getLeft().getLineNumber() ); @@ -1248,13 +1248,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), - "ClientLN on line ", getLineNumber(), " refers to ", mess, " on line ", + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), + "ClientLN refers to ", mess, " on line ", getRefersToAnyLN().getLineNumber() ); } 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 28ac53e9..aef4ce0e 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 @@ -1020,7 +1020,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "ConnectedAPImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ConnectedAPImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1032,12 +1032,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from ConnectedAP: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "iedName is missing" ); return; } if( ( getApName() == null ) || getApName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "apName is missing" ); return; } @@ -1046,23 +1046,23 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // IED.name == ConnectedAP.iedName Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), " IED( name = ", getIedName(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found IED( name = ", getIedName(), " ) on line ", ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied.getLeft(), getApName() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), " AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ConnectedAP on line refers to AccessPoint( name = ", getApName(), " ) on line ", getRefersToAccessPoint().getLineNumber() ); } 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 f055c760..965c392d 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 @@ -517,7 +517,7 @@ public boolean isSetRefersToControlWithIEDName() { */ @Override public ConnectedAP getParentConnectedAP() { - AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ControlBlock.getParentConnectedAP() called" ); return null; } @@ -688,7 +688,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "ControlBlockImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ControlBlockImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -705,12 +705,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from ControlBlock: "; if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "ldInst is missing" ); return; } if( ( getCbName() == null ) || getCbName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "cbName is missing" ); return; } @@ -724,19 +724,19 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // LDevice.inst == ControlBlock.ldInst Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied, getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", lDevice.getLeft().getLineNumber() ); // Find a ControlWithIEDName inside LN0 of LDevice with // ControlWithIEDName.name == ControlBlock.bName if( lDevice.getLeft().getLN0() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "LN0 is missing" ); return; } @@ -751,13 +751,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), " ControlWithIEDName( name = ", getCbName(), " )" ); return; } setRefersToControlWithIEDName( res2.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ControlBlock refers to ControlWithIEDName( name = ", getCbName(), " ) on line ", getRefersToControlWithIEDName().getLineNumber() ); } 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 3566f605..e2fb054d 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 @@ -424,7 +424,7 @@ public boolean isSetReferredByExtRef() { */ @Override public AnyLN getParentAnyLN() { - AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + AbstractRiseClipseConsole.getConsole().emergency( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "Control.getParentAnyLN() called" ); return null; } @@ -596,7 +596,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "ControlImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ControlImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -609,7 +609,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from Control: "; if( ( getDatSet() == null ) || getDatSet().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "datSet is missing" ); return; } @@ -626,13 +626,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " DataSet( name = ", getDatSet(), " )" ); return; } setRefersToDataSet( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "Control refers to DataSet( name = ", getDatSet(), " ) on line ", getRefersToDataSet().getLineNumber() ); } 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 efeaaffd..c5ae06e0 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 @@ -1010,7 +1010,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "DAIImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DAIImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1018,7 +1018,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from DAI: "; if( ( getName() == null ) || getName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "name is missing" ); return; } @@ -1039,14 +1039,14 @@ private void doBuildExplicitLinkWithParentDOI( @NonNull IRiseClipseConsole conso // No error or warning messages here: if this happens, error should have been detected before DO do_ = getParentDOI().getRefersToDO(); if( do_ == null ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + 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; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< DA > res = dot @@ -1056,13 +1056,13 @@ private void doBuildExplicitLinkWithParentDOI( @NonNull IRiseClipseConsole conso .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " DA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DAI refers to DA( name = " + getName(), " ) on line ", getRefersToAbstractDataAttribute().getLineNumber() ); } @@ -1076,12 +1076,12 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso SDO sdo = getParentSDI().getRefersToSDO(); if( sdo == null ) return; sdo.buildExplicitLinks( console, false ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + 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; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< DA > res = dot @@ -1091,25 +1091,25 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " DA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DAI refers to DA( name = ", getName(), " ) on line ", getRefersToAbstractDataAttribute().getLineNumber() ); return; } att.buildExplicitLinks( console, false ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found AbstractDataAttribute on line ", att.getLineNumber() ); DAType dat = att.getRefersToDAType(); // No error or warning message here: if this happens, error should have been detected before if( dat == null ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DAType on line ", dat.getLineNumber() ); List< BDA > res = dat @@ -1119,13 +1119,13 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " BDA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DAI refers to ", "BDA( name = " + getName() + " )", " on line ", getRefersToAbstractDataAttribute().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 b9bf3f3b..b223675d 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 @@ -910,7 +910,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "DOIImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DOIImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -918,14 +918,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from DOI: "; if( ( getName() == null ) || getName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "name is missing" ); return; } // No error or warning message here: if this happens, error should have been detected before if( ( getParentAnyLN() == null ) || ( getParentAnyLN().getRefersToLNodeType() == null ) ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LNodeType on line ", getParentAnyLN().getRefersToLNodeType().getLineNumber() ); @@ -937,13 +937,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " DO( name = ", getName(), " )" ); return; } setRefersToDO( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DOI refers to DO( name = ", getName(), " ) on line ", getRefersToDO().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 97ae42e3..34a2338c 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 @@ -550,7 +550,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "DOImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DOImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -564,7 +564,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from DO: "; if( ( getType() == null ) || getType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "type is missing" ); return; } @@ -579,13 +579,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " DOType( id = ", getType(), " )" ); return; } setRefersToDOType( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "DO refers to DOType( id = ", getType(), " ) on line ", getRefersToDOType().getLineNumber() ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java index 23fbe0a2..baed8364 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java @@ -2586,7 +2586,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "ExtRefImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ExtRefImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -2617,14 +2617,14 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol if( ( getIedName() == null ) || getIedName().isEmpty() ) { // no warning if no iedName - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "do not look for DA because iedName is missing" ); return Pair.of( null, null ); } if( ( getDoName() == null ) || getDoName().isEmpty() ) { // No link if no doName - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "doName is absent" ); return Pair.of( null, null ); } @@ -2637,35 +2637,35 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); } if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), " IED( name = ", getIedName(), " )" ); return Pair.of( null, null ); } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found IED ( name = ", ied.getLeft().getName(), " ) on line ", ied.getLeft().getLineNumber() ); // Only now so that we can give back ied if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "ldInst is missing" ); return Pair.of( ied.getLeft(), null ); } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnClass is missing" ); return Pair.of( ied.getLeft(), null ); } Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return Pair.of( ied.getLeft(), null ); } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", lDevice.getLeft().getLineNumber() ); @@ -2680,19 +2680,19 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return finalRes; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found ", mess, " on line ", anyLN.getLeft().getLineNumber() ); anyLN.getLeft().buildExplicitLinks( console, false ); // No error or warning message here: if this happens, error should have been detected before if( anyLN.getLeft().getRefersToLNodeType() == null ) return finalRes; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LNodeType on line ", anyLN.getLeft().getRefersToLNodeType().getLineNumber() ); @@ -2713,21 +2713,21 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), " DO ( name = ", doNames[0], " )" ); return finalRes; } AbstractDataObject ado = res1.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found ", "DO ( name = ", doNames[0], " )", " on line ", ado.getLineNumber() ); ado.buildExplicitLinks( console, false ); for( int i = 1; i < doNames.length; ++i ) { DOType doType = ado.getRefersToDOType(); if( doType == null ) return finalRes; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); String name = doNames[i]; List< SDO > res2 = doType @@ -2737,13 +2737,13 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), " SDO ( name = ", name, " ) in DOType on line ", doType.getLineNumber() ); return finalRes; } ado = res2.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found SDO ( name = ", name, " ) in DOType on line ", doType.getLineNumber(), " on line ", ado.getLineNumber() ); @@ -2752,7 +2752,7 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol // Set link to DO/SDO only if no daName if( getDaName() == null ) { setRefersToAbstractDataObject( ado ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ExtRef refers to AbstractDataObject ( name = ", ado.getName(), " ) on line ", ado.getLineNumber() ); return finalRes; @@ -2761,7 +2761,7 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol DOType doType = ado.getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before if( doType == null ) return finalRes; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); // The first daName gives us the DA inside the DOType @@ -2775,13 +2775,13 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res3.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res3.size() == 0 ) ? "cannot find" : "found several" ), " DA ( name = ", daNames[0], " ) in DOType" ); return finalRes; } AbstractDataAttribute da = res3.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DA ( name = ", daNames[0], " ) in DOType on line ", da.getLineNumber() ); @@ -2797,19 +2797,19 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res4.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res4.size() == 0 ) ? "cannot find" : "found several" ), " BDA ( name = ", name, " ) in DAType on line ", da.getRefersToDAType().getLineNumber() ); return finalRes; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found BDA ( name = ", name, " ) in DAType on line ", da.getRefersToDAType().getLineNumber(), " on line ", res4.get( 0 ).getLineNumber() ); da = res4.get( 0 ); } - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ExtRef refers to AbstractDataAttribute ( name = ", da.getName(), " ) on line ", da.getLineNumber() ); setRefersToAbstractDataAttribute( da ); @@ -2834,7 +2834,7 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul if( ied == null ) return; if( ( getSrcCBName() == null ) || getSrcCBName().isEmpty() ) { - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "srcCBName is absent" ); return; } @@ -2842,13 +2842,13 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul if( ( getSrcLDInst() != null ) && ( !getSrcLDInst().isEmpty() ) ) { Pair< LDevice, Integer > lDevice1 = SclUtilities.getLDevice( ied, getSrcLDInst() ); if( lDevice1.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = " + getSrcLDInst() + " )" ); return; } lDevice = lDevice1.getLeft(); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getSrcLDInst(), " ) on line ", lDevice.getLineNumber() ); } @@ -2866,12 +2866,12 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found", mess, " on line ", anyLN.getLeft().getLineNumber() ); List< Control > listControls = new ArrayList<>(); @@ -2882,7 +2882,7 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul listControls.addAll( lDevice.getLN0().getSampledValueControl() ); } if( listControls.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "control not found because there are none of them in AnyLN line ", anyLN.getLeft().getLineNumber() ); return; @@ -2893,13 +2893,13 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul .filter( c -> getSrcCBName().equals( c.getName() ) ) .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " Control( name = ", getSrcCBName(), " )" ); return; } setRefersToControl( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ExtRef refers to Control( name = ", getSrcCBName(), " ) on line ", getRefersToControl().getLineNumber() ); } 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 e0f6031d..96c6a7b9 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 @@ -1092,7 +1092,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "FCDAImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "FCDAImpl.doBuildExplicitLinks()" ); //@formatter:off @@ -1118,17 +1118,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from FCDA: "; if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "ldInst is missing" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnClass is missing" ); return; } if( ( getDoName() == null ) || getDoName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "doName is missing" ); return; } @@ -1139,22 +1139,22 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { object = object.eContainer(); } if( object == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "AccessPoint not found" ); return; } AccessPoint ap = ( AccessPoint ) object; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found Server on line ", ap.getServer().getLineNumber() ); Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ap, getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", lDevice.getLeft().getLineNumber() ); @@ -1167,17 +1167,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found ", mess, " on line ", anyLN.getLeft().getLineNumber() ); anyLN.getLeft().buildExplicitLinks( console, false ); if( anyLN.getLeft().getRefersToLNodeType() == null ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LNodeType on line ", anyLN.getLeft().getRefersToLNodeType().getLineNumber() ); @@ -1199,12 +1199,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, (( res1.size() == 0 ) ? "cannot find" : "found several" ), " DO ( name = ", doNames[0], " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DO ( name = ", doNames[0], " ) on line ", res1.get( 0 ).getLineNumber() ); @@ -1212,7 +1212,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { 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; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); for( int i = 1; i < doNames.length; ++i ) { @@ -1225,19 +1225,19 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, (( res2.size() == 0 ) ? "cannot find" : "found several" ), "SDO ( name = ", name, " ) in DOType on line ", doType.getLineNumber() ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found SDO ( name = ", name, " ) in DOType (on line ", doType.getLineNumber(), ") on line ", res2.get( 0 ).getLineNumber() ); res2.get( 0 ).buildExplicitLinks( console, false ); doType = res2.get( 0 ).getRefersToDOType(); if( doType == null ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); } @@ -1259,12 +1259,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res3.size() == 1 ) { res3.get( 0 ).buildExplicitLinks( console, false ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found SDO ( name = ", name, " ) in DOType on line ", res3.get( 0 ).getLineNumber() ); doType = res3.get( 0 ).getRefersToDOType(); if( doType == null ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", doType.getLineNumber() ); continue; } @@ -1278,14 +1278,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( res4.size() == 1 ) { attributeLookedFor = res4.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DA ( name = ", name, " ) in DOType on line ", attributeLookedFor.getLineNumber() ); doType = null; continue; } - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, (( res4.size() == 0 ) ? "cannot find" : "found several" ), " DA or SDO ( name = ", name, " ) in DOType" ); return; @@ -1303,13 +1303,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res5.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, (( res5.size() == 0 ) ? "cannot find" : "found several" ), "BDA ( name = ", name, " ) in DAType on line ", attributeLookedFor.getRefersToDAType().getLineNumber() ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found BDA ( name = ", name, " ) in DAType (on line ", attributeLookedFor.getRefersToDAType().getLineNumber(), ") on line ", res5.get( 0 ).getLineNumber() ); @@ -1318,14 +1318,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } // We should never get there - console.emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.emergency( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "Unexpected error in FCDA.doBuildExplicitLinks()" ); return; } } if((( doType == null ) && ( attributeLookedFor == null )) || (( doType != null ) && ( attributeLookedFor != null ))) { - console.emergency( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.emergency( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "Unexpected state in FCDA.doBuildExplicitLinks()" ); return; } @@ -1334,7 +1334,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // TODO: do we have to check if fc is right ? // TODO: ix is ignored ! - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "FCDA refers to AbstractDataAttribute ( name = ", attributeLookedFor.getName(), " ) on line ", attributeLookedFor.getLineNumber() ); getRefersToAbstractDataAttribute().add( attributeLookedFor ); @@ -1348,13 +1348,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( getRefersToAbstractDataAttribute().size() > 0 ) { for( AbstractDataAttribute a : getRefersToAbstractDataAttribute() ) { - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "FCDA refers to AbstractDataAttribute ( name = ", a.getName(), " ) on line ", a.getLineNumber() ); } } else { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "FCDA does not refer to any AbstractDataAttribute" ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java index 9b1eb8b6..4a44d077 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java @@ -1270,7 +1270,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "IEDNameImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "IEDNameImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1286,7 +1286,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from IEDName: "; if( ( getValue() == null ) || getValue().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "value is missing" ); return; } @@ -1295,7 +1295,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // IED.name == value Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getValue() ); if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), " IED( name = ", getValue(), " )" ); return; @@ -1303,25 +1303,25 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { setRefersToIED( ied.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "IEDName to IED( name = ", getValue(), " ) on line ", ied.getLeft().getLineNumber() ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found IED( name = ", getValue(), " ) on line ", ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = null; if( ( getApRef() == null ) || getApRef().isEmpty() ) { if( ied.getLeft().getAccessPoint().size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); return; } if( ied.getLeft().getAccessPoint().size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), " ) but apRef not specified" ); return; @@ -1331,30 +1331,30 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { else { ap = SclUtilities.getAccessPoint( ied.getLeft(), getApRef() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), " AccessPoint( name = ", getApRef(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found AccessPoint( name = ", getApRef(), " ) on line ", ap.getLeft().getLineNumber() ); } Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { setRefersToLDevice( lDevice.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "IEDName refers to LDevice( inst = ", getLdInst(), " ) on line ", getRefersToLDevice().getLineNumber() ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", lDevice.getLeft().getLineNumber() ); @@ -1367,13 +1367,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ClientLN refers to", mess, " on line ", getRefersToAnyLN().getLineNumber() ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java index 73c9a340..7ebe6345 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java @@ -576,7 +576,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "KDCImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "KDCImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -584,12 +584,12 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from KDC: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "iedName is missing" ); return; } if( ( getApName() == null ) || getApName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "apName is missing" ); return; } @@ -598,24 +598,24 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // IED.name == ConnectedAP.iedName Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), "IED( name = ", getIedName(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found IED( name = ", getIedName(), " ) on line ", ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied.getLeft(), getApName() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), "AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "KDC refers to AccessPoint( name = ", getApName(), " ) on line ", getRefersToAccessPoint().getLineNumber() ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java index 8fe08cf9..762d5ee7 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LDeviceImpl.java @@ -1301,7 +1301,7 @@ public IED getIED() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "LDeviceImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LDeviceImpl.doBuildExplicitLinks()" ); //@formatter:off @@ -1322,13 +1322,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( grRef.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several DOI named GrRef in LN0" ); return; } if( grRef.size() == 0 ) { - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LDevice ", getInst(), " is a root LDevice" ); return; } @@ -1342,37 +1342,37 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( setSrcRef.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found no DAI named setSrcRef in GrRef on line ", grRef.get( 0 ).getLineNumber() ); return; } if( setSrcRef.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several DAI named setSrcRef in GrRef on line ", grRef.get( 0 ).getLineNumber() ); return; } if( setSrcRef.get( 0 ).getVal().size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found no Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber() ); return; } if( setSrcRef.get( 0 ).getVal().size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber() ); return; } String higherLevelLDeviceName = setSrcRef.get( 0 ).getVal().get( 0 ).getValue(); if(( higherLevelLDeviceName == null ) || ( higherLevelLDeviceName.length() <= 1 )) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found no Val or empty Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber() ); return; } // TODO: higherLevelLDeviceName may or must be prefixed by @ ? if( ! higherLevelLDeviceName.startsWith( "@" )) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber(), " does not start with @" ); } @@ -1391,17 +1391,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( lDevices.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found no LDevice named ", higherLevelLDeviceName ); return; } if( lDevices.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several LDevice ", higherLevelLDeviceName ); return; } - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LDevice ", getInst(), " has ", lDevices.get( 0 ).getInst(), " for higher level LDevice" ); setRefersToHigherLevelLDevice( lDevices.get( 0 )); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java index 8fa2779f..4cede224 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java @@ -1125,7 +1125,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "LNodeImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LNodeImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1150,13 +1150,13 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri // Resolve only if attribute is not None // Default value is None if( ( getIedName() == null ) || getIedName().isEmpty() || "None".equals( getIedName() ) ) { - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "link to AnyLN not resolved because iedName is absent or None" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnClass is missing" ); return; } @@ -1165,12 +1165,12 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri // IED.name == LNode.iedName Pair< IED, Integer > ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), " IED( name = ", getIedName(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found IED( name = ", getIedName(), " ) on line ", ied.getLeft().getLineNumber() ); @@ -1178,12 +1178,12 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri // LDevice.name == LNode.ldInst Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), " LDevice( inst = ", getLdInst(), " )" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", lDevice.getLeft().getLineNumber() ); @@ -1200,13 +1200,13 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LNode refers to ", mess, " on line ", getRefersToAnyLN().getLineNumber() ); } @@ -1217,13 +1217,13 @@ private void doBuildExplicitLNodeTypeLink( @NonNull IRiseClipseConsole console, // lnType The logical node type definition containing more detailed functional specification. Might be missing, if the LN is allocated to an IED. if( ( getLnType() == null ) || getLnType().isEmpty() ) { - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "link not resolved because lnType is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1235,18 +1235,18 @@ private void doBuildExplicitLNodeTypeLink( @NonNull IRiseClipseConsole console, .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " LNodeType( id = ", getLnType(), " )" ); return; } setRefersToLNodeType( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "AnyLN refers to LNodeType( id = ", getLnType(), " ) on line ", getRefersToLNodeType().getLineNumber() ); if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); } 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 97f6fc20..35bcb2cc 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 @@ -1310,7 +1310,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "LogControlImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LogControlImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1331,7 +1331,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from LogControl: "; if( ( getLogName() == null ) || getLogName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "logName is missing" ); return; } @@ -1345,13 +1345,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( ( getLdInst() != null ) && ( !getLdInst().isEmpty() ) ) { Pair< LDevice, Integer > lDevice1 = SclUtilities.getLDevice( ied, getLdInst() ); if( lDevice1.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), "LDevice( inst = ", getLdInst(), " )" ); return; } lDevice = lDevice1.getLeft(); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found LDevice( inst = ", getLdInst(), " ) on line ", lDevice.getLineNumber() ); } @@ -1364,13 +1364,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "LogControl refers to ", mess, " on line ", getRefersToAnyLN().getLineNumber() ); 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 d4133c63..983e35f4 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 @@ -1155,7 +1155,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "SDIImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDIImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1163,7 +1163,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from SDI: "; if( ( getName() == null ) || getName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "name is missing" ); return; } @@ -1183,14 +1183,14 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N DO do_ = getParentDOI().getRefersToDO(); // No error or warning message here: if this happens, error should have been detected before if( do_ == null ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + 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; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< SDO > res1 = dot @@ -1201,14 +1201,14 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N // Not an error if res1.size() == 0: will look for a DA if( res1.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several SDO( name = ", getName(), " ) using ParentDOI" ); return; } if( res1.size() == 1 ) { setRefersToSDO( res1.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDI refers to SDO( name = ", getName(), " ) on line ", getRefersToSDO().getLineNumber() ); return; @@ -1222,18 +1222,18 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N // Specific message if res2.size() == 0 if( res2.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "no SDO or DA found using ParentDOI" ); return; } if( res2.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several DA( name = ", getName(), " ) using ParentDOI" ); return; } setRefersToAbstractDataAttribute( res2.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDI refers to DA( name = ", getName(), " ) on line ", getRefersToAbstractDataAttribute().getLineNumber() ); } @@ -1241,14 +1241,14 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { SDO sdo = getParentSDI().getRefersToSDO(); if( sdo != null ) { - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found SDO on line ", sdo.getLineNumber() ); sdo.buildExplicitLinks( console, false ); DOType dot = sdo.getRefersToDOType(); // No error or warning message here: if this happens, error should have been detected before if( dot == null ) return; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DOType on line ", dot.getLineNumber() ); List< SDO > res1 = dot @@ -1259,13 +1259,13 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N // Not an error if res1.size() == 0: will look for a DA if( res1.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several SDO( name = ", getName(), " ) using ParentSDI" ); return; } if( res1.size() == 1 ) { setRefersToSDO( res1.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDI refers to SDO( name = ", getName(), " ) on line ", getRefersToSDO().getLineNumber() ); return; @@ -1279,17 +1279,17 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N // Specific message if res2.size() == 0 if( res2.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), messagePrefix, + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "no SDO or DA found using ParentSDI" ); return; } if( res2.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found several DA( name = ", getName(), " ) using ParentSDI" ); return; } setRefersToAbstractDataAttribute( res2.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDI refers to DA( name = ", getName(), " ) on line ", getRefersToAbstractDataAttribute().getLineNumber() ); return; @@ -1299,18 +1299,18 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N // When getParentSDI().getRefersToSDO() == null AbstractDataAttribute att = getParentSDI().getRefersToAbstractDataAttribute(); if( att == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "cannot find SDO or AbstractDataAttribute using ParentSDI" ); return; } - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found AbstractDataAttribute on line ", att.getLineNumber() ); 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; - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found DAType on line ", dat.getLineNumber() ); List< BDA > res = dat @@ -1320,13 +1320,13 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " BDA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDI refers to BDA( name = ", getName(), " ) on line ", getRefersToAbstractDataAttribute().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 f3e1a997..9a1b4192 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 @@ -476,7 +476,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "SDOImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDOImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -490,13 +490,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from SDO: "; if( ( getType() == null ) || getType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "type is missing" ); return; } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -508,13 +508,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), " DOType( id = ", getType(), " )" ); return; } setRefersToDOType( res.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SDO refers to DOType( id = ", getType(), " ) on line ", getRefersToDOType().getLineNumber() ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java index 6c16006b..527157ef 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SclObjectImpl.java @@ -212,7 +212,7 @@ public void setFilename( String newFilename ) { */ @Override public boolean buildExplicitLinks( @NonNull IRiseClipseConsole console, Boolean forceUpdate ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "SclObjectImpl.buildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SclObjectImpl.buildExplicitLinks()" ); if( ( !forceUpdate ) && isExplicitLinksBuilt() ) return true; @@ -235,7 +235,7 @@ public boolean buildExplicitLinks( @NonNull IRiseClipseConsole console, Boolean } protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "SclObjectImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "SclObjectImpl.doBuildExplicitLinks()" ); // Default do nothing } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java index 1fe367b4..4afeba1f 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java @@ -484,7 +484,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "ServerAtImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ServerAtImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -492,7 +492,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from ServerAt: "; if( ( getApName() == null ) || getApName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "apName is missing" ); return; } @@ -503,13 +503,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied, getApName() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), " AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "ServerAt refers to AccessPoint( name = ", getApName(), " ) on line ", getRefersToAccessPoint().getLineNumber() ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java index fb97c593..f275c362 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java @@ -1175,7 +1175,7 @@ public String toString() { @Override protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { - console.debug( EXPLICIT_LINK_CATEGORY, getLineNumber(), "TerminalImpl.doBuildExplicitLinks()" ); + console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "TerminalImpl.doBuildExplicitLinks()" ); // see Issue #13 super.doBuildExplicitLinks( console ); @@ -1208,17 +1208,17 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons // neutralPoint If true, this terminal connects to a neutral (star) point of all power transformer windings. Default value is false. if( ( getCNodeName() == null ) || getCNodeName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "cNodeName is missing" ); return; } if( ( getVoltageLevelName() == null ) || getVoltageLevelName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "voltageLevelName is missing" ); return; } if( ( getBayName() == null ) || getBayName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "bayName is missing" ); return; } @@ -1233,13 +1233,13 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), " Substation( name = ", getSubstationName(), " )" ); return; } Substation substation = res1.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found Substation( name = ", getSubstationName(), " ) on line ", substation.getLineNumber() ); @@ -1252,13 +1252,13 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), " VoltageLevel( name = ", getVoltageLevelName(), " )" ); return; } VoltageLevel voltageLevel = res2.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found VoltageLevel( name = ", getVoltageLevelName(), " ) on line ", voltageLevel.getLineNumber() ); @@ -1271,13 +1271,13 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res3.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res3.size() == 0 ) ? "cannot find" : "found several" ), " Bay( name = ", getBayName(), " )" ); return; } Bay bay = res3.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found Bay( name = ", getBayName(), " ) on line ", voltageLevel.getLineNumber() ); @@ -1290,20 +1290,20 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res4.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res4.size() == 0 ) ? "cannot find" : "found several" ), " ConnectivityNode( name = ", getCNodeName(), " )" ); return; } setRefersToConnectivityNode( res4.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "Terminal refers to ConnectivityNode( name = ", getCNodeName(), " ) on line ", getRefersToConnectivityNode().getLineNumber() ); } private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { if( ( getCNodeName() == null ) || getCNodeName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "cNodeName is missing" ); return; } @@ -1318,13 +1318,13 @@ private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @ .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), " Line( name = ", getLineName(), " )" ); return; } Line line = res1.get( 0 ); - console.info( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.info( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, "found Line( name = ", getLineName(), " ) on line ", line.getLineNumber() ); @@ -1336,13 +1336,13 @@ private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @ .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), " ConnectivityNode( name = ", getCNodeName(), " )" ); return; } setRefersToConnectivityNode( res2.get( 0 ) ); - console.notice( EXPLICIT_LINK_CATEGORY, getLineNumber(), + console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), "Terminal refers to ConnectivityNode( name = ", getCNodeName(), " )", " on line ", getRefersToConnectivityNode().getLineNumber() ); } 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 ac7de367..6c6c6186 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 @@ -113,7 +113,7 @@ public void endCDATA() { public void endElement( String uri, String localName, String name ) { if( lineNumbers.empty() ) { AbstractRiseClipseConsole.getConsole().warning( - XML_HANDLER_CATEGORY, 0, "linenumber stack empty !" ); + XML_HANDLER_CATEGORY, resourceURI.lastSegment(), 0, "linenumber stack empty !" ); } else { lineNumbers.pop(); @@ -165,7 +165,7 @@ protected EPackage getPackageForURI( String uriString ) { protected void processObject( EObject object ) { if( lineNumbers.empty() ) { AbstractRiseClipseConsole.getConsole().warning( - XML_HANDLER_CATEGORY, 0, "linenumber stack empty !" ); + XML_HANDLER_CATEGORY, resourceURI.lastSegment(), 0, "linenumber stack empty !" ); } else { // Will pop in endElement, because some attributes in the model @@ -173,6 +173,7 @@ protected void processObject( EObject object ) { int lineNumber = lineNumbers.peek(); if( object instanceof SclObject ) { (( SclObject ) object ).setLineNumber( lineNumber ); + (( SclObject ) object ).setFilename( resourceURI.lastSegment() ); } } // TODO: error message @@ -199,7 +200,7 @@ protected void setFeatureValue( EObject object, EStructuralFeature feature, Obje if(( feature.getUpperBound() == 1 ) && object.eIsSet( feature )) { AbstractRiseClipseConsole.getConsole().error( - XML_HANDLER_CATEGORY, (( SclObject ) object ).getLineNumber(), + XML_HANDLER_CATEGORY, resourceURI.lastSegment(), (( SclObject ) object ).getLineNumber(), "there shall not be more than 1 ", feature.getName(), " in ", object.eClass().getName() ); return; @@ -228,10 +229,10 @@ public void endDocument() { if( ! lineNumbers.empty() ) { AbstractRiseClipseConsole.getConsole().warning( - XML_HANDLER_CATEGORY, 0, "linenumber stack not empty !" ); + XML_HANDLER_CATEGORY, resourceURI.lastSegment(), 0, "linenumber stack not empty !" ); while( ! lineNumbers.empty() ) { AbstractRiseClipseConsole.getConsole().warning( - XML_HANDLER_CATEGORY, lineNumbers.pop(), "popping " ); + XML_HANDLER_CATEGORY, resourceURI.lastSegment(), lineNumbers.pop(), "popping " ); } } } @@ -248,7 +249,8 @@ public void handleUnknownFeature( String prefix, String name, boolean isElement, if( ! lineNumbers.empty() ) { ln = lineNumbers.peek(); } - AbstractRiseClipseConsole.getConsole().error( XML_HANDLER_CATEGORY, ln, "unknown feature \"", name, "\" in object ", peekObject.eClass().getName() ); + AbstractRiseClipseConsole.getConsole().error( XML_HANDLER_CATEGORY, resourceURI.lastSegment(), + ln, "unknown feature \"", name, "\" in object ", peekObject.eClass().getName() ); } } From 774a946b97dceb11b4afdaa6905ec180aeec8e4a Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Wed, 27 Apr 2022 09:12:06 +0200 Subject: [PATCH 4/5] update version numbers --- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 4 ++-- 3 files changed, 8 insertions(+), 8 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 e4520054..9963b741 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,14 +4,14 @@ 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.2.qualifier +Bundle-Version: 1.2.3.qualifier Bundle-ClassPath: . Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider Require-Bundle: org.eclipse.core.runtime, - fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.2";visibility:=reexport, + fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.3";visibility:=reexport, org.eclipse.emf.edit;visibility:=reexport, - fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.2" + fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.3" Bundle-ActivationPolicy: lazy 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 671c7c7f..8057de40 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,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities -Bundle-Version: 1.2.2.qualifier +Bundle-Version: 1.2.3.qualifier Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.ecore, - fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.2", - fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.2" + fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.3", + fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.3" Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities 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 bdfaff4e..c772d857 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.2.qualifier +Bundle-Version: 1.2.3.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -14,7 +14,7 @@ Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl, Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, - fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.2", + fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.3", org.eclipse.jdt.annotation, org.apache.commons.lang3 Bundle-ActivationPolicy: lazy From de6fccf23cde6e55c5cb0d8a241087f0c30efe6d Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Fri, 20 May 2022 14:00:15 +0200 Subject: [PATCH 5/5] update versions --- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 4 ++-- fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 10 insertions(+), 10 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 4e303f24..cf180597 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,14 +4,14 @@ 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.3.qualifier +Bundle-Version: 1.2.4.qualifier Bundle-ClassPath: . Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider Require-Bundle: org.eclipse.core.runtime, - fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.3";visibility:=reexport, + fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.4";visibility:=reexport, org.eclipse.emf.edit;visibility:=reexport, - fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.4" + fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.5" Bundle-ActivationPolicy: lazy 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 0873376d..e412d1ac 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,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities -Bundle-Version: 1.2.3.qualifier +Bundle-Version: 1.2.4.qualifier Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.ecore, - fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.3", - fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.4" + fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.4", + fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.5" Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities 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 bef57331..b0e16831 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.3.qualifier +Bundle-Version: 1.2.4.qualifier Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -14,7 +14,7 @@ Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl, Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, - fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.4", + fr.centralesupelec.edf.riseclipse.main;bundle-version="1.2.5", org.eclipse.jdt.annotation, org.apache.commons.lang3 Bundle-ActivationPolicy: lazy diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml index de4685d6..42517fe1 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml @@ -54,7 +54,7 @@ io.github.riseclipse fr.centralesupelec.edf.riseclipse.main - 1.2.4 + 1.2.5 diff --git a/pom.xml b/pom.xml index e39d7856..b96b8ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ io.github.riseclipse fr.centralesupelec.edf.riseclipse.developer.maven - 1.2.2 + 1.2.3