From 33f38a7e02b5657dcbda39e59c37891a82d6e204 Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Wed, 29 May 2019 10:20:21 +0200
Subject: [PATCH] define default NsIdentification as a constant
---
.../scl/validator/RiseClipseValidatorSCL.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
index f4c7dc6..1e57724 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsIdentification;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SclItemProviderAdapterFactory;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities.SclModelLoader;
@@ -51,6 +52,18 @@ public class RiseClipseValidatorSCL {
public static final String DIAGNOSTIC_SOURCE = "fr.centralesupelec.edf.riseclipse";
+ private static final String DEFAULT_NAMESPACE_ID = "IEC 61850-7-4";
+ private static final Integer DEFAULT_NAMESPACE_VERSION = new Integer( 2007 );
+ private static final String DEFAULT_NAMESPACE_REVISION = "B";
+ private static final Integer DEFAULT_NAMESPACE_RELEASE = null;
+
+ public static final NsIdentification DEFAULT_NS_IDENTIFICATION = new NsIdentification(
+ DEFAULT_NAMESPACE_ID,
+ DEFAULT_NAMESPACE_VERSION,
+ DEFAULT_NAMESPACE_REVISION,
+ DEFAULT_NAMESPACE_RELEASE
+ );
+
private static OCLValidator oclValidator;
private static SclItemProviderAdapterFactory sclAdapter;
private static SclModelLoader sclLoader;
--
GitLab