Author: thn Date: 2011-03-03 12:57:29-0800 New Revision: 19102 Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java
Log: now MIWG test cases and AndroMDA profiles do load Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java?view=diff&pathrev=19102&r1=19101&r2=19102 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/EUMLModelImplementation.java 2011-03-03 12:57:29-0800 @@ -36,6 +36,7 @@ import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EPackage.Registry; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory; import org.eclipse.emf.ecore.resource.Resource; @@ -48,9 +49,11 @@ import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory; import org.eclipse.uml2.uml.edit.providers.UMLReflectiveItemProviderAdapterFactory; import org.eclipse.uml2.uml.edit.providers.UMLResourceItemProviderAdapterFactory; +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; @@ -231,10 +234,21 @@ URI uri = URI.createURI("jar:file:" + path + "!/"); //$NON-NLS-1$ //$NON-NLS-2$ LOG.debug("eUML.resource URI --> " + uri); //$NON-NLS-1$ - resourceSet.getPackageRegistry().put( - UMLPackage.eNS_URI, UMLPackage.eINSTANCE); - resourceSet.getPackageRegistry().put( - EcorePackage.eNS_URI, EcorePackage.eINSTANCE); + Registry packageRegistry = resourceSet.getPackageRegistry(); + packageRegistry.put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE); + packageRegistry.put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE); + // for other xmi files with further namespaces: + packageRegistry.put(XMI212UMLResource.UML_METAMODEL_2_1_1_NS_URI, UMLPackage.eINSTANCE); + packageRegistry.put(XMI212UMLResource.UML_METAMODEL_2_1_1_URI, UMLPackage.eINSTANCE); + packageRegistry.put(XMI212UMLResource.UML_METAMODEL_2_1_NS_URI, UMLPackage.eINSTANCE); + packageRegistry.put(XMI212UMLResource.UML_METAMODEL_2_1_URI, UMLPackage.eINSTANCE); + packageRegistry.put(XMI212UMLResource.UML_METAMODEL_2_2_NS_URI, UMLPackage.eINSTANCE); + packageRegistry.put(XMI212UMLResource.UML_METAMODEL_NS_URI, UMLPackage.eINSTANCE); + packageRegistry.put(XMI212UMLResource.UML_METAMODEL_URI, UMLPackage.eINSTANCE); + // eclipse namespaces: + packageRegistry.put(UML212UMLResource.UML_METAMODEL_NS_URI, UMLPackage.eINSTANCE); + packageRegistry.put("http://www.eclipse.org/uml2/2.0.0/UML";, UMLPackage.eINSTANCE); + // For the .uml files in the eclipse jar files, we need this: extensionToFactoryMap.put( UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE); ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2709397 To unsubscribe from this discussion, e-mail: [[email protected]].
