From 7299cee017b9a038b7cb2eaefa513535b9489563 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr> Date: Fri, 17 May 2019 09:31:28 +0200 Subject: [PATCH] prefix [SCL links] added to messages --- .../iec61850/scl/impl/AbstractDataAttributeImpl.java | 6 +++--- .../edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java | 4 ++-- .../iec61850/scl/impl/AssociationImpl.java | 4 ++-- .../riseclipse/iec61850/scl/impl/ClientLNImpl.java | 4 ++-- .../iec61850/scl/impl/ConnectedAPImpl.java | 4 ++-- .../iec61850/scl/impl/ControlBlockImpl.java | 4 ++-- .../riseclipse/iec61850/scl/impl/ControlImpl.java | 4 ++-- .../edf/riseclipse/iec61850/scl/impl/DAIImpl.java | 6 +++--- .../edf/riseclipse/iec61850/scl/impl/DOIImpl.java | 4 ++-- .../edf/riseclipse/iec61850/scl/impl/DOImpl.java | 4 ++-- .../edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java | 8 ++++---- .../edf/riseclipse/iec61850/scl/impl/FCDAImpl.java | 8 ++++---- .../riseclipse/iec61850/scl/impl/IEDNameImpl.java | 4 ++-- .../edf/riseclipse/iec61850/scl/impl/KDCImpl.java | 4 ++-- .../edf/riseclipse/iec61850/scl/impl/LNodeImpl.java | 6 +++--- .../riseclipse/iec61850/scl/impl/LogControlImpl.java | 4 ++-- .../edf/riseclipse/iec61850/scl/impl/SDIImpl.java | 12 ++++++------ .../edf/riseclipse/iec61850/scl/impl/SDOImpl.java | 4 ++-- .../riseclipse/iec61850/scl/impl/ServerAtImpl.java | 4 ++-- .../riseclipse/iec61850/scl/impl/TerminalImpl.java | 6 +++--- 20 files changed, 52 insertions(+), 52 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 e4f334e..7703871 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 @@ -1398,7 +1398,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements if( ! ( "Enum".equals( getBType() ) || "Struct".equals( getBType() ))) { return; } - String messagePrefix = "while resolving link from AbstractDataAttribute on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from AbstractDataAttribute on line " + getLineNumber() + ": "; if(( getType() == null ) || getType().isEmpty() ) { console.warning( messagePrefix + "type is missing" ); @@ -1428,7 +1428,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements return; } setRefersToEnumType( res.get( 0 ) ); - console.info( "AbstractDataAttribute on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToEnumType().getLineNumber() ); + console.info( "[SCL links] AbstractDataAttribute on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToEnumType().getLineNumber() ); } else if( "Struct".equals( getBType() )) { @@ -1447,7 +1447,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements return; } setRefersToDAType( res.get( 0 ) ); - console.info( "AbstractDataAttribute on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDAType().getLineNumber() ); + console.info( "[SCL links] AbstractDataAttribute on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDAType().getLineNumber() ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AnyLNImpl.java index 7a20b76..4277c0b 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 @@ -1420,7 +1420,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { // lnClass The LN class according to IEC 61850-7-x // inst The LN instance number identifying this LN – an unsigned integer - String messagePrefix = "while resolving link from AnyLN on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from AnyLN on line " + getLineNumber() + ": "; if(( getLnType() == null ) || getLnType().isEmpty() ) { console.warning( messagePrefix + "lnType is missing" ); @@ -1445,7 +1445,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { return; } setRefersToLNodeType( res.get( 0 ) ); - console.info( "AnyLN on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToLNodeType().getLineNumber() ); + console.info( "[SCL links] AnyLN on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToLNodeType().getLineNumber() ); if(( getLnClass() != null ) && ! getLnClass().equals( getRefersToLNodeType().getLnClass() )) { console.warning( messagePrefix + "lnClass in " + mess + "(" + getRefersToLNodeType().getLnClass() + ") is not " + getLnClass() ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java index 6248878..7f18f3a 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 @@ -1176,7 +1176,7 @@ public class AssociationImpl extends BaseElementImpl implements Association { // prefix The LN prefix // lnInst The instance number of the client LN - String messagePrefix = "while resolving link from Association on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from Association on line " + getLineNumber() + ": "; if(( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( messagePrefix + "iedName is missing " ); @@ -1223,7 +1223,7 @@ public class AssociationImpl extends BaseElementImpl implements Association { return; } setRefersToAnyLN( anyLN.getLeft() ); - console.info( "Association on line " + getLineNumber() + " refers to " + mess3 + " on line " + getRefersToAnyLN().getLineNumber() ); + console.info( "[SCL links] Association on line " + getLineNumber() + " refers to " + mess3 + " on line " + getRefersToAnyLN().getLineNumber() ); } } //AssociationImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java index 8a294fc..2841799 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 @@ -1085,7 +1085,7 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN { // lnInst The instance id of this LN instance of below LN class in the IED // desc optional descriptive text, e.g. about purpose of the client - String messagePrefix = "while resolving link from ClientLN on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from ClientLN on line " + getLineNumber() + ": "; if(( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( messagePrefix + "iedName is missing" ); @@ -1158,7 +1158,7 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN { return; } setRefersToAnyLN( anyLN.getLeft() ); - console.info( "ClientLN on line " + getLineNumber() + " refers to " + mess4 + " on line " + getRefersToAnyLN().getLineNumber() ); + console.info( "[SCL links] ClientLN on line " + getLineNumber() + " refers to " + mess4 + " on line " + getRefersToAnyLN().getLineNumber() ); } } //ClientLNImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java index 4cae58f..4d9f8a8 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 @@ -983,7 +983,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP { // apName a name identifying this access point within the IED // desc some descriptive text for this access point at this subnetwork - String messagePrefix = "while resolving link from ConnectedAP on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from ConnectedAP on line " + getLineNumber() + ": "; if(( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( messagePrefix + "iedName is missing" ); @@ -1010,7 +1010,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP { return; } setRefersToAccessPoint( ap.getLeft() ); - console.info( "ConnectedAP on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAccessPoint().getLineNumber() ); + console.info( "[SCL links] ConnectedAP on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAccessPoint().getLineNumber() ); } } //ConnectedAPImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java index afbe30c..a4ebad9 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 @@ -654,7 +654,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl // Assumption : we need both an ied name and a ld instance to uniquely identify a LDevice. // We will use the iedName provided by the enclosing connectedAP. - String messagePrefix = "while resolving link from ControlBlock on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from ControlBlock on line " + getLineNumber() + ": "; if(( getLdInst() == null ) || getLdInst().isEmpty() ) { console.warning( messagePrefix + "ldInst is missing" ); @@ -704,7 +704,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl return; } setRefersToControlWithIEDName( res2.get( 0 )); - console.info( "ControlBlock on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToControlWithIEDName().getLineNumber() ); + console.info( "[SCL links] ControlBlock on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToControlWithIEDName().getLineNumber() ); } } //ControlBlockImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlImpl.java index 92d7246..41ca8e7 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 @@ -573,7 +573,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control { // 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. - String messagePrefix = "while resolving link from Control on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from Control on line " + getLineNumber() + ": "; if(( getDatSet() == null ) || getDatSet().isEmpty() ) { console.warning( messagePrefix + "datSet is missing" ); @@ -598,7 +598,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control { return; } setRefersToDataSet( res.get( 0 )); - console.info( "Control on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDataSet().getLineNumber() ); + console.info( "[SCL links] Control on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDataSet().getLineNumber() ); } } //ControlImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DAIImpl.java index 2bedfd3..12428df 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 @@ -963,7 +963,7 @@ public class DAIImpl extends UnNamingImpl implements DAI { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from DAI on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from DAI on line " + getLineNumber() + ": "; if(( getName() == null ) || getName().isEmpty() ) { console.warning( messagePrefix + "name is missing" ); @@ -1006,7 +1006,7 @@ public class DAIImpl extends UnNamingImpl implements DAI { return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); - console.info( "DAI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); + console.info( "[SCL links] DAI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); } private void doBuildExplicitLinkWithParentSDI( IRiseClipseConsole console, String messagePrefix ) { @@ -1034,7 +1034,7 @@ public class DAIImpl extends UnNamingImpl implements DAI { return; } setRefersToAbstractDataAttribute( res.get( 0 )); - console.info( "DAI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); + console.info( "[SCL links] DAI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); } } //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 4e9d488..d67ec37 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 @@ -769,7 +769,7 @@ public class DOIImpl extends UnNamingImpl implements DOI { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from DOI on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from DOI on line " + getLineNumber() + ": "; if(( getName() == null ) || getName().isEmpty() ) { console.warning( messagePrefix + "name is missing" ); @@ -795,7 +795,7 @@ public class DOIImpl extends UnNamingImpl implements DOI { return; } setRefersToDO( res.get( 0 ) ); - console.info( "DOI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDO().getLineNumber() ); + console.info( "[SCL links] DOI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDO().getLineNumber() ); } } //DOIImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/DOImpl.java index 4fb682e..fe1bf16 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 @@ -489,7 +489,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO { // access control definition applies // transient If set to true, it indicates that the Transient definition from IEC 61850-7-4 applies - String messagePrefix = "while resolving link from DO on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from DO on line " + getLineNumber() + ": "; if(( getType() == null ) || getType().isEmpty() ) { console.warning( messagePrefix + "type is missing" ); @@ -512,7 +512,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO { return; } setRefersToDOType( res.get( 0 )); - console.info( "DO on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDOType().getLineNumber() ); + console.info( "[SCL links] DO on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDOType().getLineNumber() ); } } //DOImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java index f6cfb39..01c15f0 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 @@ -2431,7 +2431,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from ExtRef on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from ExtRef on line " + getLineNumber() + ": "; Pair< IED, LDevice > args = doBuildExplicitDataLink( console, messagePrefix ); doBuildExplicitCBLink( console, messagePrefix, args ); } @@ -2569,7 +2569,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { // Set link to DO/SDO only if no daName if( getDaName() == null ) { setRefersToAbstractDataObject( ado ); - console.info( "ExtRef on line " + getLineNumber() + " refers to AbstractDataObject ( name = " + ado.getName() + " ) on line " + ado.getLineNumber() ); + console.info( "[SCL links] ExtRef on line " + getLineNumber() + " refers to AbstractDataObject ( name = " + ado.getName() + " ) on line " + ado.getLineNumber() ); return finalRes; } @@ -2618,7 +2618,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { console.verbose( messagePrefix + "found " + mess4b + " on line " + da.getLineNumber() ); } - console.info( "ExtRef on line " + getLineNumber() + " refers to AbstractDataAttribute ( name = " + da.getName() + " ) on line " + da.getLineNumber() ); + console.info( "[SCL links] ExtRef on line " + getLineNumber() + " refers to AbstractDataAttribute ( name = " + da.getName() + " ) on line " + da.getLineNumber() ); setRefersToAbstractDataAttribute( da ); return finalRes; @@ -2692,7 +2692,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { return; } setRefersToControl( res7.get( 0 )); - console.info( "ExtRef on line " + getLineNumber() + " refers to " + mess7 + " on line " + getRefersToControl().getLineNumber() ); + console.info( "[SCL links] ExtRef on line " + getLineNumber() + " refers to " + mess7 + " on line " + getRefersToControl().getLineNumber() ); } } //ExtRefImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java index e6c4143..66580fc 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 @@ -1062,7 +1062,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA { // ix An index to select an array element in case that one of the data elements is an array. The ix value shall be identical to the // ArrayElementNumber value in the doName or daName part. - String messagePrefix = "while resolving link from FCDA on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from FCDA on line " + getLineNumber() + ": "; if(( getLdInst() == null ) || getLdInst().isEmpty() ) { console.warning( messagePrefix + "ldInst is missing" ); @@ -1209,7 +1209,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA { // TODO: do we have to check if fc is right ? // TODO: ix is ignored ! - console.info( "FCDA on line " + getLineNumber() + " refers to AbstractDataAttribute ( name = " + da.getName() + " ) on line " + da.getLineNumber() ); + console.info( "[SCL links] FCDA on line " + getLineNumber() + " refers to AbstractDataAttribute ( name = " + da.getName() + " ) on line " + da.getLineNumber() ); getRefersToAbstractDataAttribute().add( da ); } @@ -1225,11 +1225,11 @@ public class FCDAImpl extends SclObjectImpl implements FCDA { if( getRefersToAbstractDataAttribute().size() > 0 ) { for( AbstractDataAttribute a : getRefersToAbstractDataAttribute() ) { - console.info( "FCDA on line " + getLineNumber() + " refers to AbstractDataAttribute ( name = " + a.getName() + " ) on line " + a.getLineNumber() ); + console.info( "[SCL links] FCDA on line " + getLineNumber() + " refers to AbstractDataAttribute ( name = " + a.getName() + " ) on line " + a.getLineNumber() ); } } else { - console.warning( "FCDA (line " + getLineNumber() + ") does not refer to any AbstractDataAttribute" ); + console.warning( "[SCL links] FCDA (line " + getLineNumber() + ") does not refer to any AbstractDataAttribute" ); } } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java index 3dd5dcf..f91a066 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 @@ -1198,7 +1198,7 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName { // We only set the most precise RefersTo (IED / LDevice / AnyLN) - String messagePrefix = "while resolving link from IEDName on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from IEDName on line " + getLineNumber() + ": "; if(( getValue() == null ) || getValue().isEmpty() ) { console.warning( messagePrefix + "value is missing" ); @@ -1268,7 +1268,7 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName { return; } setRefersToAnyLN( anyLN.getLeft() ); - console.info( "ClientLN on line " + getLineNumber() + " refers to " + mess4 + " on line " + getRefersToAnyLN().getLineNumber() ); + console.info( "[SCL links] ClientLN on line " + getLineNumber() + " refers to " + mess4 + " on line " + getRefersToAnyLN().getLineNumber() ); } } //IEDNameImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java index fa348a0..eb14031 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 @@ -549,7 +549,7 @@ public class KDCImpl extends SclObjectImpl implements KDC { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from KDC on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from KDC on line " + getLineNumber() + ": "; if(( getIedName() == null ) || getIedName().isEmpty() ) { console.warning( messagePrefix + "iedName is missing" ); @@ -577,7 +577,7 @@ public class KDCImpl extends SclObjectImpl implements KDC { return; } setRefersToAccessPoint( ap.getLeft() ); - console.info( "KDC on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAccessPoint().getLineNumber() ); + console.info( "[SCL links] KDC on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAccessPoint().getLineNumber() ); } } //KDCImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java index 304b721..1276479 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 @@ -1059,7 +1059,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from LNode on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from LNode on line " + getLineNumber() + ": "; doBuildExplicitAnyLNLink( console, messagePrefix ); doBuildExplicitLNodeTypeLink( console, messagePrefix ); } @@ -1124,7 +1124,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode { return; } setRefersToAnyLN( anyLN.getLeft() ); - console.info( "LNode on line " + getLineNumber() + " refers to " + mess3 + " on line " + getRefersToAnyLN().getLineNumber() ); + console.info( "[SCL links] LNode on line " + getLineNumber() + " refers to " + mess3 + " on line " + getRefersToAnyLN().getLineNumber() ); } private void doBuildExplicitLNodeTypeLink( IRiseClipseConsole console, String mPrefix ) { @@ -1156,7 +1156,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode { return; } setRefersToLNodeType( res.get( 0 ) ); - console.info( "AnyLN on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToLNodeType().getLineNumber() ); + console.info( "[SCL links] AnyLN on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToLNodeType().getLineNumber() ); if(( getLnClass() != null ) && ! getLnClass().equals( getRefersToLNodeType().getLnClass() )) { console.warning( messagePrefix + "lnClass in " + mess + "(" + getRefersToLNodeType().getLnClass() + ") is not " + getLnClass() ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java index 12d7047..1a05b84 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 @@ -1251,7 +1251,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont // logEna TRUE enables immediate logging; FALSE prohibits logging until enabled online // reasonCode If true, the reason code for the event trigger is also stored into the log – see IEC 61850-7-2 - String messagePrefix = "while resolving link from LogControl on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from LogControl on line " + getLineNumber() + ": "; if(( getLogName() == null ) || getLogName().isEmpty() ) { console.warning( messagePrefix + "logName is missing" ); @@ -1288,7 +1288,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont return; } setRefersToAnyLN( anyLN.getLeft() ); - console.info( "LogControl on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAnyLN().getLineNumber() ); + console.info( "[SCL links] LogControl on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAnyLN().getLineNumber() ); } 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 c3599d3..746a151 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 @@ -971,7 +971,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from SDI on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from SDI on line " + getLineNumber() + ": "; if(( getName() == null ) || getName().isEmpty() ) { console.warning( messagePrefix + "name is missing" ); @@ -1016,7 +1016,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { } if( res1.size() == 1 ) { setRefersToSDO( res1.get( 0 )); - console.info( "SDI on line " + getLineNumber() + " refers to " + mess1 + " on line " + getRefersToSDO().getLineNumber() ); + console.info( "[SCL links] SDI on line " + getLineNumber() + " refers to " + mess1 + " on line " + getRefersToSDO().getLineNumber() ); return; } @@ -1038,7 +1038,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { return; } setRefersToAbstractDataAttribute( res2.get( 0 )); - console.info( "SDI on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); + console.info( "[SCL links] SDI on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); } private void doResolveLinkWithParentSDI( IRiseClipseConsole console, String messagePrefix ) { @@ -1067,7 +1067,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { } if( res1.size() == 1 ) { setRefersToSDO( res1.get( 0 )); - console.info( "SDI on line " + getLineNumber() + " refers to " + mess1 + " on line " + getRefersToSDO().getLineNumber() ); + console.info( "[SCL links] SDI on line " + getLineNumber() + " refers to " + mess1 + " on line " + getRefersToSDO().getLineNumber() ); return; } @@ -1089,7 +1089,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { return; } setRefersToAbstractDataAttribute( res2.get( 0 )); - console.info( "SDI on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); + console.info( "[SCL links] SDI on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); return; } @@ -1121,7 +1121,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { return; } setRefersToAbstractDataAttribute( res.get( 0 )); - console.info( "SDI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); + console.info( "[SCL links] SDI on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAbstractDataAttribute().getLineNumber() ); } } //SDIImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/SDOImpl.java index 0eb4faa..af2b2c8 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 @@ -396,7 +396,7 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO { // count The number or reference to an attribute defining the number of array elements, // if this element has an ARRAY type. If missing, the default value is 0 (no array) - String messagePrefix = "while resolving link from SDO on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from SDO on line " + getLineNumber() + ": "; if(( getType() == null ) || getType().isEmpty() ) { console.warning( messagePrefix + "type is missing" ); @@ -421,7 +421,7 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO { return; } setRefersToDOType( res.get( 0 ) ); - console.info( "SDO on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDOType().getLineNumber() ); + console.info( "[SCL links] SDO on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToDOType().getLineNumber() ); } } //SDOImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java index 6811645..adf3b27 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 @@ -457,7 +457,7 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from ServerAt on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from ServerAt on line " + getLineNumber() + ": "; if(( getApName() == null ) || getApName().isEmpty() ) { console.warning( messagePrefix + "apName is missing" ); @@ -475,7 +475,7 @@ public class ServerAtImpl extends UnNamingImpl implements ServerAt { return; } setRefersToAccessPoint( ap.getLeft() ); - console.info( "ServerAt on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAccessPoint().getLineNumber() ); + console.info( "[SCL links] ServerAt on line " + getLineNumber() + " refers to " + mess + " on line " + getRefersToAccessPoint().getLineNumber() ); } } //ServerAtImpl diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/TerminalImpl.java index b45d5b1..198c8e3 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 @@ -1107,7 +1107,7 @@ public class TerminalImpl extends UnNamingImpl implements Terminal { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from Terminal on line " + getLineNumber() + ": "; + String messagePrefix = "[SCL links] while resolving link from Terminal on line " + getLineNumber() + ": "; if( getSubstationName() != null ) { doBuildExplicitLinkWithSubstation( console, messagePrefix ); @@ -1213,7 +1213,7 @@ public class TerminalImpl extends UnNamingImpl implements Terminal { return; } setRefersToConnectivityNode( res4.get( 0 )); - console.info( "Terminal on line " + getLineNumber() + " refers to " + mess4 + " on line " + getRefersToConnectivityNode().getLineNumber() ); + console.info( "[SCL links] Terminal on line " + getLineNumber() + " refers to " + mess4 + " on line " + getRefersToConnectivityNode().getLineNumber() ); } private void doBuildExplicitLinkWithLine( IRiseClipseConsole console, String messagePrefix ) { @@ -1255,7 +1255,7 @@ public class TerminalImpl extends UnNamingImpl implements Terminal { return; } setRefersToConnectivityNode( res2.get( 0 )); - console.info( "Terminal on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToConnectivityNode().getLineNumber() ); + console.info( "[SCL links] Terminal on line " + getLineNumber() + " refers to " + mess2 + " on line " + getRefersToConnectivityNode().getLineNumber() ); } } //TerminalImpl -- GitLab