From 1f3ce250dffd5f1de6cf25ad758727d89069f5b5 Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Wed, 26 Jun 2019 09:19:36 +0200
Subject: [PATCH] missing modification after console changes
---
.../iec61850/nsd/util/NsdResourceSetFactory.java | 4 ++--
.../riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetFactory.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetFactory.java
index ace035b..e74c434 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetFactory.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetFactory.java
@@ -29,8 +29,8 @@ public class NsdResourceSetFactory implements IRiseClipseResourceSetFactory {
* @see fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSetFactory#createResourceSet()
*/
@Override
- public IRiseClipseResourceSet createResourceSet( boolean strictContent, IRiseClipseConsole console ) {
- return new NsdResourceSetImpl( strictContent, console );
+ public IRiseClipseResourceSet createResourceSet( boolean strictContent ) {
+ return new NsdResourceSetImpl( strictContent );
}
}
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java
index 1998ef9..9a0202a 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsdResourceSetImpl.java
@@ -76,8 +76,8 @@ public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
private Map< NsIdentification, List< ServiceNS > > nsdAdditions = new HashMap<>();
private Map< NsIdentification, NsIdentification > equivalentNamespaces = new HashMap<>();
- public NsdResourceSetImpl( boolean strictContent, IRiseClipseConsole console ) {
- super( strictContent, console );
+ public NsdResourceSetImpl( boolean strictContent ) {
+ super( strictContent );
setEquivalentNamespace(
new NsIdentification( "IEC 61850-7-2", 2007, "B", 1 ),
@@ -180,7 +180,7 @@ public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
nsdAdditions.put( nsId, new ArrayList<>() );
}
nsdAdditions.get( nsId ).add( serviceNSResources.get( serviceNsId ));
- applyServiceNs( serviceNSResources.get( serviceNsId ), nsdResources.get( nsId ), nsId );
+ applyServiceNs( serviceNSResources.get( serviceNsId ), nsdResources.get( nsId ), nsId, console );
}
}
}
@@ -191,7 +191,7 @@ public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
}
- private void applyServiceNs( ServiceNS serviceNS, NS ns, NsIdentification nsIdentification ) {
+ private void applyServiceNs( ServiceNS serviceNS, NS ns, NsIdentification nsIdentification, IRiseClipseConsole console ) {
// A ServiceTypeRealization gives a new definition to an existing (only basic ? never constructed ?) type
for( ConstructedAttribute typeRealization : serviceNS.getServiceTypeRealizations().getServiceTypeRealization() ) {
BasicType basic = findBasicType( typeRealization.getName(), nsIdentification, console );
--
GitLab