Commit 7299cee0 authored by Dominique Marcadet's avatar Dominique Marcadet

prefix [SCL links] added to messages

parent 638e5721
...@@ -1398,7 +1398,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements ...@@ -1398,7 +1398,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
if( ! ( "Enum".equals( getBType() ) || "Struct".equals( getBType() ))) { if( ! ( "Enum".equals( getBType() ) || "Struct".equals( getBType() ))) {
return; 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() ) { if(( getType() == null ) || getType().isEmpty() ) {
console.warning( messagePrefix + "type is missing" ); console.warning( messagePrefix + "type is missing" );
...@@ -1428,7 +1428,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements ...@@ -1428,7 +1428,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
return; return;
} }
setRefersToEnumType( res.get( 0 ) ); 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() )) { else if( "Struct".equals( getBType() )) {
...@@ -1447,7 +1447,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements ...@@ -1447,7 +1447,7 @@ public abstract class AbstractDataAttributeImpl extends UnNamingImpl implements
return; return;
} }
setRefersToDAType( res.get( 0 ) ); 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() );
} }
} }
......
...@@ -1420,7 +1420,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { ...@@ -1420,7 +1420,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
// lnClass The LN class according to IEC 61850-7-x // lnClass The LN class according to IEC 61850-7-x
// inst The LN instance number identifying this LN – an unsigned integer // 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() ) { if(( getLnType() == null ) || getLnType().isEmpty() ) {
console.warning( messagePrefix + "lnType is missing" ); console.warning( messagePrefix + "lnType is missing" );
...@@ -1445,7 +1445,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN { ...@@ -1445,7 +1445,7 @@ public abstract class AnyLNImpl extends UnNamingImpl implements AnyLN {
return; return;
} }
setRefersToLNodeType( res.get( 0 ) ); 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() )) { if(( getLnClass() != null ) && ! getLnClass().equals( getRefersToLNodeType().getLnClass() )) {
console.warning( messagePrefix + "lnClass in " + mess + "(" + getRefersToLNodeType().getLnClass() + ") is not " + getLnClass() ); console.warning( messagePrefix + "lnClass in " + mess + "(" + getRefersToLNodeType().getLnClass() + ") is not " + getLnClass() );
......
...@@ -1176,7 +1176,7 @@ public class AssociationImpl extends BaseElementImpl implements Association { ...@@ -1176,7 +1176,7 @@ public class AssociationImpl extends BaseElementImpl implements Association {
// prefix The LN prefix // prefix The LN prefix
// lnInst The instance number of the client LN // 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() ) { if(( getIedName() == null ) || getIedName().isEmpty() ) {
console.warning( messagePrefix + "iedName is missing " ); console.warning( messagePrefix + "iedName is missing " );
...@@ -1223,7 +1223,7 @@ public class AssociationImpl extends BaseElementImpl implements Association { ...@@ -1223,7 +1223,7 @@ public class AssociationImpl extends BaseElementImpl implements Association {
return; return;
} }
setRefersToAnyLN( anyLN.getLeft() ); 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 } //AssociationImpl
...@@ -1085,7 +1085,7 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN { ...@@ -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 // 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 // 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() ) { if(( getIedName() == null ) || getIedName().isEmpty() ) {
console.warning( messagePrefix + "iedName is missing" ); console.warning( messagePrefix + "iedName is missing" );
...@@ -1158,7 +1158,7 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN { ...@@ -1158,7 +1158,7 @@ public class ClientLNImpl extends SclObjectImpl implements ClientLN {
return; return;
} }
setRefersToAnyLN( anyLN.getLeft() ); 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 } //ClientLNImpl
...@@ -983,7 +983,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP { ...@@ -983,7 +983,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
// apName a name identifying this access point within the IED // apName a name identifying this access point within the IED
// desc some descriptive text for this access point at this subnetwork // 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() ) { if(( getIedName() == null ) || getIedName().isEmpty() ) {
console.warning( messagePrefix + "iedName is missing" ); console.warning( messagePrefix + "iedName is missing" );
...@@ -1010,7 +1010,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP { ...@@ -1010,7 +1010,7 @@ public class ConnectedAPImpl extends UnNamingImpl implements ConnectedAP {
return; return;
} }
setRefersToAccessPoint( ap.getLeft() ); 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 } //ConnectedAPImpl
...@@ -654,7 +654,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl ...@@ -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. // 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. // 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() ) { if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
console.warning( messagePrefix + "ldInst is missing" ); console.warning( messagePrefix + "ldInst is missing" );
...@@ -704,7 +704,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl ...@@ -704,7 +704,7 @@ public abstract class ControlBlockImpl extends UnNamingImpl implements ControlBl
return; return;
} }
setRefersToControlWithIEDName( res2.get( 0 )); 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 } //ControlBlockImpl
...@@ -573,7 +573,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control { ...@@ -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, // 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. // 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() ) { if(( getDatSet() == null ) || getDatSet().isEmpty() ) {
console.warning( messagePrefix + "datSet is missing" ); console.warning( messagePrefix + "datSet is missing" );
...@@ -598,7 +598,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control { ...@@ -598,7 +598,7 @@ public abstract class ControlImpl extends UnNamingImpl implements Control {
return; return;
} }
setRefersToDataSet( res.get( 0 )); 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 } //ControlImpl
...@@ -963,7 +963,7 @@ public class DAIImpl extends UnNamingImpl implements DAI { ...@@ -963,7 +963,7 @@ public class DAIImpl extends UnNamingImpl implements DAI {
// see Issue #13 // see Issue #13
super.doBuildExplicitLinks( console ); 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() ) { if(( getName() == null ) || getName().isEmpty() ) {
console.warning( messagePrefix + "name is missing" ); console.warning( messagePrefix + "name is missing" );
...@@ -1006,7 +1006,7 @@ public class DAIImpl extends UnNamingImpl implements DAI { ...@@ -1006,7 +1006,7 @@ public class DAIImpl extends UnNamingImpl implements DAI {
return; return;
} }
setRefersToAbstractDataAttribute( res.get( 0 ) ); 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 ) { private void doBuildExplicitLinkWithParentSDI( IRiseClipseConsole console, String messagePrefix ) {
...@@ -1034,7 +1034,7 @@ public class DAIImpl extends UnNamingImpl implements DAI { ...@@ -1034,7 +1034,7 @@ public class DAIImpl extends UnNamingImpl implements DAI {
return; return;
} }
setRefersToAbstractDataAttribute( res.get( 0 )); 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 } //DAIImpl
...@@ -769,7 +769,7 @@ public class DOIImpl extends UnNamingImpl implements DOI { ...@@ -769,7 +769,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
// see Issue #13 // see Issue #13
super.doBuildExplicitLinks( console ); 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() ) { if(( getName() == null ) || getName().isEmpty() ) {
console.warning( messagePrefix + "name is missing" ); console.warning( messagePrefix + "name is missing" );
...@@ -795,7 +795,7 @@ public class DOIImpl extends UnNamingImpl implements DOI { ...@@ -795,7 +795,7 @@ public class DOIImpl extends UnNamingImpl implements DOI {
return; return;
} }
setRefersToDO( res.get( 0 ) ); 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 } //DOIImpl
...@@ -489,7 +489,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO { ...@@ -489,7 +489,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
// access control definition applies // access control definition applies
// transient If set to true, it indicates that the Transient definition from IEC 61850-7-4 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() ) { if(( getType() == null ) || getType().isEmpty() ) {
console.warning( messagePrefix + "type is missing" ); console.warning( messagePrefix + "type is missing" );
...@@ -512,7 +512,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO { ...@@ -512,7 +512,7 @@ public class DOImpl extends AbstractDataObjectImpl implements DO {
return; return;
} }
setRefersToDOType( res.get( 0 )); 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 } //DOImpl
...@@ -2431,7 +2431,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { ...@@ -2431,7 +2431,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
// see Issue #13 // see Issue #13
super.doBuildExplicitLinks( console ); 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 ); Pair< IED, LDevice > args = doBuildExplicitDataLink( console, messagePrefix );
doBuildExplicitCBLink( console, messagePrefix, args ); doBuildExplicitCBLink( console, messagePrefix, args );
} }
...@@ -2569,7 +2569,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { ...@@ -2569,7 +2569,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
// Set link to DO/SDO only if no daName // Set link to DO/SDO only if no daName
if( getDaName() == null ) { if( getDaName() == null ) {
setRefersToAbstractDataObject( ado ); 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; return finalRes;
} }
...@@ -2618,7 +2618,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { ...@@ -2618,7 +2618,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
console.verbose( messagePrefix + "found " + mess4b + " on line " + da.getLineNumber() ); 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 ); setRefersToAbstractDataAttribute( da );
return finalRes; return finalRes;
...@@ -2692,7 +2692,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef { ...@@ -2692,7 +2692,7 @@ public class ExtRefImpl extends BaseElementImpl implements ExtRef {
return; return;
} }
setRefersToControl( res7.get( 0 )); 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 } //ExtRefImpl
...@@ -1062,7 +1062,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA { ...@@ -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 // 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. // 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() ) { if(( getLdInst() == null ) || getLdInst().isEmpty() ) {
console.warning( messagePrefix + "ldInst is missing" ); console.warning( messagePrefix + "ldInst is missing" );
...@@ -1209,7 +1209,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA { ...@@ -1209,7 +1209,7 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
// TODO: do we have to check if fc is right ? // TODO: do we have to check if fc is right ?
// TODO: ix is ignored ! // 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 ); getRefersToAbstractDataAttribute().add( da );
} }
...@@ -1225,11 +1225,11 @@ public class FCDAImpl extends SclObjectImpl implements FCDA { ...@@ -1225,11 +1225,11 @@ public class FCDAImpl extends SclObjectImpl implements FCDA {
if( getRefersToAbstractDataAttribute().size() > 0 ) { if( getRefersToAbstractDataAttribute().size() > 0 ) {
for( AbstractDataAttribute a : getRefersToAbstractDataAttribute() ) { 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 { 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" );
} }
} }
......
...@@ -1198,7 +1198,7 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName { ...@@ -1198,7 +1198,7 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
// We only set the most precise RefersTo (IED / LDevice / AnyLN) // 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() ) { if(( getValue() == null ) || getValue().isEmpty() ) {
console.warning( messagePrefix + "value is missing" ); console.warning( messagePrefix + "value is missing" );
...@@ -1268,7 +1268,7 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName { ...@@ -1268,7 +1268,7 @@ public class IEDNameImpl extends SclObjectImpl implements IEDName {
return; return;
} }
setRefersToAnyLN( anyLN.getLeft() ); 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 } //IEDNameImpl
...@@ -549,7 +549,7 @@ public class KDCImpl extends SclObjectImpl implements KDC { ...@@ -549,7 +549,7 @@ public class KDCImpl extends SclObjectImpl implements KDC {
// see Issue #13 // see Issue #13
super.doBuildExplicitLinks( console ); 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() ) { if(( getIedName() == null ) || getIedName().isEmpty() ) {
console.warning( messagePrefix + "iedName is missing" ); console.warning( messagePrefix + "iedName is missing" );
...@@ -577,7 +577,7 @@ public class KDCImpl extends SclObjectImpl implements KDC { ...@@ -577,7 +577,7 @@ public class KDCImpl extends SclObjectImpl implements KDC {
return; return;
} }
setRefersToAccessPoint( ap.getLeft() ); 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 } //KDCImpl
...@@ -1059,7 +1059,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode { ...@@ -1059,7 +1059,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
// see Issue #13 // see Issue #13
super.doBuildExplicitLinks( console ); 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 ); doBuildExplicitAnyLNLink( console, messagePrefix );
doBuildExplicitLNodeTypeLink( console, messagePrefix ); doBuildExplicitLNodeTypeLink( console, messagePrefix );
} }
...@@ -1124,7 +1124,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode { ...@@ -1124,7 +1124,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
return; return;
} }
setRefersToAnyLN( anyLN.getLeft() ); 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 ) { private void doBuildExplicitLNodeTypeLink( IRiseClipseConsole console, String mPrefix ) {
...@@ -1156,7 +1156,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode { ...@@ -1156,7 +1156,7 @@ public class LNodeImpl extends UnNamingImpl implements LNode {
return; return;
} }
setRefersToLNodeType( res.get( 0 ) ); 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() )) { if(( getLnClass() != null ) && ! getLnClass().equals( getRefersToLNodeType().getLnClass() )) {
console.warning( messagePrefix + "lnClass in " + mess + "(" + getRefersToLNodeType().getLnClass() + ") is not " + getLnClass() ); console.warning( messagePrefix + "lnClass in " + mess + "(" + getRefersToLNodeType().getLnClass() + ") is not " + getLnClass() );
......
...@@ -1251,7 +1251,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont ...@@ -1251,7 +1251,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
// logEna TRUE enables immediate logging; FALSE prohibits logging until enabled online // 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 // 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() ) { if(( getLogName() == null ) || getLogName().isEmpty() ) {
console.warning( messagePrefix + "logName is missing" ); console.warning( messagePrefix + "logName is missing" );
...@@ -1288,7 +1288,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont ...@@ -1288,7 +1288,7 @@ public class LogControlImpl extends ControlWithTriggerOptImpl implements LogCont
return; return;
} }
setRefersToAnyLN( anyLN.getLeft() ); 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() );
} }
......
...@@ -971,7 +971,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { ...@@ -971,7 +971,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
// see Issue #13 // see Issue #13
super.doBuildExplicitLinks( console ); 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() ) { if(( getName() == null ) || getName().isEmpty() ) {
console.warning( messagePrefix + "name is missing" ); console.warning( messagePrefix + "name is missing" );
...@@ -1016,7 +1016,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { ...@@ -1016,7 +1016,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
} }
if( res1.size() == 1 ) { if( res1.size() == 1 ) {
setRefersToSDO( res1.get( 0 )); 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; return;
} }
...@@ -1038,7 +1038,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { ...@@ -1038,7 +1038,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
return; return;
} }
setRefersToAbstractDataAttribute( res2.get( 0 )); 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 ) { private void doResolveLinkWithParentSDI( IRiseClipseConsole console, String messagePrefix ) {
...@@ -1067,7 +1067,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { ...@@ -1067,7 +1067,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
} }
if( res1.size() == 1 ) { if( res1.size() == 1 ) {
setRefersToSDO( res1.get( 0 )); 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; return;
} }
...@@ -1089,7 +1089,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { ...@@ -1089,7 +1089,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
return; return;
} }
setRefersToAbstractDataAttribute( res2.get( 0 )); 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; return;
} }
...@@ -1121,7 +1121,7 @@ public class SDIImpl extends UnNamingImpl implements SDI { ...@@ -1121,7 +1121,7 @@ public class SDIImpl extends UnNamingImpl implements SDI {
return; return;
} }
setRefersToAbstractDataAttribute( res.get( 0 )); 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 } //SDIImpl
...@@ -396,7 +396,7 @@ public class SDOImpl extends AbstractDataObjectImpl implements SDO { ...@@ -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, // 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) // if this element has an ARRAY type. If missing, the default value is 0 (no array)