From 6d426f5c10de427ad2850710a9765492ea6acce1 Mon Sep 17 00:00:00 2001 From: Dominique Marcadet Date: Wed, 10 Jul 2024 11:23:48 +0200 Subject: [PATCH] Warnings about explicit links commented out --- .../scl/impl/AbstractDataAttributeImpl.java | 22 ++--- .../iec61850/scl/impl/AnyLNImpl.java | 22 ++--- .../iec61850/scl/impl/AssociationImpl.java | 28 +++--- .../iec61850/scl/impl/ClientLNImpl.java | 44 ++++----- .../iec61850/scl/impl/ConnectedAPImpl.java | 20 ++-- .../iec61850/scl/impl/ControlBlockImpl.java | 24 ++--- .../iec61850/scl/impl/ControlImpl.java | 12 +-- .../riseclipse/iec61850/scl/impl/DAIImpl.java | 22 ++--- .../riseclipse/iec61850/scl/impl/DOIImpl.java | 10 +- .../riseclipse/iec61850/scl/impl/DOImpl.java | 12 +-- .../iec61850/scl/impl/ExtRefImpl.java | 76 +++++++-------- .../iec61850/scl/impl/FCDAImpl.java | 58 +++++------ .../iec61850/scl/impl/IEDNameImpl.java | 38 ++++---- .../riseclipse/iec61850/scl/impl/KDCImpl.java | 20 ++-- .../iec61850/scl/impl/LDeviceImpl.java | 40 ++++---- .../riseclipse/iec61850/scl/impl/LNImpl.java | 96 +++++++++---------- .../iec61850/scl/impl/LNodeImpl.java | 42 ++++---- .../iec61850/scl/impl/LogControlImpl.java | 22 ++--- .../riseclipse/iec61850/scl/impl/SDIImpl.java | 42 ++++---- .../riseclipse/iec61850/scl/impl/SDOImpl.java | 16 ++-- .../iec61850/scl/impl/ServerAtImpl.java | 12 +-- .../iec61850/scl/impl/TerminalImpl.java | 52 +++++----- 22 files changed, 365 insertions(+), 365 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 8a06c3f2..fd364ccb 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 @@ -1549,18 +1549,18 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { if( !( "Enum".equals( getBType() ) || "Struct".equals( getBType() ) ) ) { return; } - String messagePrefix = "while resolving link from AbstractDataAttribute: "; +// String messagePrefix = "while resolving link from AbstractDataAttribute: "; if( ( getType() == null ) || getType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "type is missing" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1575,9 +1575,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " EnumType( id = ", getType(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " EnumType( id = ", getType(), " )" ); return; } setRefersToEnumType( res.get( 0 ) ); @@ -1596,9 +1596,9 @@ else if( "Struct".equals( getBType() ) ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " DAType( id = ", getType(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " DAType( id = ", getType(), " )" ); return; } setRefersToDAType( res.get( 0 ) ); 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 d10cbe84..fa371835 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 @@ -1511,17 +1511,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // 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: "; +// String messagePrefix = "while resolving link from AnyLN on line: "; if( ( getLnType() == null ) || getLnType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "lnType is missing" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1532,9 +1532,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " LNodeType( id = ", getLnType(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " LNodeType( id = ", getLnType(), " )" ); return; } setRefersToLNodeType( res.get( 0 ) ); @@ -1543,9 +1543,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { " ) on line ", getRefersToLNodeType().getLineNumber() ); if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", - getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); +// 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 67112527..dda35f28 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 @@ -1317,18 +1317,18 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from Association: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "iedName is missing " ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "iedName is missing " ); return; } if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "ldInst is missing " ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "ldInst is missing " ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "lnClass is missing " ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "lnClass is missing " ); return; } @@ -1336,9 +1336,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getIedName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), +// " IED( name = ", getIedName(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1349,9 +1349,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), +// " LDevice( inst = ", getLdInst(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1369,8 +1369,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); 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 1df0d2d0..9aa04432 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 @@ -1167,18 +1167,18 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from ClientLN: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "iedName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "iedName is missing" ); return; } if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "ldInst is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "ldInst is missing" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "lnClass is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "lnClass is missing" ); return; } @@ -1186,9 +1186,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find " : "found several " ), - "IED( name = ", getIedName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find " : "found several " ), +// "IED( name = ", getIedName(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1197,14 +1197,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< AccessPoint, Integer > ap = null; if( ( getApRef() == null ) || getApRef().isEmpty() ) { if( ied.getLeft().getAccessPoint().size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), - " ) but apRef not specified" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// 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,9 +1212,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { else { ap = SclUtilities.getAccessPoint( ied.getLeft(), getApRef() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApRef(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), +// " AccessPoint( name = ", getApRef(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1231,9 +1231,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), +// " LDevice( inst = ", getLdInst(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1249,8 +1249,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); 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 7a857a41..9de23065 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 @@ -1088,13 +1088,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from ConnectedAP: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "iedName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "iedName is missing" ); return; } if( ( getApName() == null ) || getApName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "apName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "apName is missing" ); return; } @@ -1103,9 +1103,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getIedName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), +// " IED( name = ", getIedName(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1113,9 +1113,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { ied.getLeft().getLineNumber() ); Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied.getLeft(), getApName() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), +// " AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); 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 8dd3484d..4b5b2480 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 @@ -742,13 +742,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from ControlBlock: "; if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "ldInst is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "ldInst is missing" ); return; } if( ( getCbName() == null ) || getCbName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "cbName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "cbName is missing" ); return; } @@ -765,9 +765,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), +// " LDevice( inst = ", getLdInst(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -777,8 +777,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // Find a ControlWithIEDName inside LN0 of LDevice with // ControlWithIEDName.name == ControlBlock.bName if( lDevice.getLeft().getLN0() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "LN0 is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "LN0 is missing" ); return; } @@ -792,9 +792,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), - " ControlWithIEDName( name = ", getCbName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), +// " ControlWithIEDName( name = ", getCbName(), " )" ); return; } setRefersToControlWithIEDName( res2.get( 0 ) ); 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 e705fff3..350f76d2 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 @@ -631,11 +631,11 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // 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: "; +// String messagePrefix = "while resolving link from Control: "; if( ( getDatSet() == null ) || getDatSet().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "datSet is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "datSet is missing" ); return; } @@ -653,9 +653,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " DataSet( name = ", getDatSet(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " DataSet( name = ", getDatSet(), " )" ); return; } setRefersToDataSet( res.get( 0 ) ); 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 3fb0ddd0..6d02567b 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 @@ -1072,8 +1072,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from DAI: "; if( ( getName() == null ) || getName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "name is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "name is missing" ); return; } @@ -1114,9 +1114,9 @@ private void doBuildExplicitLinkWithParentDOI( @NonNull IRiseClipseConsole conso .toList(); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), - " DA( name = ", getName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), +// " DA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); @@ -1153,9 +1153,9 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso .toList(); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), - " DA( name = ", getName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), +// " DA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); @@ -1183,9 +1183,9 @@ private void doBuildExplicitLinkWithParentSDI( @NonNull IRiseClipseConsole conso .toList(); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), - " BDA( name = ", getName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), +// " BDA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); 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 2ae734fb..c11345fd 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 @@ -958,8 +958,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from DOI: "; if( ( getName() == null ) || getName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "name is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "name is missing" ); return; } @@ -979,9 +979,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " DO( name = ", getName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " DO( name = ", getName(), " )" ); return; } setRefersToDO( res.get( 0 ) ); 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 def5945f..c7d76804 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 @@ -582,11 +582,11 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // 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: "; +// String messagePrefix = "while resolving link from DO: "; if( ( getType() == null ) || getType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "type is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "type is missing" ); return; } // No error or warning message here: if this happens, error should have been detected before @@ -602,9 +602,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " DOType( id = ", getType(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " DOType( id = ", getType(), " )" ); return; } setRefersToDOType( res.get( 0 ) ); 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 2b652e21..fc5278d0 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 @@ -2638,9 +2638,9 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol ied = SclUtilities.getIED( SclUtilities.getSCL( this ), getIedName() ); } if( ied.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getIedName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), +// " IED( name = ", getIedName(), " )" ); return Pair.of( null, null ); } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -2649,21 +2649,21 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol // Only now so that we can give back ied if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "ldInst is missing" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "lnClass is missing" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); +// 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.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -2681,9 +2681,9 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), +// mess ); return finalRes; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -2714,9 +2714,9 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), - " DO ( name = ", doNames[0], " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), +// " DO ( name = ", doNames[0], " )" ); return finalRes; } @@ -2738,9 +2738,9 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), - " SDO ( name = ", name, " ) in DOType on line ", doType.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 ); @@ -2776,9 +2776,9 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res3.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res3.size() == 0 ) ? "cannot find" : "found several" ), - " DA ( name = ", daNames[0], " ) in DOType" ); +// 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 ); @@ -2798,10 +2798,10 @@ private Pair< IED, LDevice > doBuildExplicitDataLink( @NonNull IRiseClipseConsol .collect( Collectors.toList() ); if( res4.size() != 1 ) { - 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() ); +// 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.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -2843,9 +2843,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = " + getSrcLDInst() + " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), +// " LDevice( inst = " + getSrcLDInst() + " )" ); return; } lDevice = lDevice1.getLeft(); @@ -2867,9 +2867,9 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), +// mess ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -2883,9 +2883,9 @@ private void doBuildExplicitCBLink( @NonNull IRiseClipseConsole console, @NonNul listControls.addAll( lDevice.getLN0().getSampledValueControl() ); } if( listControls.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "control not found because there are none of them in AnyLN line ", - anyLN.getLeft().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; } @@ -2894,9 +2894,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " Control( name = ", getSrcCBName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " Control( name = ", getSrcCBName(), " )" ); return; } setRefersToControl( res.get( 0 ) ); 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 7c0c7a5b..0ae49439 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 @@ -1162,18 +1162,18 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from FCDA: "; if( ( getLdInst() == null ) || getLdInst().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "ldInst is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "ldInst is missing" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "lnClass is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "lnClass is missing" ); return; } if( ( getDoName() == null ) || getDoName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "doName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "doName is missing" ); return; } @@ -1183,8 +1183,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { object = object.eContainer(); } if( object == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "AccessPoint not found" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "AccessPoint not found" ); return; } AccessPoint ap = ( AccessPoint ) object; @@ -1193,9 +1193,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ap, getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, (( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), +// " LDevice( inst = ", getLdInst(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1213,9 +1213,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, (( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), +// mess ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1247,9 +1247,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, (( res1.size() == 0 ) ? "cannot find" : "found several" ), - " DO ( name = ", doNames[0], " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, (( res1.size() == 0 ) ? "cannot find" : "found several" ), +// " DO ( name = ", doNames[0], " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1275,9 +1275,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, (( res2.size() == 0 ) ? "cannot find" : "found several" ), - "SDO ( name = ", name, " ) in DOType on line ", doType.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.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1339,9 +1339,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { continue; } - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, (( res4.size() == 0 ) ? "cannot find" : "found several" ), - " DA or SDO ( name = ", name, " ) in DOType" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, (( res4.size() == 0 ) ? "cannot find" : "found several" ), +// " DA or SDO ( name = ", name, " ) in DOType" ); return; } @@ -1357,10 +1357,10 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res5.size() != 1 ) { - 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() ); +// 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.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1410,8 +1410,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } } else { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - "FCDA does not refer to any AbstractDataAttribute" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// "FCDA does not refer to any AbstractDataAttribute" ); } //@formatter:on 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 7d784484..416fa5d6 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 @@ -1287,8 +1287,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from IEDName: "; if( ( getValue() == null ) || getValue().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "value is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "value is missing" ); return; } @@ -1296,9 +1296,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getValue(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), +// " IED( name = ", getValue(), " )" ); return; } @@ -1317,14 +1317,14 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< AccessPoint, Integer > ap = null; if( ( getApRef() == null ) || getApRef().isEmpty() ) { if( ied.getLeft().getAccessPoint().size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "no AccessPoint found in ied ( name = ", ied.getLeft().getName(), " )" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "found several AccessPoint in ied ( name = ", ied.getLeft().getName(), - " ) but apRef not specified" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// 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,9 +1332,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { else { ap = SclUtilities.getAccessPoint( ied.getLeft(), getApRef() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApRef(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), +// " AccessPoint( name = ", getApRef(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1343,9 +1343,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } Pair< LDevice, Integer > lDevice = SclUtilities.getLDevice( ied.getLeft(), getLdInst() ); if( lDevice.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), +// " LDevice( inst = ", getLdInst(), " )" ); return; } if( ( getLnClass() == null ) || getLnClass().isEmpty() ) { @@ -1368,9 +1368,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), +// mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); 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 ec8132be..6e1b29b5 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 @@ -585,13 +585,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from KDC: "; if( ( getIedName() == null ) || getIedName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "iedName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "iedName is missing" ); return; } if( ( getApName() == null ) || getApName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "apName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "apName is missing" ); return; } @@ -599,9 +599,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - "IED( name = ", getIedName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), +// "IED( name = ", getIedName(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -610,9 +610,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied.getLeft(), getApName() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - "AccessPoint( name = ", getApName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), +// "AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); 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 a7ff22a6..59ad14d4 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 @@ -1306,7 +1306,7 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from LDevice: "; +// String messagePrefix = "while resolving link from LDevice: "; // TODO: warning message ? if( getLN0() == null ) return; @@ -1320,8 +1320,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .toList(); if( grRef.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several DOI named GrRef in LN0" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several DOI named GrRef in LN0" ); return; } @@ -1341,13 +1341,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .toList(); if( setSrcRef.isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no DAI named setSrcRef in GrRef on line ", grRef.get( 0 ).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, getFilename(), getLineNumber(), - messagePrefix, "found several DAI named setSrcRef in GrRef on line ", grRef.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several DAI named setSrcRef in GrRef on line ", grRef.get( 0 ).getLineNumber() ); return; } @@ -1362,28 +1362,28 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } if( val.isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber() ); return; } if( val.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber() ); return; } String higherLevelLDeviceName = val.get( 0 ).getValue();; if(( higherLevelLDeviceName == null ) || ( higherLevelLDeviceName.length() <= 1 )) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no Val or empty Val in setSrcRef on line ", setSrcRef.get( 0 ).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, getFilename(), getLineNumber(), - messagePrefix, "Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber(), - " does not start with @" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "Val in setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber(), +// " does not start with @" ); } else { higherLevelLDeviceName = higherLevelLDeviceName.substring( 1 ); @@ -1400,13 +1400,13 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .toList(); if( lDevices.isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no LDevice named ", higherLevelLDeviceName ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no LDevice named ", higherLevelLDeviceName ); return; } if( lDevices.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several LDevice ", higherLevelLDeviceName ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several LDevice ", higherLevelLDeviceName ); return; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java index 35a4dc40..f37b93ef 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNImpl.java @@ -613,7 +613,7 @@ else if( "LSVS".equals( getLnClass() )) { return; } - String messagePrefix = "while resolving link to ControlWithIEDName from LN lnClass=\"" + getLnClass() + "\": "; +// String messagePrefix = "while resolving link to ControlWithIEDName from LN lnClass=\"" + getLnClass() + "\": "; List< DOI > cBRef = getDOI() @@ -621,13 +621,13 @@ else if( "LSVS".equals( getLnClass() )) { .filter( doi -> doiName.equals( doi.getName() )) .collect( Collectors.toList() ); if( cBRef.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several DOI named ", doiName ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several DOI named ", doiName ); return; } if( cBRef.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no DOI named ", doiName ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no DOI named ", doiName ); return; } @@ -640,29 +640,29 @@ else if( "LSVS".equals( getLnClass() )) { .filter( dai -> "setSrcRef".equals( dai.getName() )) .toList(); if( setSrcRef.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no DAI named setSrcRef in ", doiName, - " on line ", cBRef.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no DAI named setSrcRef in ", doiName, +// " on line ", cBRef.get( 0 ).getLineNumber() ); return; } if( setSrcRef.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several DAI named setSrcRef in ", - doiName, " on line ", cBRef.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several DAI named setSrcRef in ", +// doiName, " on line ", cBRef.get( 0 ).getLineNumber() ); return; } if( setSrcRef.get( 0 ).getVal().size() == 0 ) { // Do not display as warning, too many of them - console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no Val in setSrcRef on line ", - setSrcRef.get( 0 ).getLineNumber() ); +// console.notice( 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, getFilename(), getLineNumber(), - messagePrefix, "found several Val in setSrcRef on line ", - setSrcRef.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several Val in setSrcRef on line ", +// setSrcRef.get( 0 ).getLineNumber() ); return; } @@ -670,23 +670,23 @@ else if( "LSVS".equals( getLnClass() )) { String controlWithIEDName = val.getValue(); if(( controlWithIEDName == null ) || ( controlWithIEDName.length() <= 1 )) { // Do not display as warning, too many of them - console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no Val or empty Val in setSrcRef on line ", - setSrcRef.get( 0 ).getLineNumber() ); +// console.notice( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no Val or empty Val in setSrcRef on line ", +// setSrcRef.get( 0 ).getLineNumber() ); return; } if( controlWithIEDName.indexOf( '/' ) == -1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "Val of setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber(), - " is illformed, it should contain \"/\"" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "Val of setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber(), +// " is illformed, it should contain \"/\"" ); return; } if( ( controlWithIEDName.indexOf( '.' ) == -1 ) || ( controlWithIEDName.indexOf( '.' ) != controlWithIEDName.indexOf( '/' ) + 5 ) || ! "/LLN0.".equals( controlWithIEDName.subSequence( controlWithIEDName.indexOf( '/' ), controlWithIEDName.indexOf( '.' ) + 1 ))) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "Val of setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber(), - " is illformed, it should contain \"/LLN0.\"" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "Val of setSrcRef on line ", setSrcRef.get( 0 ).getLineNumber(), +// " is illformed, it should contain \"/LLN0.\"" ); return; } @@ -698,15 +698,15 @@ else if( "LSVS".equals( getLnClass() )) { .filter( ied -> controlWithIEDName.startsWith( ied.getName() )) .toList(); if( ieds.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no IED whose name is the start of ", - controlWithIEDName, " on line ", val.getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no IED whose name is the start of ", +// controlWithIEDName, " on line ", val.getLineNumber() ); return; } if( ieds.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several IED whose name is the start of ", - controlWithIEDName, " on line ", val.getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several IED whose name is the start of ", +// controlWithIEDName, " on line ", val.getLineNumber() ); return; } String ldInst = controlWithIEDName.substring( ieds.get( 0 ).getName().length(), controlWithIEDName.indexOf( '/' )); @@ -722,22 +722,22 @@ else if( "LSVS".equals( getLnClass() )) { .filter( ld -> ( ld != null ) && ld.getInst().equals( ldInst )) .toList(); if( lDevices.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no LDevice whose inst is ", ldInst, - " in IED on line ", ieds.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no LDevice whose inst is ", ldInst, +// " in IED on line ", ieds.get( 0 ).getLineNumber() ); return; } if( lDevices.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several LDevice whose inst is ", ldInst, - " in IED on line ", ieds.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several LDevice whose inst is ", ldInst, +// " in IED on line ", ieds.get( 0 ).getLineNumber() ); return; } LN0 ln0 = lDevices.get( 0 ).getLN0(); if( ln0 == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no LN0 in LDevice on line ", lDevices.get( 0 ).getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no LN0 in LDevice on line ", lDevices.get( 0 ).getLineNumber() ); return; } @@ -749,17 +749,17 @@ else if( "LSVS".equals( getLnClass() )) { .toList() ); if( controls.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found no ControlWithIEDName whose name is ", - controlWithIEDName.substring( controlWithIEDName.indexOf( '.' ) + 1 ), - " in LN0 on line ", ln0.getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found no ControlWithIEDName whose name is ", +// controlWithIEDName.substring( controlWithIEDName.indexOf( '.' ) + 1 ), +// " in LN0 on line ", ln0.getLineNumber() ); return; } if( controls.size() > 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "found several ControlWithIEDName whose name is ", - controlWithIEDName.substring( controlWithIEDName.indexOf( '.' ) + 1 ), - " in LN0 on line ", ln0.getLineNumber() ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several ControlWithIEDName whose name is ", +// controlWithIEDName.substring( controlWithIEDName.indexOf( '.' ) + 1 ), +// " in LN0 on line ", ln0.getLineNumber() ); return; } 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 5af73c36..b3070663 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 @@ -1151,14 +1151,14 @@ 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, getFilename(), getLineNumber(), - messagePrefix, "link to AnyLN not resolved because iedName is absent or None" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "lnClass is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "lnClass is missing" ); return; } @@ -1166,9 +1166,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), - " IED( name = ", getIedName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ied.getRight() == 0 ) ? "cannot find" : "found several" ), +// " IED( name = ", getIedName(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1179,9 +1179,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), - " LDevice( inst = ", getLdInst(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( lDevice.getRight() == 0 ) ? "cannot find" : "found several" ), +// " LDevice( inst = ", getLdInst(), " )" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1201,9 +1201,9 @@ private void doBuildExplicitAnyLNLink( @NonNull IRiseClipseConsole console, Stri } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), +// mess ); return; } setRefersToAnyLN( anyLN.getLeft() ); @@ -1224,8 +1224,8 @@ private void doBuildExplicitLNodeTypeLink( @NonNull IRiseClipseConsole console, } DataTypeTemplates dtt = SclUtilities.getSCL( this ).getDataTypeTemplates(); if( dtt == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -1236,9 +1236,9 @@ private void doBuildExplicitLNodeTypeLink( @NonNull IRiseClipseConsole console, .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " LNodeType( id = ", getLnType(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " LNodeType( id = ", getLnType(), " )" ); return; } setRefersToLNodeType( res.get( 0 ) ); @@ -1247,9 +1247,9 @@ private void doBuildExplicitLNodeTypeLink( @NonNull IRiseClipseConsole console, getRefersToLNodeType().getLineNumber() ); if( ( getLnClass() != null ) && !getLnClass().equals( getRefersToLNodeType().getLnClass() ) ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "lnClass in LNodeType( id = ", getLnType(), " ) is ", - getRefersToLNodeType().getLnClass(), " and not ", getLnClass() ); +// 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 a20fa2fd..83a91a7d 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 @@ -1241,8 +1241,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from LogControl: "; if( ( getLogName() == null ) || getLogName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "logName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "logName is missing" ); return; } @@ -1259,9 +1259,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), - "LDevice( inst = ", getLdInst(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( lDevice1.getRight() == 0 ) ? "cannot find" : "found several" ), +// "LDevice( inst = ", getLdInst(), " )" ); return; } lDevice = lDevice1.getLeft(); @@ -1280,9 +1280,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { } mess += " )"; if( anyLN.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), - mess ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( anyLN.getRight() == 0 ) ? "cannot find" : "found several" ), +// mess ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1295,9 +1295,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .filter( log -> getLogName().equals( log.getName() ) ) .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), - messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), - " Log( name = ", getLogName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getLineNumber(), +// messagePrefix, ( ( res.isEmpty() ) ? "cannot find" : "found several" ), +// " Log( name = ", getLogName(), " )" ); return; } setRefersToLog( res.get( 0 ) ); 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 270d85a6..d76d9792 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 @@ -1225,8 +1225,8 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { String messagePrefix = "while resolving link from SDI: "; if( ( getName() == null ) || getName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "name is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "name is missing" ); return; } @@ -1267,9 +1267,9 @@ 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, getFilename(), getLineNumber(), - messagePrefix, "found several SDO( name = ", getName(), - " ) using ParentDOI" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several SDO( name = ", getName(), +// " ) using ParentDOI" ); return; } if( res1.size() == 1 ) { @@ -1288,14 +1288,14 @@ private void doResolveLinkWithParentDOI( @NonNull IRiseClipseConsole console, @N // Specific message if res2.size() == 0 if( res2.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "no SDO or DA found using ParentDOI" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "found several DA( name = ", getName(), - " ) using ParentDOI" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several DA( name = ", getName(), +// " ) using ParentDOI" ); return; } setRefersToAbstractDataAttribute( res2.get( 0 ) ); @@ -1327,8 +1327,8 @@ 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, getFilename(), getLineNumber(), - messagePrefix, "found several SDO( name = ", getName(), " ) using ParentSDI" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several SDO( name = ", getName(), " ) using ParentSDI" ); return; } if( res1.size() == 1 ) { @@ -1347,13 +1347,13 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N // Specific message if res2.size() == 0 if( res2.size() == 0 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), messagePrefix, - "no SDO or DA found using ParentSDI" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "found several DA( name = ", getName(), " ) using ParentSDI" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "found several DA( name = ", getName(), " ) using ParentSDI" ); return; } setRefersToAbstractDataAttribute( res2.get( 0 ) ); @@ -1367,8 +1367,8 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N // When getParentSDI().getRefersToSDO() == null AbstractDataAttribute att = getParentSDI().getRefersToAbstractDataAttribute(); if( att == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "cannot find SDO or AbstractDataAttribute using ParentSDI" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "cannot find SDO or AbstractDataAttribute using ParentSDI" ); return; } console.debug( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), @@ -1390,9 +1390,9 @@ private void doResolveLinkWithParentSDI( @NonNull IRiseClipseConsole console, @N .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " BDA( name = ", getName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " BDA( name = ", getName(), " )" ); return; } setRefersToAbstractDataAttribute( res.get( 0 ) ); 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 a2b92bf2..38330a3a 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 @@ -504,17 +504,17 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // 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: "; +// String messagePrefix = "while resolving link from SDO: "; if( ( getType() == null ) || getType().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "type is missing" ); +// 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, getFilename(), getLineNumber(), - messagePrefix, "DataTypeTemplates is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "DataTypeTemplates is missing" ); return; } @@ -525,9 +525,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { .collect( Collectors.toList() ); if( res.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), - " DOType( id = ", getType(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res.size() == 0 ) ? "cannot find" : "found several" ), +// " DOType( id = ", getType(), " )" ); return; } setRefersToDOType( res.get( 0 ) ); 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 2094d75b..4791bb29 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 @@ -490,11 +490,11 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { // see Issue #13 super.doBuildExplicitLinks( console ); - String messagePrefix = "while resolving link from ServerAt: "; +// String messagePrefix = "while resolving link from ServerAt: "; if( ( getApName() == null ) || getApName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "apName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "apName is missing" ); return; } @@ -504,9 +504,9 @@ protected void doBuildExplicitLinks( @NonNull IRiseClipseConsole console ) { Pair< AccessPoint, Integer > ap = SclUtilities.getAccessPoint( ied, getApName() ); if( ap.getLeft() == null ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), - " AccessPoint( name = ", getApName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( ap.getRight() == 0 ) ? "cannot find" : "found several" ), +// " AccessPoint( name = ", getApName(), " )" ); return; } setRefersToAccessPoint( ap.getLeft() ); 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 b4cde4d7..fc6a861e 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 @@ -1208,18 +1208,18 @@ 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, getFilename(), getLineNumber(), - messagePrefix, "cNodeName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "cNodeName is missing" ); return; } if( ( getVoltageLevelName() == null ) || getVoltageLevelName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "voltageLevelName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "voltageLevelName is missing" ); return; } if( ( getBayName() == null ) || getBayName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "bayName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "bayName is missing" ); return; } @@ -1233,9 +1233,9 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), - " Substation( name = ", getSubstationName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), +// " Substation( name = ", getSubstationName(), " )" ); return; } Substation substation = res1.get( 0 ); @@ -1252,9 +1252,9 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), - " VoltageLevel( name = ", getVoltageLevelName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), +// " VoltageLevel( name = ", getVoltageLevelName(), " )" ); return; } VoltageLevel voltageLevel = res2.get( 0 ); @@ -1271,9 +1271,9 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res3.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res3.size() == 0 ) ? "cannot find" : "found several" ), - " Bay( name = ", getBayName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res3.size() == 0 ) ? "cannot find" : "found several" ), +// " Bay( name = ", getBayName(), " )" ); return; } Bay bay = res3.get( 0 ); @@ -1290,9 +1290,9 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons .collect( Collectors.toList() ); if( res4.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res4.size() == 0 ) ? "cannot find" : "found several" ), - " ConnectivityNode( name = ", getCNodeName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res4.size() == 0 ) ? "cannot find" : "found several" ), +// " ConnectivityNode( name = ", getCNodeName(), " )" ); return; } setRefersToConnectivityNode( res4.get( 0 ) ); @@ -1303,8 +1303,8 @@ private void doBuildExplicitLinkWithSubstation( @NonNull IRiseClipseConsole cons private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @NonNull String messagePrefix ) { if( ( getCNodeName() == null ) || getCNodeName().isEmpty() ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, "cNodeName is missing" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, "cNodeName is missing" ); return; } @@ -1318,9 +1318,9 @@ private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @ .collect( Collectors.toList() ); if( res1.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), - " Line( name = ", getLineName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res1.size() == 0 ) ? "cannot find" : "found several" ), +// " Line( name = ", getLineName(), " )" ); return; } Line line = res1.get( 0 ); @@ -1336,9 +1336,9 @@ private void doBuildExplicitLinkWithLine( @NonNull IRiseClipseConsole console, @ .collect( Collectors.toList() ); if( res2.size() != 1 ) { - console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), - messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), - " ConnectivityNode( name = ", getCNodeName(), " )" ); +// console.warning( EXPLICIT_LINK_CATEGORY, getFilename(), getLineNumber(), +// messagePrefix, ( ( res2.size() == 0 ) ? "cannot find" : "found several" ), +// " ConnectivityNode( name = ", getCNodeName(), " )" ); return; } setRefersToConnectivityNode( res2.get( 0 ) );