Merge branch '31-a-do-name-may-contain-digits-inside' into 'master'

Resolve "A DO name may contain digits inside"

Closes #31

See merge request !32

CHANGELOG.md

 
+## 1.1.0a19 (2020/03/31)
+- avoid NPE when lnInst is missing in ExtRef (issue riseclipse-metamodel-scl2003#64)
+- put back inadvertently removed code of DOIImpl.getNamespace (issue riseclipse-metamodel-scl2003#65)
+- do not considered digits at the end of a DO name as an instance number (issues #30 and #31)
+
 ## 1.1.0a18 (2020/02/19)
 - solve multiple displays of OCL messages (issue #26)
 - use of FeatureMap in SCL metamodel removed (issue riseclipse-metamodel-scl2003#63)

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] )) {