Merge branch '55-update-to-new-console-handling-changes-in-main' into 'master'

Resolve "update to new console handling changes in Main"

Closes #55

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!50

fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/utilities/SclModelLoader.java

@@ -24,20 +24,17 @@ import org.eclipse.emf.ecore.resource.Resource;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclResourceFactoryImpl;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclResourceSetImpl;
-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.TextRiseClipseConsole;
 
 public class SclModelLoader extends AbstractRiseClipseModelLoader {
 
-    public SclModelLoader( IRiseClipseConsole console ) {
-        super( console );
-        
+    public SclModelLoader() {
         reset();
     }
 
     public void reset() {
-        super.reset( new SclResourceSetImpl( false, console ));
+        super.reset( new SclResourceSetImpl( false ));
 
         // Register the appropriate resource factory to handle all file
         // extensions.
@@ -51,7 +48,7 @@ public class SclModelLoader extends AbstractRiseClipseModelLoader {
     public Resource loadWithoutValidation( String name ) {
         Object eValidator = EValidator.Registry.INSTANCE.remove( SclPackage.eINSTANCE );
 
-        Resource resource = load( name );
+        Resource resource = load( name, AbstractRiseClipseConsole.getConsole() );
 
         if( eValidator != null ) {
             EValidator.Registry.INSTANCE.put( SclPackage.eINSTANCE, eValidator );
@@ -60,12 +57,11 @@ public class SclModelLoader extends AbstractRiseClipseModelLoader {
     }
 
     public static void main( String[] args ) {
-        IRiseClipseConsole console = new TextRiseClipseConsole();
-        SclModelLoader loader = new SclModelLoader( console );
+        SclModelLoader loader = new SclModelLoader();
 
         for( int i = 0; i < args.length; ++i ) {
             @SuppressWarnings( "unused" )
-            Resource resource = loader.load( args[i] );
+            Resource resource = loader.load( args[i], AbstractRiseClipseConsole.getConsole() );
         }
     }
 

fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceSetFactory.java

@@ -19,7 +19,6 @@
  */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.util;
 
-import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSet;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSetFactory;
 
@@ -29,8 +28,8 @@ public class SclResourceSetFactory implements IRiseClipseResourceSetFactory {
      * @see fr.centralesupelec.edf.riseclipse.util.IRiseClipseResourceSetFactory#createResourceSet()
      */
     @Override
-    public IRiseClipseResourceSet createResourceSet( boolean strictContent, IRiseClipseConsole console ) {
-        return new SclResourceSetImpl( strictContent, console );
+    public IRiseClipseResourceSet createResourceSet( boolean strictContent ) {
+        return new SclResourceSetImpl( strictContent );
     }
 
 }

fr.centralesupelec.edf.riseclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclResourceSetImpl.java

@@ -42,8 +42,8 @@ public class SclResourceSetImpl extends AbstractRiseClipseResourceSet {
     
     private SclResourceFactoryImpl resourceFactory;
 
-    public SclResourceSetImpl( boolean strictContent, IRiseClipseConsole console ) {
-        super( strictContent, console );
+    public SclResourceSetImpl( boolean strictContent ) {
+        super( strictContent );
         
         resourceFactory = new SclResourceFactoryImpl();
     }