From 49baf9282b186b39d584fdf6b0a0149bbfd1993e Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Thu, 14 Feb 2019 19:12:35 +0100
Subject: [PATCH] correct finalization when a resource is added to an existing
resourceSet
---
.../centralesupelec/edf/riseclipse/ui/RiseClipseEditor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fr.centralesupelec.edf.riseclipse.editor/src/fr/centralesupelec/edf/riseclipse/ui/RiseClipseEditor.java b/fr.centralesupelec.edf.riseclipse.editor/src/fr/centralesupelec/edf/riseclipse/ui/RiseClipseEditor.java
index 377d876..3b87e1e 100644
--- a/fr.centralesupelec.edf.riseclipse.editor/src/fr/centralesupelec/edf/riseclipse/ui/RiseClipseEditor.java
+++ b/fr.centralesupelec.edf.riseclipse.editor/src/fr/centralesupelec/edf/riseclipse/ui/RiseClipseEditor.java
@@ -675,7 +675,7 @@ public class RiseClipseEditor extends MultiPageEditorPart implements IEditingDom
super();
this.console = new EclipseRiseClipseConsole();
- console.setLevel( IRiseClipseConsole.VERBOSE_LEVEL );
+ console.setLevel( IRiseClipseConsole.INFO_LEVEL );
loadKnownMetamodels();
@@ -1149,7 +1149,7 @@ public class RiseClipseEditor extends MultiPageEditorPart implements IEditingDom
RiseClipseResourceSetFactory f = factoryFinder.findFactoryFor( uriConverter, resourceURI );
ResourceSet resourceSet = null;
if( f != null ) {
- resourceSet = f.createResourceSet();
+ resourceSet = f.createResourceSet( console );
}
initializeEditingDomain( resourceSet );
}
@@ -1193,9 +1193,9 @@ public class RiseClipseEditor extends MultiPageEditorPart implements IEditingDom
// Let each resource do what it needs after all is loaded
// This is at least needed for CIM with zip files containing several
// resources and links to be set between objects in different resources
-
if( editingDomain.getResourceSet() instanceof RiseClipseResourceSet ) {
(( RiseClipseResourceSet ) editingDomain.getResourceSet() ).finalizeLoad( console );
+ (( RiseClipseResourceSet ) editingDomain.getResourceSet() ).setCallFinalizeLoadAfterGetResource();
}
}
--
GitLab