[351774] Updating based on UML 2.4.1 resource support.
diff --git a/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java b/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java
index b3b1251..637af61 100644
--- a/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java
+++ b/plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 156879, 220552, 226102
- * Kenn Hussey (CEA) - 327039
+ * Kenn Hussey (CEA) - 327039, 351774
*
*/
package org.eclipse.uml2.uml.ecore.importer;
@@ -340,6 +340,9 @@
XMI2UMLResource.UML_CONTENT_TYPE_IDENTIFIER,
XMI2UMLResource.Factory.INSTANCE);
contentTypeToFactoryMap.put(
+ XMI2UMLResource.UML_2_4_CONTENT_TYPE_IDENTIFIER,
+ XMI2UMLResource.Factory.INSTANCE);
+ contentTypeToFactoryMap.put(
XMI222UMLResource.UML_2_2_CONTENT_TYPE_IDENTIFIER,
XMI222UMLResource.Factory.INSTANCE);
contentTypeToFactoryMap.put(
@@ -352,6 +355,9 @@
CMOF2UMLResource.CMOF_CONTENT_TYPE_IDENTIFIER,
CMOF2UMLResource.Factory.INSTANCE);
contentTypeToFactoryMap.put(
+ CMOF2UMLResource.CMOF_2_4_CONTENT_TYPE_IDENTIFIER,
+ CMOF2UMLResource.Factory.INSTANCE);
+ contentTypeToFactoryMap.put(
CMOF202UMLResource.CMOF_CONTENT_TYPE_IDENTIFIER,
CMOF202UMLResource.Factory.INSTANCE);
diff --git a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
index a4f04d4..2e2bcd8 100644
--- a/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
+++ b/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
@@ -9,7 +9,7 @@
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 204200, 215418, 156879, 227392, 226178, 232332, 247980
* Kenn Hussey - 286329, 323181
- * Kenn Hussey (CEA) - 327039
+ * Kenn Hussey (CEA) - 327039, 351774
*
*/
package org.eclipse.uml2.uml.editor.presentation;
@@ -961,6 +961,9 @@
XMI2UMLResource.UML_CONTENT_TYPE_IDENTIFIER,
XMI2UMLResource.Factory.INSTANCE);
contentTypeToFactoryMap.put(
+ XMI2UMLResource.UML_2_4_CONTENT_TYPE_IDENTIFIER,
+ XMI2UMLResource.Factory.INSTANCE);
+ contentTypeToFactoryMap.put(
XMI222UMLResource.UML_2_2_CONTENT_TYPE_IDENTIFIER,
XMI222UMLResource.Factory.INSTANCE);
contentTypeToFactoryMap.put(
@@ -973,6 +976,9 @@
CMOF2UMLResource.CMOF_CONTENT_TYPE_IDENTIFIER,
CMOF2UMLResource.Factory.INSTANCE);
contentTypeToFactoryMap.put(
+ CMOF2UMLResource.CMOF_2_4_CONTENT_TYPE_IDENTIFIER,
+ CMOF2UMLResource.Factory.INSTANCE);
+ contentTypeToFactoryMap.put(
CMOF202UMLResource.CMOF_2_0_CONTENT_TYPE_IDENTIFIER,
CMOF202UMLResource.Factory.INSTANCE);
