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

update to changes in Main

parent ff0eafcf
No related branches found
No related tags found
1 merge request!44Resolve "update to changes in Main"
Pipeline #875 passed
...@@ -23,19 +23,21 @@ import org.eclipse.emf.ecore.resource.Resource; ...@@ -23,19 +23,21 @@ import org.eclipse.emf.ecore.resource.Resource;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; 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.SclResourceFactoryImpl;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclResourceSetImpl;
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;
import fr.centralesupelec.edf.riseclipse.util.TextRiseClipseConsole; import fr.centralesupelec.edf.riseclipse.util.TextRiseClipseConsole;
public class SclModelLoader extends RiseClipseModelLoader { public class SclModelLoader extends AbstractRiseClipseModelLoader {
public SclModelLoader( IRiseClipseConsole console ) { public SclModelLoader( IRiseClipseConsole console ) {
super( console ); super( console );
reset();
} }
@Override
public void reset() { public void reset() {
super.reset(); super.reset( new SclResourceSetImpl( true, console ));
// Register the appropriate resource factory to handle all file // Register the appropriate resource factory to handle all file
// extensions. // extensions.
......
...@@ -21,16 +21,15 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl.util; ...@@ -21,16 +21,15 @@ package fr.centralesupelec.edf.riseclipse.iec61850.scl.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 SclResourceSetFactory extends RiseClipseResourceSetFactory { public class SclResourceSetFactory 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 SclResourceSetImpl( strictContent, console ); return new SclResourceSetImpl( strictContent, console );
} }
......
...@@ -28,18 +28,18 @@ import org.eclipse.emf.ecore.resource.Resource; ...@@ -28,18 +28,18 @@ import org.eclipse.emf.ecore.resource.Resource;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL; import fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL;
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;
@SuppressWarnings( "unused" ) @SuppressWarnings( "unused" )
public class SclResourceSetImpl extends RiseClipseResourceSet { public class SclResourceSetImpl extends AbstractRiseClipseResourceSet {
public SclResourceSetImpl( boolean strictContent, IRiseClipseConsole console ) { public SclResourceSetImpl( boolean strictContent, IRiseClipseConsole console ) {
super( strictContent, console ); super( strictContent, console );
} }
/* (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 ) {
...@@ -48,6 +48,7 @@ public class SclResourceSetImpl extends RiseClipseResourceSet { ...@@ -48,6 +48,7 @@ public class SclResourceSetImpl extends RiseClipseResourceSet {
private void buildExplicitLinks( IRiseClipseConsole console ) { private void buildExplicitLinks( IRiseClipseConsole console ) {
for( Resource resource : getResources() ) { for( Resource resource : getResources() ) {
if( resource.getContents().size() == 0 ) continue;
if( resource instanceof SclResourceImpl ) { if( resource instanceof SclResourceImpl ) {
SCL scl = ( SCL ) resource.getContents().get( 0 ); SCL scl = ( SCL ) resource.getContents().get( 0 );
scl.buildExplicitLinks( console, false ); scl.buildExplicitLinks( console, false );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment