Fixed #508 Can't open ReqIf models wiht the genconf wizard.

ObeoNetwork · Oct 27, 2023 · 5ff45d5 · 5ff45d5
1 parent 5c5d2d6
commit 5ff45d5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/...nconf.editor/src/org/obeonetwork/m2doc/genconf/editor/wizard/GenerationFileNamesPage.java b/...nconf.editor/src/org/obeonetwork/m2doc/genconf/editor/wizard/GenerationFileNamesPage.java
@@ -21,6 +21,7 @@
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.URIConverter;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -537,6 +538,9 @@ private TemplateCustomProperties validatePage(final Generation gen, URI template
                 final ResourceSetImpl defaultResourceSet = new ResourceSetImpl();
                 defaultResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*",
                         new XMIResourceFactoryImpl());
+                defaultResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+                        .putAll(Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap());
+
                 final ResourceSet resourceSetForModel = M2DocUtils.createResourceSetForModels(
                         new ArrayList<Exception>(), queryEnvironment, defaultResourceSet, GenconfUtils.getOptions(gen));
 

diff --git a/...c.genconf.editor/src/org/obeonetwork/m2doc/genconf/editor/wizard/NewGenerationWizard.java b/...c.genconf.editor/src/org/obeonetwork/m2doc/genconf/editor/wizard/NewGenerationWizard.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ *  Copyright (c) 2018, 2023 Obeo. 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v2.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v20.html
+ *   
+ *   Contributors:
+ *       Obeo - initial API and implementation
+ *  
+ *******************************************************************************/
 package org.obeonetwork.m2doc.genconf.editor.wizard;
 
 import java.io.IOException;
@@ -216,6 +227,9 @@ private void initializeVariableDefinition(Generation gen) {
             final ResourceSetImpl defaultResourceSet = new ResourceSetImpl();
             defaultResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*",
                     new XMIResourceFactoryImpl());
+            defaultResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+                    .putAll(Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap());
+
             final ResourceSet resourceSetForModel = M2DocUtils.createResourceSetForModels(new ArrayList<Exception>(),
                     queryEnvironment, defaultResourceSet, GenconfUtils.getOptions(gen));
             final List<Definition> newDefinitions = GenconfUtils.getNewDefinitions(gen, properties);

diff --git a/...genconf.editor/src/org/obeonetwork/m2doc/genconf/editor/wizard/VariableAndOptionPage.java b/...genconf.editor/src/org/obeonetwork/m2doc/genconf/editor/wizard/VariableAndOptionPage.java
@@ -22,6 +22,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
+import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
@@ -655,6 +656,8 @@ private void updateEditingDomain(Generation gen) {
         final ResourceSetImpl defaultResourceSet = new ResourceSetImpl();
         defaultResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*",
                 new XMIResourceFactoryImpl());
+        defaultResourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
+                .putAll(Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap());
 
         if (editingDomain != null) {
             M2DocUtils.cleanResourceSetForModels(queryEnvironment, editingDomain.getResourceSet());