Commit 1f3ce250 authored by Dominique Marcadet's avatar Dominique Marcadet

missing modification after console changes

parent 9154c4dc
......@@ -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 );
}
}
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment