Attachment #112702 for bug #232332

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




<?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/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/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"/>

        <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/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"/>

        <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/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/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/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/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/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/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/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/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/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"/>

        <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/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/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"/>

        <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"/>

Lines 5-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
5	Bundle-Version: 2.2.0.qualifier	5	Bundle-Version: 2.2.0.qualifier
6	Bundle-Vendor: %providerName	6	Bundle-Vendor: %providerName
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.uml2.uml;bundle-version="[2.1.0,3.0.0)"	8	Require-Bundle: org.eclipse.uml2.uml;bundle-version="[3.0.0,4.0.0)"




									for (TemplateParameterSubstitution parameterSubstitution : templateBinding
										.getParameterSubstitutions()) {

										ParameterableElement actual = parameterSubstitution
											.getActual();

										if (actual == null) {
											.isEmpty()
											? null
											: actuals.get(0);

										if (argument == null) {
											TemplateParameter formal = parameterSubstitution
												.getFormal();

											if (formal != null) {
												actual = formal.getDefault();
											}
										}

										if (actual instanceof Classifier) {
											eTypeArguments
												.add(getEGenericType((Classifier) actual));
										}
									}
								}


						if (!(safeEquals(parameterSubstitution.getFormal(),
							otherParameterSubstitution.getFormal()) && safeEquals(
							parameterSubstitution.getActual(),
							otherParameterSubstitution.getActual()))) {

							return false;
						}

									.createParameterSubstitution();
								parameterSubstitution
									.setFormal(templateParameter);
								parameterSubstitution.setActual(argumentType);
									argumentType);
							}
						}
					}

Lines 49-58 Link Here

(-)src/org/eclipse/uml2/uml/resource/UML22UMLResource.java (-2 / +2 lines)
49		49
50	String ECORE_PROFILE_URI = "pathmap://UML2_PROFILES/Ecore.profile.uml2"; //$NON-NLS-1$	50	String ECORE_PROFILE_URI = "pathmap://UML2_PROFILES/Ecore.profile.uml2"; //$NON-NLS-1$
51		51
52	String UML2_PROFILE_NS_URI = "http://www.eclipse.org/uml2/schemas/UML2/0"; //$NON-NLS-1$	52	String UML2_PROFILE_NS_URI = "http://www.eclipse.org/uml2/schemas/UML2/1"; //$NON-NLS-1$
53		53
54	String UML2_PROFILE_URI = UMLResource.PROFILES_PATHMAP + "UML2." + PROFILE_FILE_EXTENSION; //$NON-NLS-1$	54	String UML2_PROFILE_URI = UMLResource.PROFILES_PATHMAP + "UML2." + PROFILE_FILE_EXTENSION; //$NON-NLS-1$
55		55
56	String UML2_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2"; //$NON-NLS-1$	56	String UML2_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2"; //$NON-NLS-1$
57		57
58	}	58	}

Lines 1-5 Link Here

(-)src/org/eclipse/uml2/uml/resource/UML22UMLResourceHandler.java (-4 / +23 lines)
1	/*	1	/*
2	* Copyright (c) 2006, 2007 IBM Corporation and others.	2	* Copyright (c) 2006, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 140-145 Link Here
140	protected static final String STEREOTYPE__OPAQUE_EXPRESSION = "OpaqueExpression"; //$NON-NLS-1$	140	protected static final String STEREOTYPE__OPAQUE_EXPRESSION = "OpaqueExpression"; //$NON-NLS-1$
141		141
142	protected static final String STEREOTYPE__TEMPLATE_SIGNATURE = "TemplateSignature"; //$NON-NLS-1$	142	protected static final String STEREOTYPE__TEMPLATE_SIGNATURE = "TemplateSignature"; //$NON-NLS-1$
		143
		144	protected static final String STEREOTYPE__TIME_EVENT = "TimeEvent"; //$NON-NLS-1$
143		145
144	protected static final String TAG_DEFINITION__BEHAVIOR = "behavior"; //$NON-NLS-1$	146	protected static final String TAG_DEFINITION__BEHAVIOR = "behavior"; //$NON-NLS-1$
145		147
Lines 160-165 Link Here
160	protected static final String TAG_DEFINITION__SIGNATURE = "signature"; //$NON-NLS-1$	162	protected static final String TAG_DEFINITION__SIGNATURE = "signature"; //$NON-NLS-1$
161		163
162	protected static final String TAG_DEFINITION__SYMBOL = "symbol"; //$NON-NLS-1$	164	protected static final String TAG_DEFINITION__SYMBOL = "symbol"; //$NON-NLS-1$
		165
		166	protected static final String TAG_DEFINITION__WHEN = "when"; //$NON-NLS-1$
163		167
164	protected static final String UML2_UML_PACKAGE_2_0_NS_URI = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$	168	protected static final String UML2_UML_PACKAGE_2_0_NS_URI = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$
165		169
Lines 1771-1785 Link Here
1771	eObject = getEObject(extension, resource,	1775	eObject = getEObject(extension, resource,
1772	"when", true); //$NON-NLS-1$	1776	"when", true); //$NON-NLS-1$
1773		1777
		1778	//
		1779	// TODO: Double check.
		1780	// In addition, add cases for defaultClassifier etc.
		1781	//
1774	if (eObject instanceof ValueSpecification) {	1782	if (eObject instanceof ValueSpecification) {
		1783
1775	event = (TimeEvent) trigger	1784	event = (TimeEvent) trigger
1776	.getNearestPackage()	1785	.getNearestPackage()
1777	.createPackagedElement(	1786	.createPackagedElement(
1778	trigger.getName(),	1787	trigger.getName(),
1779	UMLPackage.Literals.TIME_EVENT);	1788	UMLPackage.Literals.TIME_EVENT);
1780	((TimeEvent) event)	1789
1781	.setWhen((ValueSpecification) eObject);
1782
1783	Object value = getValue(extension	1790	Object value = getValue(extension
1784	.getAnyAttribute(), "isRelative", true); //$NON-NLS-1$	1791	.getAnyAttribute(), "isRelative", true); //$NON-NLS-1$
1785		1792
Lines 1788-1793 Link Here
1788	.setIsRelative(Boolean.valueOf(	1795	.setIsRelative(Boolean.valueOf(
1789	(String) value).booleanValue());	1796	(String) value).booleanValue());
1790	}	1797	}
		1798
		1799	if (eObject instanceof TimeExpression) {
		1800	((TimeEvent) event)
		1801	.setWhen((TimeExpression) eObject);
		1802
		1803	} else {
		1804	UMLUtil.setTaggedValue(event,
		1805	getUML2Stereotype(event,
		1806	STEREOTYPE__TIME_EVENT),
		1807	TAG_DEFINITION__WHEN,
		1808	(TimeExpression) eObject);
		1809	}
1791	}	1810	}
1792	}	1811	}
1793	}	1812	}

Lines 95-100 Link Here

(-)src/org/eclipse/uml2/uml/resource/UMLResource.java (-2 / +3 lines)
95		95
96	String UML_2_0_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_0_0"; //$NON-NLS-1$	96	String UML_2_0_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_0_0"; //$NON-NLS-1$
97		97
98	String UML_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_1_0"; //$NON-NLS-1$	98	String UML_2_1_0_CONTENT_TYPE_IDENTIFIER = "org.eclipse.uml2.uml_2_1_0"; //$NON-NLS-1$
99		99
		100
100	} // UMLResource	101	} // UMLResource




_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


Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true	4	Bundle-SymbolicName: org.eclipse.uml2.uml; singleton:=true
5	Bundle-Version: 2.2.100.qualifier	5	Bundle-Version: 3.0.0.qualifier
6	Bundle-ClassPath: .	6	Bundle-ClassPath: .
7	Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation	7	Bundle-Activator: org.eclipse.uml2.uml.UMLPlugin$Implementation
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName




/*
 * 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));
		}

	}
}




/*
 * 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);
	}
}




/*
 * 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());
	}
}




/*
 * 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$
}




/*
 * 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);
	}
	
	
}




/*
 * 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;
	}

}




/*
 * 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);
			}
		}
	}

}

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.uml2.uml.editor; singleton:=true	4	Bundle-SymbolicName: org.eclipse.uml2.uml.editor; singleton:=true
5	Bundle-Version: 2.2.0.qualifier	5	Bundle-Version: 2.3.0.qualifier
6	Bundle-ClassPath: .	6	Bundle-ClassPath: .
7	Bundle-Activator: org.eclipse.uml2.uml.editor.UMLEditorPlugin$Implementation	7	Bundle-Activator: org.eclipse.uml2.uml.editor.UMLEditorPlugin$Implementation
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName
Lines 14-20 Link Here
14	org.eclipse.uml2.uml.editor.presentation	14	org.eclipse.uml2.uml.editor.presentation
15	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",	15	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
16	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,	16	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
17	org.eclipse.uml2.uml.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,	17	org.eclipse.uml2.uml.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
18	org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,	18	org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
19	org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,	19	org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
20	org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport	20	org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport




 */
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.provider.UnwrappingSelectionProvider;
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.util.EditUIMarkerHelper;

import org.eclipse.emf.edit.ui.util.EditUIUtil;
import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
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.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;

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;

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;

							if (delta.getKind() == IResourceDelta.REMOVED
								|| delta.getKind() == IResourceDelta.CHANGED
								&& delta.getFlags() != IResourceDelta.MARKERS) {
								Resource resource = resourceSet
									.getResource(URI.createPlatformResourceURI(
										delta.getFullPath().toString(), true),
										false);
								if (resource != null) {
									if (delta.getKind() == IResourceDelta.REMOVED) {
										removedResources.add(resource);

								public void run() {
									getSite().getPage().closeEditor(
										UMLEditor.this, false);
									UMLEditor.this.dispose();
								}
							});
					}

		if (!removedResources.isEmpty()) {
			if (handleDirtyConflict()) {
				getSite().getPage().closeEditor(UMLEditor.this, false);
				UMLEditor.this.dispose();
			} else {
				removedResources.clear();
				changedResources.clear();

			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(

Lines 921-923 Link Here

(-)plugin.properties (+5 lines)
921	_UI_ExpansionKind_stream_literal = Stream	921	_UI_ExpansionKind_stream_literal = Stream
922		922
923	_UI_UML_category = UML	923	_UI_UML_category = UML
		924	_UI_StartObjectBehaviorAction_type = Start Object Behavior Action
		925	_UI_DecisionNode_decisionInputFlow_feature = Decision Input Flow
		926	_UI_WriteStructuralFeatureAction_result_feature = Result
		927	_UI_ClearStructuralFeatureAction_result_feature = Result
		928	_UI_StartObjectBehaviorAction_object_feature = Object

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName	3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.uml2.uml.edit; singleton:=true	4	Bundle-SymbolicName: org.eclipse.uml2.uml.edit; singleton:=true
5	Bundle-Version: 2.2.0.qualifier	5	Bundle-Version: 3.0.0.qualifier
6	Bundle-ClassPath: .	6	Bundle-ClassPath: .
7	Bundle-Activator: org.eclipse.uml2.uml.edit.UMLEditPlugin$Implementation	7	Bundle-Activator: org.eclipse.uml2.uml.edit.UMLEditPlugin$Implementation
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName
Lines 11-17 Link Here
11	Export-Package: org.eclipse.uml2.uml.edit,	11	Export-Package: org.eclipse.uml2.uml.edit,
12	org.eclipse.uml2.uml.edit.providers	12	org.eclipse.uml2.uml.edit.providers
13	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",	13	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
14	org.eclipse.uml2.uml;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,	14	org.eclipse.uml2.uml;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
15	org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,	15	org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
16	org.eclipse.uml2.common.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport	16	org.eclipse.uml2.common.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
17	Eclipse-LazyStart: true	17	Eclipse-LazyStart: true

Return to bug 232332

Lines 2466-2491 Link Here

(-)src/org/eclipse/uml2/uml/util/UMLUtil.java (-15 / +9 lines)
2466	for (TemplateParameterSubstitution parameterSubstitution : templateBinding	2466	for (TemplateParameterSubstitution parameterSubstitution : templateBinding
2467	.getParameterSubstitutions()) {	2467	.getParameterSubstitutions()) {
2468		2468
2469	EList<ParameterableElement> actuals = parameterSubstitution	2469	ParameterableElement actual = parameterSubstitution
2470	.getActuals();	2470	.getActual();
2471		2471
2472	ParameterableElement argument = actuals	2472	if (actual == null) {
2473	.isEmpty()
2474	? null
2475	: actuals.get(0);
2476
2477	if (argument == null) {
2478	TemplateParameter formal = parameterSubstitution	2473	TemplateParameter formal = parameterSubstitution
2479	.getFormal();	2474	.getFormal();
2480		2475
2481	if (formal != null) {	2476	if (formal != null) {
2482	argument = formal.getDefault();	2477	actual = formal.getDefault();
2483	}	2478	}
2484	}	2479	}
2485		2480
2486	if (argument instanceof Classifier) {	2481	if (actual instanceof Classifier) {
2487	eTypeArguments	2482	eTypeArguments
2488	.add(getEGenericType((Classifier) argument));	2483	.add(getEGenericType((Classifier) actual));
2489	}	2484	}
2490	}	2485	}
2491	}	2486	}
Lines 5866-5873 Link Here
5866		5861
5867	if (!(safeEquals(parameterSubstitution.getFormal(),	5862	if (!(safeEquals(parameterSubstitution.getFormal(),
5868	otherParameterSubstitution.getFormal()) && safeEquals(	5863	otherParameterSubstitution.getFormal()) && safeEquals(
5869	parameterSubstitution.getActuals(),	5864	parameterSubstitution.getActual(),
5870	otherParameterSubstitution.getActuals()))) {	5865	otherParameterSubstitution.getActual()))) {
5871		5866
5872	return false;	5867	return false;
5873	}	5868	}
Lines 6359-6366 Link Here
6359	.createParameterSubstitution();	6354	.createParameterSubstitution();
6360	parameterSubstitution	6355	parameterSubstitution
6361	.setFormal(templateParameter);	6356	.setFormal(templateParameter);
6362	parameterSubstitution.getActuals().add(	6357	parameterSubstitution.setActual(argumentType);
6363	argumentType);
6364	}	6358	}
6365	}	6359	}
6366	}	6360	}

Lines 202-213 Link Here

(-)plugin.properties (+2 lines)
202	_UI_UML_content_type = UML2 UML File	202	_UI_UML_content_type = UML2 UML File
203	_UI_UML_2_0_0_content_type = UML2 2.0.0 UML File	203	_UI_UML_2_0_0_content_type = UML2 2.0.0 UML File
204	_UI_UML_2_1_0_content_type = UML2 2.1.0 UML File	204	_UI_UML_2_1_0_content_type = UML2 2.1.0 UML File
		205	_UI_UML_3_0_0_content_type = UML2 3.0.0 UML File
205		206
206	_UI_UML2_content_type = UML2 1.0.0 File	207	_UI_UML2_content_type = UML2 1.0.0 File
207		208
208	_UI_OMG_UML_content_type = OMG UML File	209	_UI_OMG_UML_content_type = OMG UML File
209	_UI_OMG_UML_2_1_content_type = OMG UML 2.1 File	210	_UI_OMG_UML_2_1_content_type = OMG UML 2.1 File
210	_UI_OMG_UML_2_1_1_content_type = OMG UML 2.1.1 File	211	_UI_OMG_UML_2_1_1_content_type = OMG UML 2.1.1 File
		212	_UI_OMG_UML_2_2_content_type = OMG UML 2.2 File
211		213
212	_UI_OMG_CMOF_content_type = OMG CMOF 2.0 File	214	_UI_OMG_CMOF_content_type = OMG CMOF 2.0 File
213		215

Added Link Here

