Commit 719231e5 authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '18-update-to-changes-in-main' into 'master'

Resolve "update to changes in Main"

Closes #18

See merge request !17
parents 08f6bd32 f6cf74e8
Pipeline #7626 failed with stages
in 16 seconds
...@@ -24,15 +24,17 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage; ...@@ -24,15 +24,17 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceFactoryImpl; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceFactoryImpl;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.util.NsdResourceSetImpl;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
import fr.centralesupelec.edf.riseclipse.util.RiseClipseModelLoader; import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseModelLoader;
public class NsdModelLoader extends RiseClipseModelLoader { public class NsdModelLoader extends AbstractRiseClipseModelLoader {
public NsdModelLoader( IRiseClipseConsole console ) { public NsdModelLoader( IRiseClipseConsole console ) {
super( console ); super( console );
reset();
} }
@Override // @Override
public void reset() { public void reset() {
super.reset( new NsdResourceSetImpl( true, console ) ); super.reset( new NsdResourceSetImpl( true, console ) );
......
...@@ -21,16 +21,15 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.util; ...@@ -21,16 +21,15 @@ package fr.centralesupelec.edf.riseclipse.iec61850.nsd.util;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSet; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSet;
import fr.centralesupelec.edf.riseclipse.util.RiseClipseResourceSetFactory; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSetFactory;
public class NsdResourceSetFactory extends RiseClipseResourceSetFactory { public class NsdResourceSetFactory implements IRiseClipseResourceSetFactory {
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.centralesupelec.edf.riseclipse.util.RiseClipseResourceSetFactory#createResourceSet() * @see fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSetFactory#createResourceSet()
*/ */
@Override @Override
public IRiseClipseResourceSet createResourceSet( boolean strictContent, IRiseClipseConsole console ) { public IRiseClipseResourceSet createResourceSet( boolean strictContent, IRiseClipseConsole console ) {
// TODO Auto-generated method stub
return new NsdResourceSetImpl( strictContent, console ); return new NsdResourceSetImpl( strictContent, console );
} }
......
...@@ -36,10 +36,10 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS; ...@@ -36,10 +36,10 @@ import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NS;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc; import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NSDoc;
import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole; import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole;
import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole; import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
import fr.centralesupelec.edf.riseclipse.util.RiseClipseResourceSet; import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseResourceSet;
public class NsdResourceSetImpl extends RiseClipseResourceSet { public class NsdResourceSetImpl extends AbstractRiseClipseResourceSet {
private Map< String, NS > nsdResources; private Map< String, NS > nsdResources;
private Map< String, NSDoc > nsdocResources; private Map< String, NSDoc > nsdocResources;
...@@ -92,7 +92,7 @@ public class NsdResourceSetImpl extends RiseClipseResourceSet { ...@@ -92,7 +92,7 @@ public class NsdResourceSetImpl extends RiseClipseResourceSet {
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see fr.centralesupelec.edf.riseclipse.util.RiseClipseResourceSet#finalizeLoad(fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole) * @see fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseResourceSet#finalizeLoad(fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole)
*/ */
@Override @Override
public void finalizeLoad( IRiseClipseConsole console ) { public void finalizeLoad( IRiseClipseConsole 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