Attachment 112702 Details for Bug 232332 – smaller patch with just model migration changes.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] smaller patch with just model migration changes.

ModelMigration1.patch (text/plain), 68.73 KB, created by James Bruck

on 2008-09-16 16:16:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: James Bruck

Created: 2008-09-16 16:16:38 EDT

Size: 68.73 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.uml2.uml.resources
>Index: profiles/UML2.profile.uml
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.resources/profiles/UML2.profile.uml,v
>retrieving revision 1.7
>diff -u -r1.7 UML2.profile.uml
>--- profiles/UML2.profile.uml	10 Apr 2008 14:19:00 -0000	1.7
>+++ profiles/UML2.profile.uml	16 Sep 2008 20:12:50 -0000
>@@ -1,12 +1,122 @@
> <?xml version="1.0" encoding="UTF-8"?>
>-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
>+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
>   <uml:Profile xmi:id="_0" name="UML2" metamodelReference="_packageImport.0">
>     <eAnnotations xmi:id="__n5r8NSTEdqN9tnr0j3PAQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
>+      <contents xmi:type="ecore:EPackage" xmi:id="_9hDf4IEKEd2QAs4f2l66gA" name="UML2" nsURI="http://www.eclipse.org/uml2/schemas/UML2/1" nsPrefix="UML2">
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDf4YEKEd2QAs4f2l66gA" name="Action">
>+          <eAnnotations xmi:id="_9hDf4oEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Action"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf44EKEd2QAs4f2l66gA" name="base_Action" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Action"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9hDf5YEKEd2QAs4f2l66gA" name="effect" ordered="false">
>+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDf54EKEd2QAs4f2l66gA" name="Activity">
>+          <eAnnotations xmi:id="_9hDf6IEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Activity"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf6YEKEd2QAs4f2l66gA" name="base_Activity" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Activity"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9hDf64EKEd2QAs4f2l66gA" name="body" ordered="false">
>+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9hDf7YEKEd2QAs4f2l66gA" name="language" ordered="false">
>+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDf74EKEd2QAs4f2l66gA" name="Comment">
>+          <eAnnotations xmi:id="_9hDf8IEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Comment"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf8YEKEd2QAs4f2l66gA" name="base_Comment" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Comment"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf84EKEd2QAs4f2l66gA" name="bodyExpression" ordered="false" containment="true">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//StringExpression"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDf9YEKEd2QAs4f2l66gA" name="Message">
>+          <eAnnotations xmi:id="_9hDf9oEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Message"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf94EKEd2QAs4f2l66gA" name="base_Message" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf-YEKEd2QAs4f2l66gA" name="signature" ordered="false">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDf-4EKEd2QAs4f2l66gA" name="TemplateSignature">
>+          <eAnnotations xmi:id="_9hDf_IEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="TemplateSignature"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf_YEKEd2QAs4f2l66gA" name="base_TemplateSignature" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateSignature"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDf_4EKEd2QAs4f2l66gA" name="nestedSignature" ordered="false" upperBound="-1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateSignature"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgAYEKEd2QAs4f2l66gA" name="nestingSignature" ordered="false">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateSignature"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDgA4EKEd2QAs4f2l66gA" name="Expression">
>+          <eAnnotations xmi:id="_9hDgBIEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Expression"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgBYEKEd2QAs4f2l66gA" name="base_OpaqueExpression" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//OpaqueExpression"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgB4EKEd2QAs4f2l66gA" name="operand" ordered="false" upperBound="-1" containment="true">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9hDgCYEKEd2QAs4f2l66gA" name="symbol" ordered="false">
>+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDgC4EKEd2QAs4f2l66gA" name="OpaqueExpression">
>+          <eAnnotations xmi:id="_9hDgDIEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="OpaqueExpression"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgDYEKEd2QAs4f2l66gA" name="base_Expression" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Expression"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgD4EKEd2QAs4f2l66gA" name="behavior" ordered="false">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9hDgEYEKEd2QAs4f2l66gA" name="body" ordered="false">
>+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_9hDgE4EKEd2QAs4f2l66gA" name="language" ordered="false">
>+            <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDgFYEKEd2QAs4f2l66gA" name="TimeEvent">
>+          <eAnnotations xmi:id="_9hDgFoEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_FOL3sH9rEd2eRolmHz12nw"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgF4EKEd2QAs4f2l66gA" name="when" ordered="false">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgGYEKEd2QAs4f2l66gA" name="base_TimeEvent" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TimeEvent"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDgG4EKEd2QAs4f2l66gA" name="Property">
>+          <eAnnotations xmi:id="_9hDgHIEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_MA_BMH9rEd2eRolmHz12nw"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgHYEKEd2QAs4f2l66gA" name="templateBinding" ordered="false" upperBound="-1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateBinding"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgH4EKEd2QAs4f2l66gA" name="ownedTemplateSignature" ordered="false">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateSignature"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgIYEKEd2QAs4f2l66gA" name="base_Property" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Property"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+        <eClassifiers xmi:type="ecore:EClass" xmi:id="_9hDgI4EKEd2QAs4f2l66gA" name="ClassifierTemplateParameter">
>+          <eAnnotations xmi:id="_9hDgJIEKEd2QAs4f2l66gA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_PKJKgH9rEd2eRolmHz12nw"/>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgJYEKEd2QAs4f2l66gA" name="defaultClassifier" ordered="false">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Classifier"/>
>+          </eStructuralFeatures>
>+          <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_9hDgJ4EKEd2QAs4f2l66gA" name="base_ClassifierTemplateParameter" ordered="false" lowerBound="1">
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ClassifierTemplateParameter"/>
>+          </eStructuralFeatures>
>+        </eClassifiers>
>+      </contents>
>       <contents xmi:type="ecore:EPackage" xmi:id="_dhEUENSUEdqN9tnr0j3PAQ" name="UML2" nsURI="http://www.eclipse.org/uml2/schemas/UML2/0" nsPrefix="UML2">
>         <eClassifiers xmi:type="ecore:EClass" xmi:id="_dhEUEdSUEdqN9tnr0j3PAQ" name="Action">
>           <eAnnotations xmi:id="_dhEUEtSUEdqN9tnr0j3PAQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Action"/>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUE9SUEdqN9tnr0j3PAQ" name="base_Action" ordered="false" lowerBound="1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//Action"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Action"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dhEUFNSUEdqN9tnr0j3PAQ" name="effect" ordered="false">
>             <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>@@ -15,7 +125,7 @@
>         <eClassifiers xmi:type="ecore:EClass" xmi:id="_dhEUFdSUEdqN9tnr0j3PAQ" name="Activity">
>           <eAnnotations xmi:id="_dhEUFtSUEdqN9tnr0j3PAQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Activity"/>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUF9SUEdqN9tnr0j3PAQ" name="base_Activity" ordered="false" lowerBound="1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//Activity"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Activity"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dhEUGNSUEdqN9tnr0j3PAQ" name="body" ordered="false">
>             <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>@@ -27,40 +137,40 @@
>         <eClassifiers xmi:type="ecore:EClass" xmi:id="_dhEUGtSUEdqN9tnr0j3PAQ" name="Comment">
>           <eAnnotations xmi:id="_dhEUG9SUEdqN9tnr0j3PAQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Comment"/>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUHNSUEdqN9tnr0j3PAQ" name="base_Comment" ordered="false" lowerBound="1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//Comment"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Comment"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUHdSUEdqN9tnr0j3PAQ" name="bodyExpression" ordered="false" containment="true">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//StringExpression"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//StringExpression"/>
>           </eStructuralFeatures>
>         </eClassifiers>
>         <eClassifiers xmi:type="ecore:EClass" xmi:id="_dhEUHtSUEdqN9tnr0j3PAQ" name="Message">
>           <eAnnotations xmi:id="_dhEUH9SUEdqN9tnr0j3PAQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Message"/>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUINSUEdqN9tnr0j3PAQ" name="base_Message" ordered="false" lowerBound="1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//Message"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUIdSUEdqN9tnr0j3PAQ" name="signature" ordered="false">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//NamedElement"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
>           </eStructuralFeatures>
>         </eClassifiers>
>         <eClassifiers xmi:type="ecore:EClass" xmi:id="_dhEUItSUEdqN9tnr0j3PAQ" name="TemplateSignature">
>           <eAnnotations xmi:id="_dhEUI9SUEdqN9tnr0j3PAQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="TemplateSignature"/>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUJNSUEdqN9tnr0j3PAQ" name="base_TemplateSignature" ordered="false" lowerBound="1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//TemplateSignature"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateSignature"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUJdSUEdqN9tnr0j3PAQ" name="nestedSignature" ordered="false" upperBound="-1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//TemplateSignature"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateSignature"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dhEUJtSUEdqN9tnr0j3PAQ" name="nestingSignature" ordered="false">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//TemplateSignature"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//TemplateSignature"/>
>           </eStructuralFeatures>
>         </eClassifiers>
>         <eClassifiers xmi:type="ecore:EClass" xmi:id="_3Bb8Z-CPEdqoz4RYXIwjlw" name="Expression">
>           <eAnnotations xmi:id="_3Bb8aOCPEdqoz4RYXIwjlw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="Expression"/>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3Bb8aeCPEdqoz4RYXIwjlw" name="base_OpaqueExpression" ordered="false" lowerBound="1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//OpaqueExpression"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//OpaqueExpression"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3Bb8auCPEdqoz4RYXIwjlw" name="operand" ordered="false" upperBound="-1" containment="true">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//ValueSpecification"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//ValueSpecification"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3Bb8a-CPEdqoz4RYXIwjlw" name="symbol" ordered="false">
>             <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>@@ -69,10 +179,10 @@
>         <eClassifiers xmi:type="ecore:EClass" xmi:id="_3Bb8bOCPEdqoz4RYXIwjlw" name="OpaqueExpression">
>           <eAnnotations xmi:id="_3Bb8beCPEdqoz4RYXIwjlw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="OpaqueExpression"/>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3Bb8buCPEdqoz4RYXIwjlw" name="base_Expression" ordered="false" lowerBound="1">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//Expression"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Expression"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_3Bb8b-CPEdqoz4RYXIwjlw" name="behavior" ordered="false">
>-            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/2.1.0/UML#//Behavior"/>
>+            <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Behavior"/>
>           </eStructuralFeatures>
>           <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_3Bb8cOCPEdqoz4RYXIwjlw" name="body" ordered="false">
>             <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>@@ -219,6 +329,47 @@
>         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Expression_OpaqueExpression-extension_OpaqueExpression-_lowerValue"/>
>       </ownedEnd>
>     </packagedElement>
>+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_FOL3sH9rEd2eRolmHz12nw" name="TimeEvent">
>+      <ownedAttribute xmi:id="_U4PVwH9rEd2eRolmHz12nw" name="when">
>+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>
>+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uEg5YIEKEd2QAs4f2l66gA"/>
>+      </ownedAttribute>
>+      <ownedAttribute xmi:id="_yh0NQX9sEd2eRolmHz12nw" name="base_TimeEvent" association="_yhXhUH9sEd2eRolmHz12nw">
>+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TimeEvent"/>
>+      </ownedAttribute>
>+    </packagedElement>
>+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_MA_BMH9rEd2eRolmHz12nw" name="Property">
>+      <ownedAttribute xmi:id="_js9HQH9rEd2eRolmHz12nw" name="templateBinding">
>+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateBinding"/>
>+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gBEz0IEKEd2QAs4f2l66gA" value="*"/>
>+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ijWjUIEKEd2QAs4f2l66gA"/>
>+      </ownedAttribute>
>+      <ownedAttribute xmi:id="_kT2IIH9rEd2eRolmHz12nw" name="ownedTemplateSignature">
>+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateSignature"/>
>+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xCMygIEKEd2QAs4f2l66gA"/>
>+      </ownedAttribute>
>+      <ownedAttribute xmi:id="_05zYUn9sEd2eRolmHz12nw" name="base_Property" association="_05zYUH9sEd2eRolmHz12nw">
>+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
>+      </ownedAttribute>
>+    </packagedElement>
>+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_PKJKgH9rEd2eRolmHz12nw" name="ClassifierTemplateParameter">
>+      <ownedAttribute xmi:id="_q5YRsH9rEd2eRolmHz12nw" name="defaultClassifier">
>+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
>+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vxIzQIEKEd2QAs4f2l66gA"/>
>+      </ownedAttribute>
>+      <ownedAttribute xmi:id="_33yMYn9sEd2eRolmHz12nw" name="base_ClassifierTemplateParameter" association="_33yMYH9sEd2eRolmHz12nw">
>+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ClassifierTemplateParameter"/>
>+      </ownedAttribute>
>+    </packagedElement>
>+    <packagedElement xmi:type="uml:Extension" xmi:id="_yhXhUH9sEd2eRolmHz12nw" name="TimeEvent_TimeEvent" memberEnd="_yh0NQH9sEd2eRolmHz12nw _yh0NQX9sEd2eRolmHz12nw">
>+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_yh0NQH9sEd2eRolmHz12nw" name="extension_TimeEvent" type="_FOL3sH9rEd2eRolmHz12nw" aggregation="composite" association="_yhXhUH9sEd2eRolmHz12nw"/>
>+    </packagedElement>
>+    <packagedElement xmi:type="uml:Extension" xmi:id="_05zYUH9sEd2eRolmHz12nw" name="Property_Property" memberEnd="_05zYUX9sEd2eRolmHz12nw _05zYUn9sEd2eRolmHz12nw">
>+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_05zYUX9sEd2eRolmHz12nw" name="extension_Property" type="_MA_BMH9rEd2eRolmHz12nw" aggregation="composite" association="_05zYUH9sEd2eRolmHz12nw"/>
>+    </packagedElement>
>+    <packagedElement xmi:type="uml:Extension" xmi:id="_33yMYH9sEd2eRolmHz12nw" name="ClassifierTemplateParameter_ClassifierTemplateParameter" memberEnd="_33yMYX9sEd2eRolmHz12nw _33yMYn9sEd2eRolmHz12nw">
>+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_33yMYX9sEd2eRolmHz12nw" name="extension_ClassifierTemplateParameter" type="_PKJKgH9rEd2eRolmHz12nw" aggregation="composite" association="_33yMYH9sEd2eRolmHz12nw"/>
>+    </packagedElement>
>     <profileApplication xmi:id="_profileApplication.0">
>       <eAnnotations xmi:id="_VFz_AdSUEdqN9tnr0j3PAQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
>         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF,v
>retrieving revision 1.6
>diff -u -r1.6 MANIFEST.MF
>--- META-INF/MANIFEST.MF	21 Jan 2008 14:54:48 -0000	1.6
>+++ META-INF/MANIFEST.MF	16 Sep 2008 20:12:50 -0000
>@@ -5,4 +5,4 @@
> Bundle-Version: 2.2.0.qualifier
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>-Require-Bundle: org.eclipse.uml2.uml;bundle-version="[2.1.0,3.0.0)"
>+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[3.0.0,4.0.0)"
>#P org.eclipse.uml2.uml
>Index: src/org/eclipse/uml2/uml/util/UMLUtil.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java,v
>retrieving revision 1.76
>diff -u -r1.76 UMLUtil.java
>--- src/org/eclipse/uml2/uml/util/UMLUtil.java	19 Aug 2008 18:50:23 -0000	1.76
>+++ src/org/eclipse/uml2/uml/util/UMLUtil.java	16 Sep 2008 20:12:52 -0000
>@@ -2466,26 +2466,21 @@
> 									for (TemplateParameterSubstitution parameterSubstitution : templateBinding
> 										.getParameterSubstitutions()) {
> 
>-										EList<ParameterableElement> actuals = parameterSubstitution
>-											.getActuals();
>+										ParameterableElement actual = parameterSubstitution
>+											.getActual();
> 
>-										ParameterableElement argument = actuals
>-											.isEmpty()
>-											? null
>-											: actuals.get(0);
>-
>-										if (argument == null) {
>+										if (actual == null) {
> 											TemplateParameter formal = parameterSubstitution
> 												.getFormal();
> 
> 											if (formal != null) {
>-												argument = formal.getDefault();
>+												actual = formal.getDefault();
> 											}
> 										}
> 
>-										if (argument instanceof Classifier) {
>+										if (actual instanceof Classifier) {
> 											eTypeArguments
>-												.add(getEGenericType((Classifier) argument));
>+												.add(getEGenericType((Classifier) actual));
> 										}
> 									}
> 								}
>@@ -5866,8 +5861,8 @@
> 
> 						if (!(safeEquals(parameterSubstitution.getFormal(),
> 							otherParameterSubstitution.getFormal()) && safeEquals(
>-							parameterSubstitution.getActuals(),
>-							otherParameterSubstitution.getActuals()))) {
>+							parameterSubstitution.getActual(),
>+							otherParameterSubstitution.getActual()))) {
> 
> 							return false;
> 						}
>@@ -6359,8 +6354,7 @@
> 									.createParameterSubstitution();
> 								parameterSubstitution
> 									.setFormal(templateParameter);
>-								parameterSubstitution.getActuals().add(
>-									argumentType);
>+								parameterSubstitution.setActual(argumentType);
> 							}
> 						}
> 					}
>Index: src/org/eclipse/uml2/uml/resource/UML22UMLResource.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResource.java,v
>retrieving revision 1.6
>diff -u -r1.6 UML22UMLResource.java
>--- src/org/eclipse/uml2/uml/resource/UML22UMLResource.java	21 Apr 2008 13:28:47 -0000	1.6
>+++ src/org/eclipse/uml2/uml/resource/UML22UMLResource.java	16 Sep 2008 20:12:51 -0000
>@@ -49,10 +49,10 @@
> 
> 	String ECORE_PROFILE_URI = "pathmap://UML2_PROFILES/Ecore.profile.uml2"; //$NON-NLS-1$
> 
>-	String UML2_PROFILE_NS_URI = "http://www.eclipse.org/uml2/schemas/UML2/0"; //$NON-NLS-1$
>+	String UML2_PROFILE_NS_URI = "http://www.eclipse.org/uml2/schemas/UML2/1"; //$NON-NLS-1$
> 
> 	String UML2_PROFILE_URI = UMLResource.PROFILES_PATHMAP + "UML2." + PROFILE_FILE_EXTENSION; //$NON-NLS-1$
> 
> 	String UML2_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2"; //$NON-NLS-1$
>-
>+			
> }
>Index: src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java,v
>retrieving revision 1.34
>diff -u -r1.34 UML22UMLResourceHandler.java
>--- src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java	12 Jun 2007 12:53:20 -0000	1.34
>+++ src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java	16 Sep 2008 20:12:51 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (c) 2006, 2007 IBM Corporation and others.
>+ * Copyright (c) 2006, 2008 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
>@@ -140,6 +140,8 @@
> 	protected static final String STEREOTYPE__OPAQUE_EXPRESSION = "OpaqueExpression"; //$NON-NLS-1$
> 
> 	protected static final String STEREOTYPE__TEMPLATE_SIGNATURE = "TemplateSignature"; //$NON-NLS-1$
>+	
>+	protected static final String STEREOTYPE__TIME_EVENT = "TimeEvent"; //$NON-NLS-1$
> 
> 	protected static final String TAG_DEFINITION__BEHAVIOR = "behavior"; //$NON-NLS-1$
> 
>@@ -160,6 +162,8 @@
> 	protected static final String TAG_DEFINITION__SIGNATURE = "signature"; //$NON-NLS-1$
> 
> 	protected static final String TAG_DEFINITION__SYMBOL = "symbol"; //$NON-NLS-1$
>+	
>+	protected static final String TAG_DEFINITION__WHEN = "when"; //$NON-NLS-1$
> 
> 	protected static final String UML2_UML_PACKAGE_2_0_NS_URI = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$
> 
>@@ -1771,15 +1775,18 @@
> 								eObject = getEObject(extension, resource,
> 									"when", true); //$NON-NLS-1$
> 
>+								//
>+								// TODO: Double check.  
>+								// In addition, add cases for defaultClassifier etc.
>+								//
> 								if (eObject instanceof ValueSpecification) {
>+									
> 									event = (TimeEvent) trigger
> 										.getNearestPackage()
> 										.createPackagedElement(
> 											trigger.getName(),
> 											UMLPackage.Literals.TIME_EVENT);
>-									((TimeEvent) event)
>-										.setWhen((ValueSpecification) eObject);
>-
>+																		
> 									Object value = getValue(extension
> 										.getAnyAttribute(), "isRelative", true); //$NON-NLS-1$
> 
>@@ -1788,6 +1795,18 @@
> 											.setIsRelative(Boolean.valueOf(
> 												(String) value).booleanValue());
> 									}
>+									
>+									if (eObject instanceof TimeExpression) {
>+										((TimeEvent) event)
>+											.setWhen((TimeExpression) eObject);
>+										
>+									} else {
>+										UMLUtil.setTaggedValue(event,
>+											getUML2Stereotype(event,
>+												STEREOTYPE__TIME_EVENT),
>+											TAG_DEFINITION__WHEN,
>+											(TimeExpression) eObject);
>+									}
> 								}
> 							}
> 						}
>Index: src/org/eclipse/uml2/uml/resource/UMLResource.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/resource/UMLResource.java,v
>retrieving revision 1.9
>diff -u -r1.9 UMLResource.java
>--- src/org/eclipse/uml2/uml/resource/UMLResource.java	21 Apr 2008 13:28:47 -0000	1.9
>+++ src/org/eclipse/uml2/uml/resource/UMLResource.java	16 Sep 2008 20:12:51 -0000
>@@ -95,6 +95,7 @@
> 
> 	String UML_2_0_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_0_0"; //$NON-NLS-1$
> 
>-	String UML_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_1_0"; //$NON-NLS-1$
>-
>+	String UML_2_1_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_1_0"; //$NON-NLS-1$
>+	
>+			
> } // UMLResource
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/plugin.properties,v
>retrieving revision 1.22
>diff -u -r1.22 plugin.properties
>--- plugin.properties	6 May 2008 21:42:15 -0000	1.22
>+++ plugin.properties	16 Sep 2008 20:12:51 -0000
>@@ -202,12 +202,14 @@
> _UI_UML_content_type = UML2 UML File
> _UI_UML_2_0_0_content_type = UML2 2.0.0 UML File
> _UI_UML_2_1_0_content_type = UML2 2.1.0 UML File
>+_UI_UML_3_0_0_content_type = UML2 3.0.0 UML File
> 
> _UI_UML2_content_type = UML2 1.0.0 File
> 
> _UI_OMG_UML_content_type = OMG UML File
> _UI_OMG_UML_2_1_content_type = OMG UML 2.1 File
> _UI_OMG_UML_2_1_1_content_type = OMG UML 2.1.1 File
>+_UI_OMG_UML_2_2_content_type = OMG UML 2.2 File
> 
> _UI_OMG_CMOF_content_type = OMG CMOF 2.0 File
> 
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF,v
>retrieving revision 1.17
>diff -u -r1.17 MANIFEST.MF
>--- META-INF/MANIFEST.MF	19 Aug 2008 18:41:04 -0000	1.17
>+++ META-INF/MANIFEST.MF	16 Sep 2008 20:12:51 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true
>-Bundle-Version: 2.2.100.qualifier
>+Bundle-Version: 3.0.0.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation
> Bundle-Vendor: %providerName
>Index: src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java
>diff -N src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,329 @@
>+/*
>+ * Copyright (c) 2008 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *   IBM - initial API and implementation
>+ *
>+ */
>+
>+package org.eclipse.uml2.uml.resource;
>+
>+import java.io.InputStream;
>+import java.util.Collection;
>+import java.util.Iterator;
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.common.util.URI;
>+import org.eclipse.emf.common.util.UniqueEList;
>+import org.eclipse.emf.ecore.EAnnotation;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.emf.ecore.resource.ResourceSet;
>+import org.eclipse.emf.ecore.util.ExtendedMetaData;
>+import org.eclipse.emf.ecore.util.FeatureMap;
>+import org.eclipse.emf.ecore.xmi.XMLResource;
>+import org.eclipse.emf.ecore.xmi.impl.BasicResourceHandler;
>+import org.eclipse.emf.ecore.xml.type.AnyType;
>+import org.eclipse.uml2.common.util.UML2Util;
>+import org.eclipse.uml2.uml.ClassifierTemplateParameter;
>+import org.eclipse.uml2.uml.Element;
>+import org.eclipse.uml2.uml.ParameterableElement;
>+import org.eclipse.uml2.uml.Profile;
>+import org.eclipse.uml2.uml.Property;
>+import org.eclipse.uml2.uml.Stereotype;
>+import org.eclipse.uml2.uml.TimeEvent;
>+import org.eclipse.uml2.uml.TimeExpression;
>+import org.eclipse.uml2.uml.UMLPackage;
>+import org.eclipse.uml2.uml.util.UMLSwitch;
>+import org.eclipse.uml2.uml.util.UMLUtil;
>+
>+public class UML2122UML30ResourceHandler
>+		extends BasicResourceHandler {
>+
>+	protected static final boolean DEBUG = true;
>+
>+	protected static final String STEREOTYPE__TIME_EVENT = "TimeEvent"; //$NON-NLS-1$
>+
>+	protected static final String STEREOTYPE__PROPERTY = "Property"; //$NON-NLS-1$
>+
>+	protected static final String STEREOTYPE__CLASSIFIER_TEMPLATE_PARAMETER = "ClassifierTemplateParameter"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__WHEN = "when"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__DEFAULT_CLASSIFER = "defaultClassifier"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__TEMPLATE_BINDING = "templateBinding"; //$NON-NLS-1$
>+
>+	protected static final String TAG_DEFINITION__OWNED_TEMPLATE_SIGNATURE = "ownedTemplateSignature"; //$NON-NLS-1$
>+
>+
>+	protected AnyType getExtension(XMLResource resource, EObject eObject) {
>+		return resource.getEObjectToExtensionMap().get(eObject);
>+	}
>+
>+	protected AnyType putExtension(XMLResource resource, EObject eObject,
>+			AnyType extension) {
>+		return resource.getEObjectToExtensionMap().put(eObject, extension);
>+	}
>+
>+	protected AnyType removeExtension(XMLResource resource, EObject eObject) {
>+		return resource.getEObjectToExtensionMap().remove(eObject);
>+	}
>+
>+	protected Object getValue(FeatureMap featureMap, String name) {
>+		return getValue(featureMap, name, false);
>+	}
>+
>+	protected Object getValue(FeatureMap featureMap, String name, boolean remove) {
>+
>+		for (Iterator<FeatureMap.Entry> entries = featureMap.iterator(); entries
>+			.hasNext();) {
>+
>+			FeatureMap.Entry entry = entries.next();
>+
>+			if (name.equals(entry.getEStructuralFeature().getName())) {
>+
>+				if (remove) {
>+					entries.remove();
>+				}
>+
>+				return entry.getValue();
>+			}
>+		}
>+
>+		return null;
>+	}
>+
>+	private EObject getEObject(AnyType extension, Resource resource,
>+			String name, boolean remove) {
>+
>+		if (extension != null) {
>+			Object value = getValue(extension.getAnyAttribute(), name, remove);
>+
>+			if (value == null) {
>+				value = getValue(extension.getMixed(), name, remove);
>+
>+				if (value instanceof EObject) {
>+					return (EObject) value;
>+				}
>+			} else if (value instanceof String && resource != null) {
>+				return resource.getEObject((String) value);
>+			}
>+		}
>+
>+		return null;
>+	}
>+
>+	protected Collection<Object> getValues(FeatureMap featureMap, String name) {
>+		return getValues(featureMap, name, false);
>+	}
>+
>+	protected Collection<Object> getValues(FeatureMap featureMap, String name,
>+			boolean remove) {
>+		Collection<Object> values = new UniqueEList.FastCompare<Object>();
>+
>+		for (Iterator<FeatureMap.Entry> entries = featureMap.iterator(); entries
>+			.hasNext();) {
>+
>+			FeatureMap.Entry entry = entries.next();
>+
>+			if (name.equals(entry.getEStructuralFeature().getName())) {
>+
>+				if (remove) {
>+					entries.remove();
>+				}
>+
>+				values.add(entry.getValue());
>+			}
>+		}
>+
>+		return values;
>+	}
>+
>+	private Collection<EObject> getEObjects(AnyType extension,
>+			Resource resource, String name, boolean remove) {
>+		Collection<EObject> eObjects = new UniqueEList.FastCompare<EObject>();
>+
>+		if (extension != null) {
>+			Collection<Object> values = getValues(extension.getAnyAttribute(),
>+				name, remove);
>+
>+			if (values.isEmpty()) {
>+				values = getValues(extension.getMixed(), name, remove);
>+
>+				for (Object value : values) {
>+
>+					if (value instanceof EObject) {
>+						eObjects.add((EObject) value);
>+					}
>+				}
>+			} else if (resource != null) {
>+
>+				for (Object value : values) {
>+
>+					if (value instanceof String) {
>+						EObject eObject = resource.getEObject((String) value);
>+
>+						if (eObject != null) {
>+							eObjects.add(eObject);
>+						}
>+					}
>+				}
>+			}
>+		}
>+
>+		return eObjects;
>+	}
>+
>+	protected Profile getUML2Profile(Element element) {
>+		Resource eResource = element.eResource();
>+
>+		if (eResource != null) {
>+			ResourceSet resourceSet = eResource.getResourceSet();
>+
>+			if (resourceSet != null) {
>+				return UML2Util.load(resourceSet, URI
>+					.createURI(UML22UMLResource.UML2_PROFILE_URI),
>+					UMLPackage.Literals.PROFILE);
>+			}
>+		}
>+
>+		return null;
>+	}
>+
>+	protected Stereotype getUML2Stereotype(Element element, String name) {
>+		Profile uml2Profile = getUML2Profile(element);
>+
>+		return uml2Profile != null
>+			? uml2Profile.getOwnedStereotype(name)
>+			: null;
>+	}
>+	
>+	
>+	
>+	@Override
>+	public void postLoad(final XMLResource resource, InputStream inputStream,
>+			Map<?, ?> options) {
>+
>+		final EList<EObject> resourceContents = resource.getContents();
>+
>+		UMLSwitch<Object> umlSwitch = new UMLSwitch<Object>() {
>+
>+			@Override
>+			public Object caseTimeEvent(TimeEvent timeEvent) {
>+
>+				AnyType extension = getExtension(resource, timeEvent);
>+				if (extension != null) {
>+					EObject value = getEObject(extension, resource,
>+						"when", true); //$NON-NLS-1$
>+
>+					if (value instanceof TimeExpression) {
>+						timeEvent.setWhen((TimeExpression) value);
>+
>+					} else {
>+						UMLUtil.setTaggedValue(timeEvent, getUML2Stereotype(
>+							timeEvent, STEREOTYPE__TIME_EVENT),
>+							TAG_DEFINITION__WHEN, value);
>+					}
>+				}
>+
>+				return super.caseTimeEvent(timeEvent);
>+			}
>+
>+			@Override
>+			public Object caseProperty(Property property) {
>+				AnyType extension = getExtension(resource, property);
>+				if (extension != null) {
>+
>+					EObject ownedTemplateSignature = getEObject(extension,
>+						resource, "ownedTemplateSignature", true); //$NON-NLS-1$
>+
>+					UMLUtil.setTaggedValue(property, getUML2Stereotype(
>+						property, STEREOTYPE__PROPERTY),
>+						TAG_DEFINITION__OWNED_TEMPLATE_SIGNATURE,
>+						ownedTemplateSignature);
>+
>+					Collection<EObject> templateBindings = getEObjects(
>+						extension, resource, "templateBinding", true); //$NON-NLS-1$
>+
>+					if (!templateBindings.isEmpty()) {
>+						UMLUtil.setTaggedValue(property, getUML2Stereotype(
>+							property, STEREOTYPE__PROPERTY),
>+							TAG_DEFINITION__TEMPLATE_BINDING, templateBindings);
>+					}
>+				}
>+
>+				return super.caseProperty(property);
>+			}
>+
>+			@Override
>+			public Object caseClassifierTemplateParameter(
>+					ClassifierTemplateParameter classifierTemplateParameter) {
>+
>+				AnyType extension = getExtension(resource,
>+					classifierTemplateParameter);
>+
>+				if (extension != null) {
>+					EObject value = getEObject(extension, resource,
>+						"defaultClassifier", true); //$NON-NLS-1$
>+
>+					if (classifierTemplateParameter.getDefault() == null) {
>+
>+						classifierTemplateParameter
>+							.setDefault((ParameterableElement) value);
>+
>+					} else {
>+						UMLUtil.setTaggedValue(classifierTemplateParameter,
>+							getUML2Stereotype(classifierTemplateParameter,
>+								STEREOTYPE__CLASSIFIER_TEMPLATE_PARAMETER),
>+							TAG_DEFINITION__DEFAULT_CLASSIFER, value);
>+					}
>+				}
>+				return super
>+					.caseClassifierTemplateParameter(classifierTemplateParameter);
>+			}
>+
>+			@Override
>+			public Object defaultCase(EObject eObject) {
>+				AnyType extension = getExtension(resource, eObject);
>+
>+				if (extension != null) {
>+
>+					if (extension.getAnyAttribute().isEmpty()
>+						&& extension.getMixed().isEmpty()) {
>+
>+						removeExtension(resource, eObject);
>+					} else if (DEBUG) {
>+						System.out.println(eObject);
>+						System.out.println("->"); //$NON-NLS-1$
>+						System.out.println(extension);
>+
>+						EAnnotation eAnnotation = UML2Util.createEAnnotation(
>+							null, ExtendedMetaData.ANNOTATION_URI);
>+
>+						eAnnotation.getContents().add(extension);
>+						eAnnotation.getReferences().add(eObject);
>+
>+						resourceContents.add(eAnnotation);
>+					}
>+				}
>+
>+				for (EObject eContent : eObject.eContents()) {
>+					doSwitch(eContent);
>+				}
>+
>+				return eObject;
>+			}
>+		};
>+
>+		for (int i = 0; i < resourceContents.size(); i++) {
>+			umlSwitch.doSwitch(resourceContents.get(i));
>+		}
>+
>+	}
>+}
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,28 @@
>+/*
>+ * Copyright (c) 2008 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *   IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import org.eclipse.emf.ecore.xmi.XMLHelper;
>+import org.xml.sax.helpers.DefaultHandler;
>+
>+public class UML212UML30LoadImpl
>+		extends UMLLoadImpl {
>+
>+	public UML212UML30LoadImpl(XMLHelper helper) {
>+		super(helper);
>+	}
>+
>+	@Override
>+	protected DefaultHandler makeDefaultHandler() {
>+		return new UML212UML30Handler(resource, helper, options);
>+	}
>+}
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+/*
>+ * Copyright (c) 2008 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *   IBM - initial API and implementation
>+ *
>+ */
>+
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import org.eclipse.emf.common.util.URI;
>+import org.eclipse.emf.ecore.xmi.XMLLoad;
>+
>+public class UML212UML30ResourceImpl
>+		extends UMLResourceImpl {
>+
>+	public UML212UML30ResourceImpl(URI uri) {
>+		super(uri);
>+	}
>+
>+	@Override
>+	protected XMLLoad createXMLLoad() {
>+		return new UML212UML30LoadImpl(createXMLHelper());
>+	}
>+}
>Index: src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java
>diff -N src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/resource/UML212UML30Resource.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,29 @@
>+/*
>+ * Copyright (c) 2008 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *   IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.resource;
>+
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.uml2.uml.internal.resource.UML212UML30ResourceFactoryImpl;
>+
>+public interface UML212UML30Resource
>+		extends UMLResource {
>+
>+	public interface Factory
>+			extends Resource.Factory {
>+
>+		public static final Factory INSTANCE = new UML212UML30ResourceFactoryImpl();
>+	}
>+
>+	String UML_METAMODEL_NS_URI = "http://www.eclipse.org/uml2/2.1.0/UML"; //$NON-NLS-1$
>+
>+	String UML2_3_0_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_3_0_0"; //$NON-NLS-1$
>+}
>Index: src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java
>diff -N src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/resource/UML212UML30ExtendedMetaData.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,59 @@
>+/*
>+ * Copyright (c) 2008 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *   IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.resource;
>+
>+import java.util.HashMap;
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.EClassifier;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLRegistry;
>+import org.eclipse.emf.mapping.ecore2xml.util.Ecore2XMLExtendedMetaData;
>+import org.eclipse.uml2.uml.UMLPackage;
>+
>+public class UML212UML30ExtendedMetaData
>+		extends Ecore2XMLExtendedMetaData {
>+
>+	protected static Map<String, Map<EClassifier, String>> featureToTypeMap = null;
>+
>+	public static Map<String, Map<EClassifier, String>> getFeatureToTypeMap() {
>+
>+		if (featureToTypeMap == null) {
>+			featureToTypeMap = new HashMap<String, Map<EClassifier, String>>();
>+
>+			Map<EClassifier, String> typeMap = null;
>+
>+			typeMap = new HashMap<EClassifier, String>();
>+			typeMap.put(UMLPackage.Literals.PROPERTY, "uml:TemplateSignature"); //$NON-NLS-1$
>+			featureToTypeMap.put("ownedTemplateSignature", typeMap); //$NON-NLS-1$
>+
>+			typeMap = new HashMap<EClassifier, String>();
>+			typeMap.put(UMLPackage.Literals.PROPERTY, "uml:TemplateBinding"); //$NON-NLS-1$
>+			featureToTypeMap.put("templateBinding", typeMap); //$NON-NLS-1$
>+
>+			typeMap = new HashMap<EClassifier, String>();
>+			typeMap.put(UMLPackage.Literals.CLASSIFIER_TEMPLATE_PARAMETER,
>+				"uml:Classifier"); //$NON-NLS-1$
>+			featureToTypeMap.put("defaultClassifier", typeMap); //$NON-NLS-1$
>+		}
>+
>+		return featureToTypeMap;
>+	}
>+	
>+	
>+	public UML212UML30ExtendedMetaData(EPackage.Registry ePackageRegistry,
>+			Ecore2XMLRegistry ecore2xmlRegistry) {
>+		super(ePackageRegistry, ecore2xmlRegistry);
>+	}
>+	
>+	
>+}
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30ResourceFactoryImpl.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,97 @@
>+/*
>+ * Copyright (c) 2008 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *   IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.common.util.URI;
>+import org.eclipse.emf.ecore.EPackage;
>+import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.emf.ecore.resource.ResourceSet;
>+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
>+import org.eclipse.emf.ecore.util.ExtendedMetaData;
>+import org.eclipse.emf.ecore.xmi.XMLResource;
>+import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLPackage;
>+import org.eclipse.emf.mapping.ecore2xml.Ecore2XMLRegistry;
>+import org.eclipse.emf.mapping.ecore2xml.impl.Ecore2XMLRegistryImpl;
>+import org.eclipse.uml2.uml.UMLPackage;
>+import org.eclipse.uml2.uml.resource.UML212UML30Resource;
>+import org.eclipse.uml2.uml.resource.UML2122UML30ResourceHandler;
>+import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData;
>+import org.eclipse.uml2.uml.resource.UML22UMLResource;
>+import org.eclipse.uml2.uml.resource.UMLResource;
>+
>+public class UML212UML30ResourceFactoryImpl
>+		extends UMLResourceFactoryImpl
>+		implements UML212UML30Resource.Factory {
>+
>+	public UML212UML30ResourceFactoryImpl() {
>+		super();
>+	}
>+
>+	@Override
>+	public Resource createResourceGen(URI uri) {
>+		UML212UML30ResourceImpl result = new UML212UML30ResourceImpl(
>+			uri);
>+		result.setEncoding(UML22UMLResource.DEFAULT_ENCODING);
>+		return result;
>+	}
>+
>+	@Override
>+	public Resource createResource(URI uri) {
>+		UMLResource resource = (UMLResource) super.createResource(uri);
>+
>+		Map<Object, Object> defaultLoadOptions = resource
>+			.getDefaultLoadOptions();
>+
>+		EPackage.Registry ePackageRegistry = new EPackageRegistryImpl(
>+			EPackage.Registry.INSTANCE);
>+		ePackageRegistry.put(UML212UML30Resource.UML_METAMODEL_NS_URI,
>+			UMLPackage.eINSTANCE);
>+
>+		ePackageRegistry
>+			.put(
>+				"platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore", UMLPackage.eINSTANCE); //$NON-NLS-1$
>+
>+		ResourceSet resourceSet = new ResourceSetImpl();
>+		resourceSet.setPackageRegistry(ePackageRegistry);
>+
>+		Ecore2XMLRegistry ecore2xmlRegistry = new Ecore2XMLRegistryImpl(
>+			Ecore2XMLRegistry.INSTANCE);
>+		ecore2xmlRegistry
>+			.put(
>+				UML212UML30Resource.UML_METAMODEL_NS_URI,
>+				EcoreUtil
>+					.getObjectByType(
>+						resourceSet
>+							.getResource(
>+								URI
>+									.createURI("platform:/plugin/org.eclipse.uml2.uml/model/UML21_2_UML30.ecore2xml"), //$NON-NLS-1$
>+								true).getContents(),
>+						Ecore2XMLPackage.Literals.XML_MAP));
>+
>+		ExtendedMetaData extendedMetaData = new UML22UMLExtendedMetaData(
>+			ePackageRegistry, ecore2xmlRegistry);
>+
>+		defaultLoadOptions.put(XMLResource.OPTION_EXTENDED_META_DATA,
>+			extendedMetaData);
>+		defaultLoadOptions.put(XMLResource.OPTION_LAX_FEATURE_PROCESSING,
>+			Boolean.FALSE);
>+		defaultLoadOptions.put(XMLResource.OPTION_RESOURCE_HANDLER,
>+			new UML2122UML30ResourceHandler());
>+
>+		return resource;
>+	}
>+
>+}
>Index: src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java
>===================================================================
>RCS file: src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java
>diff -N src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/uml2/uml/internal/resource/UML212UML30Handler.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,68 @@
>+/*
>+ * Copyright (c) 2008 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *   IBM - initial API and implementation
>+ *
>+ */
>+package org.eclipse.uml2.uml.internal.resource;
>+
>+import java.util.Map;
>+
>+import org.eclipse.emf.ecore.EClassifier;
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EStructuralFeature;
>+import org.eclipse.emf.ecore.xmi.XMLHelper;
>+import org.eclipse.emf.ecore.xmi.XMLResource;
>+import org.eclipse.emf.ecore.xml.type.AnyType;
>+import org.eclipse.uml2.uml.resource.UML212UML30ExtendedMetaData;
>+
>+public class UML212UML30Handler
>+		extends UMLHandler {
>+
>+	public UML212UML30Handler(XMLResource xmiResource, XMLHelper helper,
>+			Map<?, ?> options) {
>+		super(xmiResource, helper, options);
>+	}
>+
>+	@Override
>+	protected void createObject(EObject peekObject, EStructuralFeature feature) {
>+
>+		if (!isNull()) {
>+			String xsiType = getXSIType();
>+
>+			Map<String, Map<EClassifier, String>> featureToTypeMap = xsiType == null
>+				? UML212UML30ExtendedMetaData.getFeatureToTypeMap()
>+				: null;
>+
>+			Map<EClassifier, String> typeMap = featureToTypeMap == null
>+				? null
>+				: featureToTypeMap.get(feature.getName());
>+
>+			if (typeMap != null) {
>+				EObject eObject = peekObject instanceof AnyType
>+					? (EObject) objects.get(objects.size() - 2)
>+					: peekObject;
>+
>+				for (Map.Entry<EClassifier, String> entry : typeMap.entrySet()) {
>+
>+					if (entry.getKey().isInstance(eObject)) {
>+						xsiType = entry.getValue();
>+						break;
>+					}
>+				}
>+			}
>+
>+			if (xsiType != null) {
>+				createObjectFromTypeName(peekObject, xsiType, feature);
>+			} else {
>+				super.createObject(peekObject, feature);
>+			}
>+		}
>+	}
>+
>+}
>#P org.eclipse.uml2.uml.editor
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF,v
>retrieving revision 1.14
>diff -u -r1.14 MANIFEST.MF
>--- META-INF/MANIFEST.MF	21 Feb 2008 18:43:03 -0000	1.14
>+++ META-INF/MANIFEST.MF	16 Sep 2008 20:12:53 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.uml2.uml.editor; singleton:=true
>-Bundle-Version: 2.2.0.qualifier
>+Bundle-Version: 2.3.0.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.uml2.uml.editor.UMLEditorPlugin$Implementation
> Bundle-Vendor: %providerName
>@@ -14,7 +14,7 @@
>  org.eclipse.uml2.uml.editor.presentation
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
>- org.eclipse.uml2.uml.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
>+ org.eclipse.uml2.uml.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
>  org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
>  org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
>  org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport
>Index: src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.editor/src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java,v
>retrieving revision 1.44
>diff -u -r1.44 UMLEditor.java
>--- src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java	12 May 2008 19:49:05 -0000	1.44
>+++ src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java	16 Sep 2008 20:12:53 -0000
>@@ -13,107 +13,81 @@
>  */
> package org.eclipse.uml2.uml.editor.presentation;
> 
>+import java.io.IOException;
>+import java.io.InputStream;
>+import java.util.ArrayList;
>+import java.util.Collection;
>+import java.util.Collections;
>+import java.util.EventObject;
>+import java.util.HashMap;
>+import java.util.Iterator;
>+import java.util.LinkedHashMap;
>+import java.util.List;
>+import java.util.Map;
>+
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.resources.IResource;
>+import org.eclipse.core.resources.IResourceChangeEvent;
>+import org.eclipse.core.resources.IResourceChangeListener;
>+import org.eclipse.core.resources.IResourceDelta;
>+import org.eclipse.core.resources.IResourceDeltaVisitor;
>+import org.eclipse.core.resources.ResourcesPlugin;
>+import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.emf.common.CommonPlugin;
> import org.eclipse.emf.common.command.BasicCommandStack;
> import org.eclipse.emf.common.command.Command;
> import org.eclipse.emf.common.command.CommandStack;
> import org.eclipse.emf.common.command.CommandStackListener;
>-
>-import org.eclipse.emf.common.util.BasicDiagnostic;
>-import org.eclipse.emf.common.util.Diagnostic;
>-
> import org.eclipse.emf.common.notify.AdapterFactory;
>-
> import org.eclipse.emf.common.notify.Notification;
>-
>+import org.eclipse.emf.common.ui.MarkerHelper;
>+import org.eclipse.emf.common.ui.URIEditorInput;
> import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;
> import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
> import org.eclipse.emf.common.ui.viewer.IViewerProvider;
>-
>+import org.eclipse.emf.common.util.BasicDiagnostic;
>+import org.eclipse.emf.common.util.Diagnostic;
> import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.common.util.URI;
>-
>+import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.emf.ecore.EValidator;
>+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
>+import org.eclipse.emf.ecore.resource.Resource;
>+import org.eclipse.emf.ecore.resource.ResourceSet;
>+import org.eclipse.emf.ecore.util.EContentAdapter;
>+import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
> import org.eclipse.emf.edit.domain.EditingDomain;
> import org.eclipse.emf.edit.domain.IEditingDomainProvider;
>-
> import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
> import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
> import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
> import org.eclipse.emf.edit.provider.IItemPropertySource;
>-
>-//import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
>-
>-//import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
>-
> import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
>-
> import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
>-
> import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
> import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
> import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
>-
> import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
> import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
>-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
> import org.eclipse.emf.edit.ui.provider.PropertyDescriptor;
> import org.eclipse.emf.edit.ui.provider.PropertySource;
>-
>-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
>-
>-import org.eclipse.emf.common.ui.MarkerHelper;
>-import org.eclipse.emf.common.ui.URIEditorInput;
>+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
> import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
>-
> import org.eclipse.emf.edit.ui.util.EditUIUtil;
>-import org.eclipse.emf.ecore.EObject;
>-import org.eclipse.emf.ecore.EValidator;
>-
>-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
>-import org.eclipse.emf.ecore.resource.Resource;
>-import org.eclipse.emf.ecore.resource.ResourceSet;
>-import org.eclipse.emf.ecore.util.EcoreUtil;
>-
>-import org.eclipse.emf.ecore.util.EContentAdapter;
>-
>-import java.io.IOException;
>-
>-import java.io.InputStream;
>-
>-import java.util.ArrayList;
>-import java.util.Collection;
>-import java.util.Collections;
>-import java.util.EventObject;
>-import java.util.Iterator;
>-import java.util.List;
>-import java.util.Map;
>-
>-import java.util.LinkedHashMap;
>-
>-import org.eclipse.core.resources.IFile;
>-import org.eclipse.core.resources.IMarker;
>-import org.eclipse.core.resources.IResource;
>-import org.eclipse.core.resources.IResourceChangeListener;
>-import org.eclipse.core.resources.IResourceChangeEvent;
>-import org.eclipse.core.resources.IResourceDelta;
>-import org.eclipse.core.resources.IResourceDeltaVisitor;
>-import org.eclipse.core.resources.ResourcesPlugin;
>-
>-import org.eclipse.core.runtime.CoreException;
>-import org.eclipse.core.runtime.IPath;
>-import org.eclipse.core.runtime.IProgressMonitor;
>-
>+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
> import org.eclipse.jface.action.IMenuListener;
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.jface.action.IStatusLineManager;
> import org.eclipse.jface.action.IToolBarManager;
> import org.eclipse.jface.action.MenuManager;
> import org.eclipse.jface.action.Separator;
>-
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.dialogs.ProgressMonitorDialog;
>-
> import org.eclipse.jface.viewers.ILabelProvider;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.ISelectionChangedListener;
>@@ -125,50 +99,37 @@
> import org.eclipse.jface.viewers.StructuredViewer;
> import org.eclipse.jface.viewers.TreeViewer;
> import org.eclipse.jface.viewers.Viewer;
>-
> import org.eclipse.swt.SWT;
>-
> import org.eclipse.swt.custom.CTabFolder;
>-
> import org.eclipse.swt.dnd.DND;
> import org.eclipse.swt.dnd.Transfer;
>-
> import org.eclipse.swt.events.ControlAdapter;
> import org.eclipse.swt.events.ControlEvent;
>-
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.graphics.Point;
>-
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Menu;
> import org.eclipse.swt.widgets.Tree;
>-
> import org.eclipse.ui.IActionBars;
> import org.eclipse.ui.IEditorInput;
> import org.eclipse.ui.IEditorPart;
> import org.eclipse.ui.IEditorSite;
> import org.eclipse.ui.IPartListener;
> import org.eclipse.ui.IWorkbenchPart;
>-
> import org.eclipse.ui.PartInitException;
>-
>+import org.eclipse.ui.actions.WorkspaceModifyOperation;
> import org.eclipse.ui.dialogs.SaveAsDialog;
>-
> import org.eclipse.ui.ide.IGotoMarker;
>-
> import org.eclipse.ui.part.FileEditorInput;
> import org.eclipse.ui.part.MultiPageEditorPart;
>-
> import org.eclipse.ui.views.contentoutline.ContentOutline;
> import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
> import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
>-
> import org.eclipse.ui.views.properties.IPropertyDescriptor;
> import org.eclipse.ui.views.properties.IPropertySheetPage;
> import org.eclipse.ui.views.properties.IPropertySource;
> import org.eclipse.ui.views.properties.PropertySheet;
> import org.eclipse.ui.views.properties.PropertySheetPage;
>-
> import org.eclipse.uml2.common.edit.domain.UML2AdapterFactoryEditingDomain;
> import org.eclipse.uml2.common.edit.provider.IItemQualifiedTextProvider;
> import org.eclipse.uml2.common.util.UML2Util;
>@@ -176,17 +137,10 @@
> 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 java.util.HashMap;
>-
>-import org.eclipse.core.runtime.NullProgressMonitor;
>-
>-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.UML212UML30Resource;
> import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData;
> import org.eclipse.uml2.uml.resource.UML22UMLResource;
> import org.eclipse.uml2.uml.resource.UMLResource;
>@@ -457,9 +411,10 @@
> 							if (delta.getKind() == IResourceDelta.REMOVED
> 								|| delta.getKind() == IResourceDelta.CHANGED
> 								&& delta.getFlags() != IResourceDelta.MARKERS) {
>-								Resource resource = resourceSet.getResource(URI
>-									.createURI(delta.getFullPath().toString()),
>-									false);
>+								Resource resource = resourceSet
>+									.getResource(URI.createPlatformResourceURI(
>+										delta.getFullPath().toString(), true),
>+										false);
> 								if (resource != null) {
> 									if (delta.getKind() == IResourceDelta.REMOVED) {
> 										removedResources.add(resource);
>@@ -494,7 +449,6 @@
> 								public void run() {
> 									getSite().getPage().closeEditor(
> 										UMLEditor.this, false);
>-									UMLEditor.this.dispose();
> 								}
> 							});
> 					}
>@@ -536,7 +490,6 @@
> 		if (!removedResources.isEmpty()) {
> 			if (handleDirtyConflict()) {
> 				getSite().getPage().closeEditor(UMLEditor.this, false);
>-				UMLEditor.this.dispose();
> 			} else {
> 				removedResources.clear();
> 				changedResources.clear();
>@@ -950,6 +903,9 @@
> 			UML22UMLResource.UML2_CONTENT_TYPE_IDENTIFIER,
> 			UML22UMLResource.Factory.INSTANCE);
> 		contentTypeToFactoryMap.put(
>+			UMLResource.UML_2_1_0_CONTENT_TYPE_IDENTIFIER,  
>+			UML212UML30Resource.Factory.INSTANCE);
>+		contentTypeToFactoryMap.put(
> 			XMI2UMLResource.UML_CONTENT_TYPE_IDENTIFIER,
> 			XMI2UMLResource.Factory.INSTANCE);
> 		contentTypeToFactoryMap.put(
>#P org.eclipse.uml2.uml.edit
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/plugin.properties,v
>retrieving revision 1.17
>diff -u -r1.17 plugin.properties
>--- plugin.properties	6 May 2008 21:42:25 -0000	1.17
>+++ plugin.properties	16 Sep 2008 20:12:54 -0000
>@@ -921,3 +921,8 @@
> _UI_ExpansionKind_stream_literal = Stream
> 
> _UI_UML_category = UML
>+_UI_StartObjectBehaviorAction_type = Start Object Behavior Action
>+_UI_DecisionNode_decisionInputFlow_feature = Decision Input Flow
>+_UI_WriteStructuralFeatureAction_result_feature = Result
>+_UI_ClearStructuralFeatureAction_result_feature = Result
>+_UI_StartObjectBehaviorAction_object_feature = Object
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.uml2/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF,v
>retrieving revision 1.12
>diff -u -r1.12 MANIFEST.MF
>--- META-INF/MANIFEST.MF	21 Feb 2008 18:42:59 -0000	1.12
>+++ META-INF/MANIFEST.MF	16 Sep 2008 20:12:54 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.uml2.uml.edit; singleton:=true
>-Bundle-Version: 2.2.0.qualifier
>+Bundle-Version: 3.0.0.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.uml2.uml.edit.UMLEditPlugin$Implementation
> Bundle-Vendor: %providerName
>@@ -11,7 +11,7 @@
> Export-Package: org.eclipse.uml2.uml.edit,
>  org.eclipse.uml2.uml.edit.providers
> Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
>- org.eclipse.uml2.uml;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
>+ org.eclipse.uml2.uml;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
>  org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
>  org.eclipse.uml2.common.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
> Eclipse-LazyStart: true

Actions: View | Diff

Attachments on bug 232332: 102055 | 107831 | 108973 | 109782 | 110039 | 110408 | 110493 | 110602 | 110612 | 110614 | 110686 | 110687 | 111318 | 112701 | 112702 | 113401 | 113403 | 113416 | 113623 | 113916 | 114095