(-)src/org/eclipse/uml2/uml/resource/UML2122UML30ResourceHandler.java (+329 lines)
1	/*
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM - initial API and implementation
10	*
11	*/
12
13	package org.eclipse.uml2.uml.resource;
14
15	import java.io.InputStream;
16	import java.util.Collection;
17	import java.util.Iterator;
18	import java.util.Map;
19
20	import org.eclipse.emf.common.util.EList;
21	import org.eclipse.emf.common.util.URI;
22	import org.eclipse.emf.common.util.UniqueEList;
23	import org.eclipse.emf.ecore.EAnnotation;
24	import org.eclipse.emf.ecore.EObject;
25	import org.eclipse.emf.ecore.resource.Resource;
26	import org.eclipse.emf.ecore.resource.ResourceSet;
27	import org.eclipse.emf.ecore.util.ExtendedMetaData;
28	import org.eclipse.emf.ecore.util.FeatureMap;
29	import org.eclipse.emf.ecore.xmi.XMLResource;
30	import org.eclipse.emf.ecore.xmi.impl.BasicResourceHandler;
31	import org.eclipse.emf.ecore.xml.type.AnyType;
32	import org.eclipse.uml2.common.util.UML2Util;
33	import org.eclipse.uml2.uml.ClassifierTemplateParameter;
34	import org.eclipse.uml2.uml.Element;
35	import org.eclipse.uml2.uml.ParameterableElement;
36	import org.eclipse.uml2.uml.Profile;
37	import org.eclipse.uml2.uml.Property;
38	import org.eclipse.uml2.uml.Stereotype;
39	import org.eclipse.uml2.uml.TimeEvent;
40	import org.eclipse.uml2.uml.TimeExpression;
41	import org.eclipse.uml2.uml.UMLPackage;
42	import org.eclipse.uml2.uml.util.UMLSwitch;
43	import org.eclipse.uml2.uml.util.UMLUtil;
44
45	public class UML2122UML30ResourceHandler
46	extends BasicResourceHandler {
47
48	protected static final boolean DEBUG = true;
49
50	protected static final String STEREOTYPE__TIME_EVENT = "TimeEvent"; //$NON-NLS-1$
51
52	protected static final String STEREOTYPE__PROPERTY = "Property"; //$NON-NLS-1$
53
54	protected static final String STEREOTYPE__CLASSIFIER_TEMPLATE_PARAMETER = "ClassifierTemplateParameter"; //$NON-NLS-1$
55
56	protected static final String TAG_DEFINITION__WHEN = "when"; //$NON-NLS-1$
57
58	protected static final String TAG_DEFINITION__DEFAULT_CLASSIFER = "defaultClassifier"; //$NON-NLS-1$
59
60	protected static final String TAG_DEFINITION__TEMPLATE_BINDING = "templateBinding"; //$NON-NLS-1$
61
62	protected static final String TAG_DEFINITION__OWNED_TEMPLATE_SIGNATURE = "ownedTemplateSignature"; //$NON-NLS-1$
63
64
65	protected AnyType getExtension(XMLResource resource, EObject eObject) {
66	return resource.getEObjectToExtensionMap().get(eObject);
67	}
68
69	protected AnyType putExtension(XMLResource resource, EObject eObject,
70	AnyType extension) {
71	return resource.getEObjectToExtensionMap().put(eObject, extension);
72	}
73
74	protected AnyType removeExtension(XMLResource resource, EObject eObject) {
75	return resource.getEObjectToExtensionMap().remove(eObject);
76	}
77
78	protected Object getValue(FeatureMap featureMap, String name) {
79	return getValue(featureMap, name, false);
80	}
81
82	protected Object getValue(FeatureMap featureMap, String name, boolean remove) {
83
84	for (Iterator<FeatureMap.Entry> entries = featureMap.iterator(); entries
85	.hasNext();) {
86
87	FeatureMap.Entry entry = entries.next();
88
89	if (name.equals(entry.getEStructuralFeature().getName())) {
90
91	if (remove) {
92	entries.remove();
93	}
94
95	return entry.getValue();
96	}
97	}
98
99	return null;
100	}
101
102	private EObject getEObject(AnyType extension, Resource resource,
103	String name, boolean remove) {
104
105	if (extension != null) {
106	Object value = getValue(extension.getAnyAttribute(), name, remove);
107
108	if (value == null) {
109	value = getValue(extension.getMixed(), name, remove);
110
111	if (value instanceof EObject) {
112	return (EObject) value;
113	}
114	} else if (value instanceof String && resource != null) {
115	return resource.getEObject((String) value);
116	}
117	}
118
119	return null;
120	}
121
122	protected Collection<Object> getValues(FeatureMap featureMap, String name) {
123	return getValues(featureMap, name, false);
124	}
125
126	protected Collection<Object> getValues(FeatureMap featureMap, String name,
127	boolean remove) {
128	Collection<Object> values = new UniqueEList.FastCompare<Object>();
129
130	for (Iterator<FeatureMap.Entry> entries = featureMap.iterator(); entries
131	.hasNext();) {
132
133	FeatureMap.Entry entry = entries.next();
134
135	if (name.equals(entry.getEStructuralFeature().getName())) {
136
137	if (remove) {
138	entries.remove();
139	}
140
141	values.add(entry.getValue());
142	}
143	}
144
145	return values;
146	}
147
148	private Collection<EObject> getEObjects(AnyType extension,
149	Resource resource, String name, boolean remove) {
150	Collection<EObject> eObjects = new UniqueEList.FastCompare<EObject>();
151
152	if (extension != null) {
153	Collection<Object> values = getValues(extension.getAnyAttribute(),
154	name, remove);
155
156	if (values.isEmpty()) {
157	values = getValues(extension.getMixed(), name, remove);
158
159	for (Object value : values) {
160
161	if (value instanceof EObject) {
162	eObjects.add((EObject) value);
163	}
164	}
165	} else if (resource != null) {
166
167	for (Object value : values) {
168
169	if (value instanceof String) {
170	EObject eObject = resource.getEObject((String) value);
171
172	if (eObject != null) {
173	eObjects.add(eObject);
174	}
175	}
176	}
177	}
178	}
179
180	return eObjects;
181	}
182
183	protected Profile getUML2Profile(Element element) {
184	Resource eResource = element.eResource();
185
186	if (eResource != null) {
187	ResourceSet resourceSet = eResource.getResourceSet();
188
189	if (resourceSet != null) {
190	return UML2Util.load(resourceSet, URI
191	.createURI(UML22UMLResource.UML2_PROFILE_URI),
192	UMLPackage.Literals.PROFILE);
193	}
194	}
195
196	return null;
197	}
198
199	protected Stereotype getUML2Stereotype(Element element, String name) {
200	Profile uml2Profile = getUML2Profile(element);
201
202	return uml2Profile != null
203	? uml2Profile.getOwnedStereotype(name)
204	: null;
205	}
206
207
208
209	@Override
210	public void postLoad(final XMLResource resource, InputStream inputStream,
211	Map<?, ?> options) {
212
213	final EList<EObject> resourceContents = resource.getContents();
214
215	UMLSwitch<Object> umlSwitch = new UMLSwitch<Object>() {
216
217	@Override
218	public Object caseTimeEvent(TimeEvent timeEvent) {
219
220	AnyType extension = getExtension(resource, timeEvent);
221	if (extension != null) {
222	EObject value = getEObject(extension, resource,
223	"when", true); //$NON-NLS-1$
224
225	if (value instanceof TimeExpression) {
226	timeEvent.setWhen((TimeExpression) value);
227
228	} else {
229	UMLUtil.setTaggedValue(timeEvent, getUML2Stereotype(
230	timeEvent, STEREOTYPE__TIME_EVENT),
231	TAG_DEFINITION__WHEN, value);
232	}
233	}
234
235	return super.caseTimeEvent(timeEvent);
236	}
237
238	@Override
239	public Object caseProperty(Property property) {
240	AnyType extension = getExtension(resource, property);
241	if (extension != null) {
242
243	EObject ownedTemplateSignature = getEObject(extension,
244	resource, "ownedTemplateSignature", true); //$NON-NLS-1$
245
246	UMLUtil.setTaggedValue(property, getUML2Stereotype(
247	property, STEREOTYPE__PROPERTY),
248	TAG_DEFINITION__OWNED_TEMPLATE_SIGNATURE,
249	ownedTemplateSignature);
250
251	Collection<EObject> templateBindings = getEObjects(
252	extension, resource, "templateBinding", true); //$NON-NLS-1$
253
254	if (!templateBindings.isEmpty()) {
255	UMLUtil.setTaggedValue(property, getUML2Stereotype(
256	property, STEREOTYPE__PROPERTY),
257	TAG_DEFINITION__TEMPLATE_BINDING, templateBindings);
258	}
259	}
260
261	return super.caseProperty(property);
262	}
263
264	@Override
265	public Object caseClassifierTemplateParameter(
266	ClassifierTemplateParameter classifierTemplateParameter) {
267
268	AnyType extension = getExtension(resource,
269	classifierTemplateParameter);
270
271	if (extension != null) {
272	EObject value = getEObject(extension, resource,
273	"defaultClassifier", true); //$NON-NLS-1$
274
275	if (classifierTemplateParameter.getDefault() == null) {
276
277	classifierTemplateParameter
278	.setDefault((ParameterableElement) value);
279
280	} else {
281	UMLUtil.setTaggedValue(classifierTemplateParameter,
282	getUML2Stereotype(classifierTemplateParameter,
283	STEREOTYPE__CLASSIFIER_TEMPLATE_PARAMETER),
284	TAG_DEFINITION__DEFAULT_CLASSIFER, value);
285	}
286	}
287	return super
288	.caseClassifierTemplateParameter(classifierTemplateParameter);
289	}
290
291	@Override
292	public Object defaultCase(EObject eObject) {
293	AnyType extension = getExtension(resource, eObject);
294
295	if (extension != null) {
296
297	if (extension.getAnyAttribute().isEmpty()
298	&& extension.getMixed().isEmpty()) {
299
300	removeExtension(resource, eObject);
301	} else if (DEBUG) {
302	System.out.println(eObject);
303	System.out.println("->"); //$NON-NLS-1$
304	System.out.println(extension);
305
306	EAnnotation eAnnotation = UML2Util.createEAnnotation(
307	null, ExtendedMetaData.ANNOTATION_URI);
308
309	eAnnotation.getContents().add(extension);
310	eAnnotation.getReferences().add(eObject);
311
312	resourceContents.add(eAnnotation);
313	}
314	}
315
316	for (EObject eContent : eObject.eContents()) {
317	doSwitch(eContent);
318	}
319
320	return eObject;
321	}
322	};
323
324	for (int i = 0; i < resourceContents.size(); i++) {
325	umlSwitch.doSwitch(resourceContents.get(i));
326	}
327
328	}
329	}

