commit 1455b295e0d578b3bbe137cf368a08198cf5aec6
author jbruck <jbruck> Fri Oct 03 20:50:39 2008 +0000
committer jbruck <jbruck> Fri Oct 03 20:50:39 2008 +0000
tree 7a7e15a733d4b081fdab67865e3df3f78785e9d2
parent 6f1769d8d020d76695d9dd5a1005bb4c2c856e86

[232332] UML 2.2 Compliance - Phase 3 (migration changes changes only)

plugins/org.eclipse.uml2.uml.ecore.importer/src/org/eclipse/uml2/uml/ecore/importer/UMLImporter.java

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 9fcc13e..2221e5a 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
@@ -9,7 +9,7 @@
  *   IBM - initial API and implementation
  *   Kenn Hussey (Embarcadero Technologies) - 156879, 220552, 226102
  *
- * $Id: UMLImporter.java,v 1.15 2008/04/09 14:37:18 khussey Exp $
+ * $Id: UMLImporter.java,v 1.16 2008/10/03 20:50:39 jbruck Exp $
  */
 package org.eclipse.uml2.uml.ecore.importer;
 
@@ -43,9 +43,11 @@
 import org.eclipse.uml2.uml.UMLPackage;
 import org.eclipse.uml2.uml.resource.CMOF2UMLExtendedMetaData;
 import org.eclipse.uml2.uml.resource.CMOF2UMLResource;
+import org.eclipse.uml2.uml.resource.UML212UMLResource;
 import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData;
 import org.eclipse.uml2.uml.resource.UML22UMLResource;
 import org.eclipse.uml2.uml.resource.UMLResource;
+import org.eclipse.uml2.uml.resource.XMI212UMLResource;
 import org.eclipse.uml2.uml.resource.XMI2UMLExtendedMetaData;
 import org.eclipse.uml2.uml.resource.XMI2UMLResource;
 import org.eclipse.uml2.uml.util.UMLUtil;
@@ -324,11 +326,14 @@
 			UML22UMLResource.UML2_CONTENT_TYPE_IDENTIFIER,
 			UML22UMLResource.Factory.INSTANCE);
 		contentTypeToFactoryMap.put(
+			UML212UMLResource.UML_2_1_0_CONTENT_TYPE_IDENTIFIER,
+			UML212UMLResource.Factory.INSTANCE);
+		contentTypeToFactoryMap.put(
 			XMI2UMLResource.UML_CONTENT_TYPE_IDENTIFIER,
 			XMI2UMLResource.Factory.INSTANCE);
 		contentTypeToFactoryMap.put(
 			XMI2UMLResource.UML_2_1_1_CONTENT_TYPE_IDENTIFIER,
-			XMI2UMLResource.Factory.INSTANCE);
+			XMI212UMLResource.Factory.INSTANCE);
 		contentTypeToFactoryMap.put(
 			XMI2UMLResource.UML_2_1_CONTENT_TYPE_IDENTIFIER,
 			XMI2UMLResource.Factory.INSTANCE);