From 9154c4dc30b434468c1a2801d0428267827e3cc6 Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Tue, 25 Jun 2019 09:29:03 +0200
Subject: [PATCH] update to console changes
---
.../iec61850/nsd/utilities/NsdModelLoader.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/utilities/NsdModelLoader.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/utilities/NsdModelLoader.java
index 2e5cd75..c307411 100644
--- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/utilities/NsdModelLoader.java
+++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/utilities/NsdModelLoader.java
@@ -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.util.NsdResourceFactoryImpl;
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;
public class NsdModelLoader extends AbstractRiseClipseModelLoader {
- public NsdModelLoader( IRiseClipseConsole console ) {
- super( console );
-
+ public NsdModelLoader() {
reset();
}
// @Override
public void reset() {
- super.reset( new NsdResourceSetImpl( false, console ) );
+ super.reset( new NsdResourceSetImpl( false ));
// Register the appropriate resource factory to handle all file
// extensions.
@@ -55,7 +53,7 @@ public class NsdModelLoader extends AbstractRiseClipseModelLoader {
public Resource loadWithoutValidation( String name ) {
Object eValidator = EValidator.Registry.INSTANCE.remove( NsdPackage.eINSTANCE );
- Resource resource = load( name );
+ Resource resource = load( name, AbstractRiseClipseConsole.getConsole() );
if( eValidator != null ) {
EValidator.Registry.INSTANCE.put( NsdPackage.eINSTANCE, eValidator );
--
GitLab