Added Link Here

(-)src/org/eclipse/uml2/uml/internal/resource/UML212UML30LoadImpl.java (+28 lines)
1	/*
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM - initial API and implementation
10	*
11	*/
12	package org.eclipse.uml2.uml.internal.resource;
13
14	import org.eclipse.emf.ecore.xmi.XMLHelper;
15	import org.xml.sax.helpers.DefaultHandler;
16
17	public class UML212UML30LoadImpl
18	extends UMLLoadImpl {
19
20	public UML212UML30LoadImpl(XMLHelper helper) {
21	super(helper);
22	}
23
24	@Override
25	protected DefaultHandler makeDefaultHandler() {
26	return new UML212UML30Handler(resource, helper, options);
27	}
28	}

Lines 13-119 Link Here

(-)src/org/eclipse/uml2/uml/editor/presentation/UMLEditor.java (-90 / +46 lines)
13	*/	13	*/
14	package org.eclipse.uml2.uml.editor.presentation;	14	package org.eclipse.uml2.uml.editor.presentation;
15		15
		16	import java.io.IOException;
		17	import java.io.InputStream;
		18	import java.util.ArrayList;
		19	import java.util.Collection;
		20	import java.util.Collections;
		21	import java.util.EventObject;
		22	import java.util.HashMap;
		23	import java.util.Iterator;
		24	import java.util.LinkedHashMap;
		25	import java.util.List;
		26	import java.util.Map;
		27
		28	import org.eclipse.core.resources.IFile;
		29	import org.eclipse.core.resources.IMarker;
		30	import org.eclipse.core.resources.IResource;
		31	import org.eclipse.core.resources.IResourceChangeEvent;
		32	import org.eclipse.core.resources.IResourceChangeListener;
		33	import org.eclipse.core.resources.IResourceDelta;
		34	import org.eclipse.core.resources.IResourceDeltaVisitor;
		35	import org.eclipse.core.resources.ResourcesPlugin;
		36	import org.eclipse.core.runtime.CoreException;
		37	import org.eclipse.core.runtime.IPath;
		38	import org.eclipse.core.runtime.IProgressMonitor;
		39	import org.eclipse.core.runtime.NullProgressMonitor;
