From d24798a33d3a281b7bd3df932154d73c159fba7c Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Wed, 12 Feb 2020 09:15:49 +0100
Subject: [PATCH] small improvements on error messages
---
.../iec61850/scl/validator/RiseClipseValidatorSCL.java | 2 +-
.../iec61850/scl/validator/nsd/EnumerationValidator.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
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 c500b70..97fc8ec 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 db0d07e..8926594 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;
}
--
GitLab