diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java index bccbaa85dcb79a62a44a2785b510b10caa39fb58..a28a431d79acb0293fc83cf24c8909a55d22a076 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java @@ -631,11 +631,12 @@ public class DataObjectPresenceConditionValidator { String[] names = new String[] { do_.getName() }; if( ! presentDO.containsKey( names[0] )) { - // if( do_.getName().matches( "[a-zA-Z]+\\d+" )) { - names = do_.getName().split( "(?=\\d)", 2 ); - if( names.length == 0 ) { - console.error( "[NSD validation] Unexpected DO name " + do_.getName() + " in LNodeType (line " + do_.getParentLNodeType().getLineNumber() ); - return false; + if( do_.getName().matches( "[a-zA-Z]+\\d+" )) { + names = do_.getName().split( "(?=\\d)", 2 ); + if( names.length != 2 ) { + console.error( "[NSD validation] Unexpected DO name " + do_.getName() + " in LNodeType (line " + do_.getParentLNodeType().getLineNumber() ); + return false; + } } } if( ! presentDO.containsKey( names[0] )) {