From c84b500cfdc52a6874b547724b6b2d5f61e6cc1e Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Thu, 6 Jun 2019 15:22:38 +0200
Subject: [PATCH] name of enumeration may differ from id of EnumType
---
.../validator/nsd/EnumerationValidator.java | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java
index 803af2f..1c12089 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/nsd/EnumerationValidator.java
@@ -89,15 +89,16 @@ public class EnumerationValidator extends TypeValidator {
new Object[] { ada } ));
res = false;
}
- if( ! getName().equals( ada.getType() )) {
- diagnostics.add( new BasicDiagnostic(
- Diagnostic.ERROR,
- RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
- 0,
- "[NSD validation] type of DA/BDA \"" + ada.getName() + "\" (line = " + ada.getLineNumber() + ") is not " + getName(),
- new Object[] { ada } ));
- res = false;
- }
+ // Name may differ
+// if( ! getName().equals( ada.getType() )) {
+// diagnostics.add( new BasicDiagnostic(
+// Diagnostic.ERROR,
+// RiseClipseValidatorSCL.DIAGNOSTIC_SOURCE,
+// 0,
+// "[NSD validation] type of DA/BDA \"" + ada.getName() + "\" (line = " + ada.getLineNumber() + ") is not " + getName(),
+// new Object[] { ada } ));
+// res = false;
+// }
for( Val val : ada.getVal() ) {
res = validateValue( ada, val.getValue(), diagnostics ) && res;
}
@@ -192,7 +193,8 @@ public class EnumerationValidator extends TypeValidator {
}
}
- // TODO: do we have to check that all literals in Enumeration are present as EnumVal ?
+ // we do not have to check that all literals in Enumeration are present as EnumVal
+ // See comment in issue #13
return res;
}
--
GitLab