[204200] Taking advantage of content type identifier, file extension support introduced in EMF.

1 files changed, 37 insertions, 24 deletions

diff --git a/plugins/org.eclipse.uml2.uml/plugin.xml b/plugins/org.eclipse.uml2.uml/plugin.xml
index e194e7fc..0d6448f7 100644
--- a/plugins/org.eclipse.uml2.uml/plugin.xml
+++ b/plugins/org.eclipse.uml2.uml/plugin.xml
@@ -12,7 +12,7 @@
    IBM - initial API and implementation
    Kenn Hussey (Embarcadero Technologies) - 156879, 215488, 226397, 204200
 
- $Id: plugin.xml,v 1.10 2008/04/15 17:51:56 khussey Exp $
+ $Id: plugin.xml,v 1.11 2008/04/21 13:28:48 khussey Exp $
 -->
 
 <plugin>
@@ -46,11 +46,8 @@
   <extension
         point="org.eclipse.emf.ecore.content_parser">
      <parser
-           class="org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl"
-           contentTypeIdentifier="org.eclipse.uml2.uml_2_0_0" />
-     <parser
-           class="org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl"
-           contentTypeIdentifier="org.eclipse.uml2.uml_2_1_0" />
+           contentTypeIdentifier="org.eclipse.uml2.uml"
+           class="org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl" />
   </extension>
 
   <extension
@@ -58,8 +55,8 @@
      <content-type
            base-type="org.eclipse.emf.ecore.xmi"
            file-extensions="uml2"
-           id="org.eclipse.uml2.uml_1_0_0"
-           name="%_UI_Eclipse_UML_1_0_0_content_type"
+           id="org.eclipse.uml2"
+           name="%_UI_UML2_content_type"
            priority="normal">
         <describer
               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
@@ -74,8 +71,24 @@
      <content-type
            base-type="org.eclipse.emf.ecore.xmi"
            file-extensions="uml"
+           id="org.eclipse.uml2.uml"
+           name="%_UI_UML_content_type"
+           priority="normal">
+        <describer
+              class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
+           <parameter
+                 name="namespacePattern"
+                 value="http://www\.eclipse\.org/uml2/(2\.0\.0|2\.1\.0)/UML" />
+           <parameter
+                 name="kind"
+                 value="xmi" />
+        </describer>
+     </content-type>
+     <content-type
+           base-type="org.eclipse.uml2.uml"
+           file-extensions="uml"
            id="org.eclipse.uml2.uml_2_0_0"
-           name="%_UI_Eclipse_UML_2_0_0_content_type"
+           name="%_UI_UML_2_0_0_content_type"
            priority="normal">
         <describer
               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
@@ -88,10 +101,10 @@
         </describer>
      </content-type>
      <content-type
-           base-type="org.eclipse.emf.ecore.xmi"
+           base-type="org.eclipse.uml2.uml"
            file-extensions="uml"
            id="org.eclipse.uml2.uml_2_1_0"
-           name="%_UI_Eclipse_UML_2_1_0_content_type"
+           name="%_UI_UML_2_1_0_content_type"
            priority="normal">
         <describer
               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
@@ -106,40 +119,40 @@
      <content-type
            base-type="org.eclipse.emf.ecore.xmi"
            file-extensions="xmi"
-           id="org.omg.uml_2_1"
-           name="%_UI_OMG_UML_2_1_content_type"
+           id="org.omg.uml"
+           name="%_UI_OMG_UML_content_type"
            priority="normal">
         <describer
               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
            <parameter
-                 name="namespace"
-                 value="http://schema.omg.org/spec/UML/2.1" />
+                 name="namespacePattern"
+                 value="http://schema\.omg\.org/spec/UML/(2\.1|2\.1\.1)" />
            <parameter
                  name="kind"
                  value="xmi" />
         </describer>
      </content-type>
      <content-type
-           base-type="org.eclipse.emf.ecore.xmi"
+           base-type="org.omg.uml"
            file-extensions="xmi"
-           id="org.omg.uml_2_1_1"
-           name="%_UI_OMG_UML_2_1_1_content_type"
+           id="org.omg.uml_2_1"
+           name="%_UI_OMG_UML_2_1_content_type"
            priority="normal">
         <describer
               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
            <parameter
                  name="namespace"
-                 value="http://schema.omg.org/spec/UML/2.1.1" />
+                 value="http://schema.omg.org/spec/UML/2.1" />
            <parameter
                  name="kind"
                  value="xmi" />
         </describer>
      </content-type>
      <content-type
-           base-type="org.eclipse.emf.ecore.xmi"
+           base-type="org.omg.uml"
            file-extensions="xmi"
-           id="org.omg.uml_2_1_2"
-           name="%_UI_OMG_UML_2_1_2_content_type"
+           id="org.omg.uml_2_1_1"
+           name="%_UI_OMG_UML_2_1_1_content_type"
            priority="normal">
         <describer
               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
@@ -154,8 +167,8 @@
      <content-type
            base-type="org.eclipse.emf.ecore.xmi"
            file-extensions="cmof,xmi"
-           id="org.omg.mof.cmof_2_0"
-           name="%_UI_OMG_CMOF_2_0_content_type"
+           id="org.omg.mof.cmof"
+           name="%_UI_OMG_CMOF_content_type"
            priority="normal">
         <describer
               class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">