16	import org.eclipse.emf.common.CommonPlugin;	40	import org.eclipse.emf.common.CommonPlugin;
17	import org.eclipse.emf.common.command.BasicCommandStack;	41	import org.eclipse.emf.common.command.BasicCommandStack;
18	import org.eclipse.emf.common.command.Command;	42	import org.eclipse.emf.common.command.Command;
19	import org.eclipse.emf.common.command.CommandStack;	43	import org.eclipse.emf.common.command.CommandStack;
20	import org.eclipse.emf.common.command.CommandStackListener;	44	import org.eclipse.emf.common.command.CommandStackListener;
21
22	import org.eclipse.emf.common.util.BasicDiagnostic;
23	import org.eclipse.emf.common.util.Diagnostic;
24
25	import org.eclipse.emf.common.notify.AdapterFactory;	45	import org.eclipse.emf.common.notify.AdapterFactory;
26
27	import org.eclipse.emf.common.notify.Notification;	46	import org.eclipse.emf.common.notify.Notification;
28		47	import org.eclipse.emf.common.ui.MarkerHelper;
		48	import org.eclipse.emf.common.ui.URIEditorInput;
29	import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;	49	import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;
30	import org.eclipse.emf.common.ui.editor.ProblemEditorPart;	50	import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
31	import org.eclipse.emf.common.ui.viewer.IViewerProvider;	51	import org.eclipse.emf.common.ui.viewer.IViewerProvider;
32		52	import org.eclipse.emf.common.util.BasicDiagnostic;
		53	import org.eclipse.emf.common.util.Diagnostic;
33	import org.eclipse.emf.common.util.EList;	54	import org.eclipse.emf.common.util.EList;
34	import org.eclipse.emf.common.util.URI;	55	import org.eclipse.emf.common.util.URI;
35		56	import org.eclipse.emf.ecore.EObject;
		57	import org.eclipse.emf.ecore.EValidator;
		58	import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
		59	import org.eclipse.emf.ecore.resource.Resource;
		60	import org.eclipse.emf.ecore.resource.ResourceSet;
		61	import org.eclipse.emf.ecore.util.EContentAdapter;
		62	import org.eclipse.emf.ecore.util.EcoreUtil;
