Skip to content
Snippets Groups Projects
Commit 9154c4dc authored by Dominique Marcadet's avatar Dominique Marcadet
Browse files

update to console changes

parent 0d2eed15
No related branches found
No related tags found
1 merge request!25Resolve "update to new console handling changes in Main"
Pipeline #1324 failed
...@@ -23,20 +23,18 @@ import org.eclipse.emf.ecore.resource.Resource; ...@@ -23,20 +23,18 @@ import org.eclipse.emf.ecore.resource.Resource;
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage; 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.AbstractRiseClipseConsole;
import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseModelLoader; import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseModelLoader;
public class NsdModelLoader extends AbstractRiseClipseModelLoader { public class NsdModelLoader extends AbstractRiseClipseModelLoader {
public NsdModelLoader( IRiseClipseConsole console ) { public NsdModelLoader() {
super( console );
reset(); reset();
} }
// @Override // @Override
public void reset() { public void reset() {
super.reset( new NsdResourceSetImpl( false, console ) ); super.reset( new NsdResourceSetImpl( false ));
// Register the appropriate resource factory to handle all file // Register the appropriate resource factory to handle all file
// extensions. // extensions.
...@@ -55,7 +53,7 @@ public class NsdModelLoader extends AbstractRiseClipseModelLoader { ...@@ -55,7 +53,7 @@ public class NsdModelLoader extends AbstractRiseClipseModelLoader {
public Resource loadWithoutValidation( String name ) { public Resource loadWithoutValidation( String name ) {
Object eValidator = EValidator.Registry.INSTANCE.remove( NsdPackage.eINSTANCE ); Object eValidator = EValidator.Registry.INSTANCE.remove( NsdPackage.eINSTANCE );
Resource resource = load( name ); Resource resource = load( name, AbstractRiseClipseConsole.getConsole() );
if( eValidator != null ) { if( eValidator != null ) {
EValidator.Registry.INSTANCE.put( NsdPackage.eINSTANCE, eValidator ); EValidator.Registry.INSTANCE.put( NsdPackage.eINSTANCE, eValidator );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment