[1591] Objects may be created using multiple strategies which can cre…

…ate incompatible objects in a single model Bug: eclipse-sirius#1591 Signed-off-by: Michaël Charfadi <michael.charfadi@obeosoft.com>
mcharfadi · Feb 23, 2023 · 67a84f3 · 67a84f3
1 parent 3312e9f
commit 67a84f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -41,6 +41,7 @@ It was not actually used, as tools have long been found in `DiagramDescription.g
 - https://github.com/eclipse-sirius/sirius-components/issues/1692[#1692] [core] JPEG images where previously ignored if using a `.jpg` extension instead of `.jpeg`.
 They are now correctly supported
 - https://github.com/eclipse-sirius/sirius-components/issues/1741[#1741] [diagram] Border node placement specified with ELK configuration not taken into account anymore
+- https://github.com/eclipse-sirius/sirius-components/issues/1591[#1591] [emf] Now creating root element of model instance using loaded EPackages in the package registry of the editing domain
 
 === New Features
 

diff --git a/...-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditService.java b/...-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/EditService.java
@@ -40,6 +40,7 @@
 import org.eclipse.emf.edit.command.CreateChildCommand;
 import org.eclipse.emf.edit.command.CreateChildCommand.Helper;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.sirius.components.core.api.ChildCreationDescription;
@@ -271,7 +272,7 @@ private List<EClass> getConcreteClasses(EPackage ePackage) {
     public Optional<Object> createRootObject(IEditingContext editingContext, UUID documentId, String domainId, String rootObjectCreationDescriptionId) {
         Optional<Object> createdObjectOptional = Optional.empty();
 
-        var optionalEClass = this.getMatchingEClass(editingContext.getId(), domainId, rootObjectCreationDescriptionId);
+        var optionalEClass = this.getMatchingEClass(editingContext, domainId, rootObjectCreationDescriptionId);
 
         // @formatter:off
         var optionalEditingDomain = Optional.of(editingContext)
@@ -303,11 +304,15 @@ public Optional<Object> createRootObject(IEditingContext editingContext, UUID do
         return createdObjectOptional;
     }
 
-    private Optional<EClass> getMatchingEClass(String editingContextId, String domainId, String rootObjectCreationDescriptionId) {
-        EPackage.Registry ePackageRegistry = this.getPackageRegistry(editingContextId);
-
+    private Optional<EClass> getMatchingEClass(IEditingContext editingContext, String domainId, String rootObjectCreationDescriptionId) {
         // @formatter:off
-        return Optional.ofNullable(ePackageRegistry.getEPackage(domainId))
+        return Optional.of(editingContext)
+                .filter(EditingContext.class::isInstance)
+                .map(EditingContext.class::cast)
+                .map(EditingContext::getDomain)
+                .map(EditingDomain::getResourceSet)
+                .map(ResourceSet::getPackageRegistry)
+                .map(packageRegistry -> packageRegistry.getEPackage(domainId))
                 .map(ePackage -> ePackage.getEClassifier(rootObjectCreationDescriptionId))
                 .filter(EClass.class::isInstance)
                 .map(EClass.class::cast)