36	import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;	63	import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
37	import org.eclipse.emf.edit.domain.EditingDomain;	64	import org.eclipse.emf.edit.domain.EditingDomain;
38	import org.eclipse.emf.edit.domain.IEditingDomainProvider;	65	import org.eclipse.emf.edit.domain.IEditingDomainProvider;
39
40	import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;	66	import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
41	import org.eclipse.emf.edit.provider.ComposedAdapterFactory;	67	import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
42	import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;	68	import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
43	import org.eclipse.emf.edit.provider.IItemPropertySource;	69	import org.eclipse.emf.edit.provider.IItemPropertySource;
44
45	//import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
46
47	//import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
48
49	import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;	70	import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
50
51	import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;	71	import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
52
53	import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;	72	import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
54	import org.eclipse.emf.edit.ui.dnd.LocalTransfer;	73	import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
55	import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;	74	import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
56
57	import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;	75	import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
58	import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;	76	import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
59	import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
60	import org.eclipse.emf.edit.ui.provider.PropertyDescriptor;	77	import org.eclipse.emf.edit.ui.provider.PropertyDescriptor;
61	import org.eclipse.emf.edit.ui.provider.PropertySource;	78	import org.eclipse.emf.edit.ui.provider.PropertySource;
62		79	import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
63	import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
64
65	import org.eclipse.emf.common.ui.MarkerHelper;
66	import org.eclipse.emf.common.ui.URIEditorInput;
67	import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;	80	import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
68
69	import org.eclipse.emf.edit.ui.util.EditUIUtil;	81	import org.eclipse.emf.edit.ui.util.EditUIUtil;
70	import org.eclipse.emf.ecore.EObject;	82	import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
71	import org.eclipse.emf.ecore.EValidator;
72
73	import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
74	import org.eclipse.emf.ecore.resource.Resource;
75	import org.eclipse.emf.ecore.resource.ResourceSet;
76	import org.eclipse.emf.ecore.util.EcoreUtil;
77
78	import org.eclipse.emf.ecore.util.EContentAdapter;
79
80	import java.io.IOException;
81
82	import java.io.InputStream;
83
84	import java.util.ArrayList;
85	import java.util.Collection;
86	import java.util.Collections;
87	import java.util.EventObject;
88	import java.util.Iterator;
89	import java.util.List;
90	import java.util.Map;
91
92	import java.util.LinkedHashMap;
93
94	import org.eclipse.core.resources.IFile;
95	import org.eclipse.core.resources.IMarker;
96	import org.eclipse.core.resources.IResource;
97	import org.eclipse.core.resources.IResourceChangeListener;
98	import org.eclipse.core.resources.IResourceChangeEvent;
99	import org.eclipse.core.resources.IResourceDelta;
100	import org.eclipse.core.resources.IResourceDeltaVisitor;
101	import org.eclipse.core.resources.ResourcesPlugin;
102
103	import org.eclipse.core.runtime.CoreException;
104	import org.eclipse.core.runtime.IPath;
105	import org.eclipse.core.runtime.IProgressMonitor;
106
107	import org.eclipse.jface.action.IMenuListener;	83	import org.eclipse.jface.action.IMenuListener;
108	import org.eclipse.jface.action.IMenuManager;	84	import org.eclipse.jface.action.IMenuManager;
109	import org.eclipse.jface.action.IStatusLineManager;	85	import org.eclipse.jface.action.IStatusLineManager;
110	import org.eclipse.jface.action.IToolBarManager;	86	import org.eclipse.jface.action.IToolBarManager;
111	import org.eclipse.jface.action.MenuManager;	87	import org.eclipse.jface.action.MenuManager;
112	import org.eclipse.jface.action.Separator;	88	import org.eclipse.jface.action.Separator;
113
114	import org.eclipse.jface.dialogs.MessageDialog;	89	import org.eclipse.jface.dialogs.MessageDialog;
115	import org.eclipse.jface.dialogs.ProgressMonitorDialog;	90	import org.eclipse.jface.dialogs.ProgressMonitorDialog;
116
117	import org.eclipse.jface.viewers.ILabelProvider;	91	import org.eclipse.jface.viewers.ILabelProvider;
118	import org.eclipse.jface.viewers.ISelection;	92	import org.eclipse.jface.viewers.ISelection;
119	import org.eclipse.jface.viewers.ISelectionChangedListener;	93	import org.eclipse.jface.viewers.ISelectionChangedListener;
Lines 125-174 Link Here
125	import org.eclipse.jface.viewers.StructuredViewer;	99	import org.eclipse.jface.viewers.StructuredViewer;
126	import org.eclipse.jface.viewers.TreeViewer;	100	import org.eclipse.jface.viewers.TreeViewer;
127	import org.eclipse.jface.viewers.Viewer;	101	import org.eclipse.jface.viewers.Viewer;
128
129	import org.eclipse.swt.SWT;	102	import org.eclipse.swt.SWT;
130
131	import org.eclipse.swt.custom.CTabFolder;	103	import org.eclipse.swt.custom.CTabFolder;
132
133	import org.eclipse.swt.dnd.DND;	104	import org.eclipse.swt.dnd.DND;
134	import org.eclipse.swt.dnd.Transfer;	105	import org.eclipse.swt.dnd.Transfer;
135
136	import org.eclipse.swt.events.ControlAdapter;	106	import org.eclipse.swt.events.ControlAdapter;
137	import org.eclipse.swt.events.ControlEvent;	107	import org.eclipse.swt.events.ControlEvent;
138
139	import org.eclipse.swt.graphics.Image;	108	import org.eclipse.swt.graphics.Image;
140	import org.eclipse.swt.graphics.Point;	109	import org.eclipse.swt.graphics.Point;
141
142	import org.eclipse.swt.widgets.Composite;	110	import org.eclipse.swt.widgets.Composite;
143	import org.eclipse.swt.widgets.Menu;	111	import org.eclipse.swt.widgets.Menu;
144	import org.eclipse.swt.widgets.Tree;	112	import org.eclipse.swt.widgets.Tree;
145
146	import org.eclipse.ui.IActionBars;	113	import org.eclipse.ui.IActionBars;
147	import org.eclipse.ui.IEditorInput;	114	import org.eclipse.ui.IEditorInput;
148	import org.eclipse.ui.IEditorPart;	115	import org.eclipse.ui.IEditorPart;
149	import org.eclipse.ui.IEditorSite;	116	import org.eclipse.ui.IEditorSite;
150	import org.eclipse.ui.IPartListener;	117	import org.eclipse.ui.IPartListener;
151	import org.eclipse.ui.IWorkbenchPart;	118	import org.eclipse.ui.IWorkbenchPart;
152
153	import org.eclipse.ui.PartInitException;	119	import org.eclipse.ui.PartInitException;
154		120	import org.eclipse.ui.actions.WorkspaceModifyOperation;
155	import org.eclipse.ui.dialogs.SaveAsDialog;	121	import org.eclipse.ui.dialogs.SaveAsDialog;
156
157	import org.eclipse.ui.ide.IGotoMarker;	122	import org.eclipse.ui.ide.IGotoMarker;
158
159	import org.eclipse.ui.part.FileEditorInput;	123	import org.eclipse.ui.part.FileEditorInput;
160	import org.eclipse.ui.part.MultiPageEditorPart;	124	import org.eclipse.ui.part.MultiPageEditorPart;
161
162	import org.eclipse.ui.views.contentoutline.ContentOutline;	125	import org.eclipse.ui.views.contentoutline.ContentOutline;
163	import org.eclipse.ui.views.contentoutline.ContentOutlinePage;	126	import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
164	import org.eclipse.ui.views.contentoutline.IContentOutlinePage;	127	import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
165
166	import org.eclipse.ui.views.properties.IPropertyDescriptor;	128	import org.eclipse.ui.views.properties.IPropertyDescriptor;
167	import org.eclipse.ui.views.properties.IPropertySheetPage;	129	import org.eclipse.ui.views.properties.IPropertySheetPage;
168	import org.eclipse.ui.views.properties.IPropertySource;	130	import org.eclipse.ui.views.properties.IPropertySource;
169	import org.eclipse.ui.views.properties.PropertySheet;	131	import org.eclipse.ui.views.properties.PropertySheet;
170	import org.eclipse.ui.views.properties.PropertySheetPage;	132	import org.eclipse.ui.views.properties.PropertySheetPage;
171
172	import org.eclipse.uml2.common.edit.domain.UML2AdapterFactoryEditingDomain;	133	import org.eclipse.uml2.common.edit.domain.UML2AdapterFactoryEditingDomain;
173	import org.eclipse.uml2.common.edit.provider.IItemQualifiedTextProvider;	134	import org.eclipse.uml2.common.edit.provider.IItemQualifiedTextProvider;
174	import org.eclipse.uml2.common.util.UML2Util;	135	import org.eclipse.uml2.common.util.UML2Util;
Lines 176-192 Link Here
176	import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;	137	import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
177	import org.eclipse.uml2.uml.edit.providers.UMLReflectiveItemProviderAdapterFactory;	138	import org.eclipse.uml2.uml.edit.providers.UMLReflectiveItemProviderAdapterFactory;
178	import org.eclipse.uml2.uml.edit.providers.UMLResourceItemProviderAdapterFactory;	139	import org.eclipse.uml2.uml.edit.providers.UMLResourceItemProviderAdapterFactory;
179
180	import java.util.HashMap;
181
182	import org.eclipse.core.runtime.NullProgressMonitor;
183
184	import org.eclipse.ui.actions.WorkspaceModifyOperation;
185
186	import org.eclipse.uml2.uml.editor.UMLEditorPlugin;	140	import org.eclipse.uml2.uml.editor.UMLEditorPlugin;
187
188	import org.eclipse.uml2.uml.resource.CMOF2UMLExtendedMetaData;	141	import org.eclipse.uml2.uml.resource.CMOF2UMLExtendedMetaData;
189	import org.eclipse.uml2.uml.resource.CMOF2UMLResource;	142	import org.eclipse.uml2.uml.resource.CMOF2UMLResource;
		143	import org.eclipse.uml2.uml.resource.UML212UML30Resource;
190	import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData;	144	import org.eclipse.uml2.uml.resource.UML22UMLExtendedMetaData;
191	import org.eclipse.uml2.uml.resource.UML22UMLResource;	145	import org.eclipse.uml2.uml.resource.UML22UMLResource;
192	import org.eclipse.uml2.uml.resource.UMLResource;	146	import org.eclipse.uml2.uml.resource.UMLResource;
Lines 457-465 Link Here
457	if (delta.getKind() == IResourceDelta.REMOVED	411	if (delta.getKind() == IResourceDelta.REMOVED
458	\|\| delta.getKind() == IResourceDelta.CHANGED	412	\|\| delta.getKind() == IResourceDelta.CHANGED
459	&& delta.getFlags() != IResourceDelta.MARKERS) {	413	&& delta.getFlags() != IResourceDelta.MARKERS) {
460	Resource resource = resourceSet.getResource(URI	414	Resource resource = resourceSet
461	.createURI(delta.getFullPath().toString()),	415	.getResource(URI.createPlatformResourceURI(
462	false);	416	delta.getFullPath().toString(), true),
		417	false);
463	if (resource != null) {	418	if (resource != null) {
464	if (delta.getKind() == IResourceDelta.REMOVED) {	419	if (delta.getKind() == IResourceDelta.REMOVED) {
465	removedResources.add(resource);	420	removedResources.add(resource);
Lines 494-500 Link Here
494	public void run() {	449	public void run() {
495	getSite().getPage().closeEditor(	450	getSite().getPage().closeEditor(
496	UMLEditor.this, false);	451	UMLEditor.this, false);
497	UMLEditor.this.dispose();
498	}	452	}
499	});	453	});
500	}	454	}
Lines 536-542 Link Here
536	if (!removedResources.isEmpty()) {	490	if (!removedResources.isEmpty()) {
537	if (handleDirtyConflict()) {	491	if (handleDirtyConflict()) {
538	getSite().getPage().closeEditor(UMLEditor.this, false);	492	getSite().getPage().closeEditor(UMLEditor.this, false);
539	UMLEditor.this.dispose();
540	} else {	493	} else {
541	removedResources.clear();	494	removedResources.clear();
542	changedResources.clear();	495	changedResources.clear();
Lines 950-955 Link Here
950	UML22UMLResource.UML2_CONTENT_TYPE_IDENTIFIER,	903	UML22UMLResource.UML2_CONTENT_TYPE_IDENTIFIER,
951	UML22UMLResource.Factory.INSTANCE);	904	UML22UMLResource.Factory.INSTANCE);
952	contentTypeToFactoryMap.put(	905	contentTypeToFactoryMap.put(
		906	UMLResource.UML_2_1_0_CONTENT_TYPE_IDENTIFIER,
		907	UML212UML30Resource.Factory.INSTANCE);
		908	contentTypeToFactoryMap.put(
953	XMI2UMLResource.UML_CONTENT_TYPE_IDENTIFIER,	909	XMI2UMLResource.UML_CONTENT_TYPE_IDENTIFIER,
954	XMI2UMLResource.Factory.INSTANCE);	910	XMI2UMLResource.Factory.INSTANCE);
955	contentTypeToFactoryMap.put(	911	contentTypeToFactoryMap.put(