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 ace035bf5c99907a0c4b0eba74a789145892ccf3..e74c4340aa806506bc5b4de1ce5ba206b733c7c5 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 1998ef94af2847b0f0c7a526064e647f51134f56..9a0202a8ae648903b3ae211ed340385d2de10692 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 );