diff options
3 files changed, 10 insertions, 5 deletions
diff --git a/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF index e9b4d7d1b..e89cd75b9 100644 --- a/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.uml2.uml.editor; singleton:=true -Bundle-Version: 2.1.0.qualifier +Bundle-Version: 2.2.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.uml2.uml.editor.UMLEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.uml2.uml.editor/plugin.xml b/plugins/org.eclipse.uml2.uml.editor/plugin.xml index 0c27ba578..56f4dc194 100644 --- a/plugins/org.eclipse.uml2.uml.editor/plugin.xml +++ b/plugins/org.eclipse.uml2.uml.editor/plugin.xml @@ -2,7 +2,7 @@ <?eclipse version="3.0"?> <!-- - Copyright (c) 2005, 2006 IBM Corporation and others. + Copyright (c) 2005, 2007 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -11,7 +11,7 @@ Contributors: IBM - initial API and implementation - $Id: plugin.xml,v 1.9 2006/11/30 05:15:31 khussey Exp $ + $Id: plugin.xml,v 1.10 2007/09/04 15:28:33 khussey Exp $ --> <plugin> @@ -40,7 +40,7 @@ id = "org.eclipse.uml2.uml.editor.presentation.UMLEditorID" name = "%_UI_UMLEditor_label" icon = "icons/full/obj16/UMLModelFile.gif" - extensions = "uml,uml2,xmi" + extensions = "uml,uml2,xmi,cmof" class = "org.eclipse.uml2.uml.editor.presentation.UMLEditor" contributorClass="org.eclipse.uml2.uml.editor.presentation.UMLActionBarContributor" > </editor> 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 bfaf96465..1b19a5c8f 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 @@ -8,7 +8,7 @@ * Contributors: * IBM - initial API and implementation * - * $Id: UMLEditor.java,v 1.35 2007/06/12 19:05:57 khussey Exp $ + * $Id: UMLEditor.java,v 1.36 2007/09/04 15:28:33 khussey Exp $ */ package org.eclipse.uml2.uml.editor.presentation; @@ -183,6 +183,8 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.uml2.uml.editor.UMLEditorPlugin; +import org.eclipse.uml2.uml.resource.CMOF2UMLExtendedMetaData; +import org.eclipse.uml2.uml.resource.CMOF2UMLResource; import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData; import org.eclipse.uml2.uml.resource.UML22UMLResource; import org.eclipse.uml2.uml.resource.UMLResource; @@ -941,11 +943,14 @@ public class UMLEditor UML22UMLResource.Factory.INSTANCE); extensionToFactoryMap.put(XMI2UMLResource.FILE_EXTENSION, XMI2UMLResource.Factory.INSTANCE); + extensionToFactoryMap.put(CMOF2UMLResource.FILE_EXTENSION, + CMOF2UMLResource.Factory.INSTANCE); Map<URI, URI> uriMap = resourceSet.getURIConverter().getURIMap(); uriMap.putAll(UML22UMLExtendedMetaData.getURIMap()); uriMap.putAll(XMI2UMLExtendedMetaData.getURIMap()); + uriMap.putAll(CMOF2UMLExtendedMetaData.getURIMap()); createModelGen(); |