diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java index c500b7066d8ccd8ef86c6a012fa9638b7a99be87..97fc8ec20ce497384d5fc72742aafd4cae95cd06 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java @@ -445,7 +445,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 a17 (11 February 2020)" ); + console.info( "RiseClipseValidatorSCL version: 1.1.0 a17 (12 February 2020)" ); console.info( "" ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java index db0d07e3a706d30c929a388847ae0e47e1fdc095..8926594b68213bcef6c9cd2f3bb8be2f1f91913a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.validator/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java @@ -154,7 +154,9 @@ public class EnumerationValidator extends TypeValidator { Diagnostic.ERROR, RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE, 0, - "[NSD validation] value \"" + value + "\" of DA/BDA \"" + name + "\" (line = " + daOrDai.getLineNumber() + ") is not valid for enumeration \"" + this.name + "\"", + "[NSD validation] value \"" + value + "\" of DA/BDA/DAI \"" + name + "\" (line = " + + daOrDai.getLineNumber() + ") is not valid for EnumType \"" + + enumType.getId() + "\" (line = " + enumType.getLineNumber() + ")", new Object[] { daOrDai } )); res = false; } @@ -183,7 +185,7 @@ public class EnumerationValidator extends TypeValidator { RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE, 0, "[NSD validation] EnumVal with ord \"" + enumVal.getOrd() + "\" in EnumType (id = " + enumType.getId() - + ") at line " + enumVal.getLineNumber() + " is no defined as LiteralVal in Enumeration " + getName(), + + ") at line " + enumVal.getLineNumber() + " is no defined as LiteralVal in standard Enumeration " + getName(), new Object[] { enumVal } )); res = false; }