Merge branch...

Merge branch '30-digits-at-the-end-of-a-do-name-is-an-instance-number-only-when-the-presence-condition-requires' into 'master'

Resolve "digits at the end of a DO name is an instance number only when the presence condition requires one"

Closes #30

See merge request !31

fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java

@@ -452,9 +452,9 @@ public class RiseClipseValidatorSCL {
         console.info( "    dominique.marcadet@centralesupelec.fr" );
         console.info( "    aurelie.dehouck-neveu@edf.fr" );
         console.info( "Web site:" );
-        console.info( "    http://wdi.supelec.fr/software/RiseClipse/" );
+        console.info( "    http://wdi.centralesupelec.fr/software/RiseClipse/" );
         console.info( "" );
-        console.info( "RiseClipseValidatorSCL version: 1.1.0 a18 (19 February 2020)" );
+        console.info( "RiseClipseValidatorSCL version: 1.1.0 a19 (31 March 2020)" );
         console.info( "" );
     }
 

fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/DataObjectPresenceConditionValidator.java

@@ -15,7 +15,7 @@
 **      dominique.marcadet@centralesupelec.fr
 **      aurelie.dehouck-neveu@edf.fr
 **  Web site:
-**      http://wdi.supelec.fr/software/RiseClipse/
+**      http://wdi.centralesupelec.fr/software/RiseClipse/
 *************************************************************************
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.nsd;
@@ -626,16 +626,17 @@ public class DataObjectPresenceConditionValidator {
     
     private boolean addDO( DO do_, String anyLNClassName, DiagnosticChain diagnostics ) {
         // An instance number may be set as a suffix
-        String[] names;
-        if( do_.getName().matches( "[a-zA-Z]+\\d+" )) {
+        // but a number at the end of the name is not always an instance number !
+        // Therefore, we first look for with the full name, then with the name without the suffix
+        
+        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 );
-        }
-        else {
-            names = new String[] { do_.getName() };
-        }
-        if( names.length == 0 ) {
-            console.error( "[NSD validation] Unexpected DO name " + do_.getName() + " in LNodeType (line " + do_.getParentLNodeType().getLineNumber() );
-            return false;
+            if( names.length == 0 ) {
+                console.error( "[NSD validation] Unexpected DO name " + do_.getName() + " in LNodeType (line " + do_.getParentLNodeType().getLineNumber() );
+                return false;
+            }
         }
         if( ! presentDO.containsKey( names[0] )) {
             if( base != null ) {