Merge branch...

Merge branch '22-enumtype-must-not-use-a-different-id-if-it-is-identical-to-the-nsd-one' into 'master'

Resolve "EnumType must not use a different id if it is identical to the NSD one"

Closes #22

See merge request !22

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

@@ -312,7 +312,7 @@ public class RiseClipseValidatorSCL {
         console.info( "Web site:" );
         console.info( "    http://wdi.supelec.fr/software/RiseClipse/" );
         console.info( "" );
-        console.info( "RiseClipseValidatorSCL version: 1.1.0 a11 (4 July 2019)" );
+        console.info( "RiseClipseValidatorSCL version: 1.1.0 a13 (26 July 2019)" );
         console.info( "" );
     }
 

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

@@ -238,7 +238,16 @@ public class EnumerationValidator extends TypeValidator {
                     RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
                     0,
                     "[NSD validation] EnumType (id = " + enumType.getId() + ") at line " + enumType.getLineNumber()
-                        + " must use a different id because it extends or restricts the standard Enumeration",
+                        + " must use a different id because it extends or restricts the standard Enumeration " + getName(),
+                    new Object[] { enumType } ));
+        }
+        else if( ! sameName && res ) {
+            diagnostics.add( new BasicDiagnostic(
+                    Diagnostic.ERROR,
+                    RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
+                    0,
+                    "[NSD validation] EnumType (id = " + enumType.getId() + ") at line " + enumType.getLineNumber()
+                        + " must use " + getName() + " as id because it is identical to the standard Enumeration",
                     new Object[] { enumType } ));
         }