1 files changed, 26 insertions, 26 deletions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/UseCaseDiagrams.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/UseCaseDiagrams.uml
index 41a31f64af8..5d796599ccf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/UseCaseDiagrams.uml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/UseCaseDiagrams.uml
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_3cQVYJHeEeSxOt7bBHlhAg" name="Model">
-  <ownedComment xmi:id="__kf1kJHjEeSxOt7bBHlhAg" annotatedElement="_Ub3p4JHgEeSxOt7bBHlhAg">
+  <ownedComment xmi:type="uml:Comment" xmi:id="__kf1kJHjEeSxOt7bBHlhAg" annotatedElement="_Ub3p4JHgEeSxOt7bBHlhAg">
     <body>This is me</body>
   </ownedComment>
-  <ownedComment xmi:id="_xszQgJHkEeSxOt7bBHlhAg" annotatedElement="_YM-AIJHkEeSxOt7bBHlhAg">
+  <ownedComment xmi:type="uml:Comment" xmi:id="_xszQgJHkEeSxOt7bBHlhAg" annotatedElement="_YM-AIJHkEeSxOt7bBHlhAg">
     <body>condition : {true}
 extension location : ExtensionPoint1</body>
   </ownedComment>
-  <packageImport xmi:id="_3cQVYZHeEeSxOt7bBHlhAg">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_3cQVYZHeEeSxOt7bBHlhAg">
     <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
   </packageImport>
   <packagedElement xmi:type="uml:Actor" xmi:id="_Ub3p4JHgEeSxOt7bBHlhAg" name="Actor1"/>
   <packagedElement xmi:type="uml:Actor" xmi:id="_nw8oMJHgEeSxOt7bBHlhAg" name="Actor2"/>
   <packagedElement xmi:type="uml:Actor" xmi:id="_qPtJoJHgEeSxOt7bBHlhAg" name="Actor3">
-    <generalization xmi:id="_xJu1IJHjEeSxOt7bBHlhAg" general="_Ub3p4JHgEeSxOt7bBHlhAg"/>
+    <generalization xmi:type="uml:Generalization" xmi:id="_xJu1IJHjEeSxOt7bBHlhAg" general="_Ub3p4JHgEeSxOt7bBHlhAg"/>
   </packagedElement>
   <packagedElement xmi:type="uml:Package" xmi:id="_CM0NkJHiEeSxOt7bBHlhAg" name="Package1">
-    <packageImport xmi:id="_TaGcIJHmEeSxOt7bBHlhAg" importedPackage="_QFl-cJHmEeSxOt7bBHlhAg"/>
-    <packageMerge xmi:id="_SIecMJHmEeSxOt7bBHlhAg" mergedPackage="_QFl-cJHmEeSxOt7bBHlhAg"/>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_TaGcIJHmEeSxOt7bBHlhAg" importedPackage="_QFl-cJHmEeSxOt7bBHlhAg"/>
+    <packageMerge xmi:type="uml:PackageMerge" xmi:id="_SIecMJHmEeSxOt7bBHlhAg" mergedPackage="_QFl-cJHmEeSxOt7bBHlhAg"/>
     <packagedElement xmi:type="uml:Component" xmi:id="_NFjRsJHiEeSxOt7bBHlhAg" name="Component1" visibility="package" useCase="_SDP6wJHiEeSxOt7bBHlhAg _kNb90JHjEeSxOt7bBHlhAg">
-      <ownedUseCase xmi:id="_SDP6wJHiEeSxOt7bBHlhAg" name="UseCase1" subject="_NFjRsJHiEeSxOt7bBHlhAg"/>
-      <ownedUseCase xmi:id="_kNb90JHjEeSxOt7bBHlhAg" name="UseCase2" subject="_NFjRsJHiEeSxOt7bBHlhAg"/>
+      <ownedUseCase xmi:type="uml:UseCase" xmi:id="_SDP6wJHiEeSxOt7bBHlhAg" name="UseCase1" subject="_NFjRsJHiEeSxOt7bBHlhAg"/>
+      <ownedUseCase xmi:type="uml:UseCase" xmi:id="_kNb90JHjEeSxOt7bBHlhAg" name="UseCase2" subject="_NFjRsJHiEeSxOt7bBHlhAg"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Actor" xmi:id="_U_7HQJHiEeSxOt7bBHlhAg" name="Actor1"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_V03yQJHiEeSxOt7bBHlhAg" name="A_actor1_usecase1" memberEnd="_V03yQZHiEeSxOt7bBHlhAg _V03yRJHiEeSxOt7bBHlhAg">
-      <ownedEnd xmi:id="_V03yQZHiEeSxOt7bBHlhAg" name="actor1" type="_U_7HQJHiEeSxOt7bBHlhAg" association="_V03yQJHiEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_V03yQZHiEeSxOt7bBHlhAg" name="actor1" type="_U_7HQJHiEeSxOt7bBHlhAg" association="_V03yQJHiEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V03yQpHiEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V03yQ5HiEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
-      <ownedEnd xmi:id="_V03yRJHiEeSxOt7bBHlhAg" name="usecase1" type="_SDP6wJHiEeSxOt7bBHlhAg" association="_V03yQJHiEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_V03yRJHiEeSxOt7bBHlhAg" name="usecase1" type="_SDP6wJHiEeSxOt7bBHlhAg" association="_V03yQJHiEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V03yRZHiEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V03yRpHiEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Actor" xmi:id="_lXmD0JHjEeSxOt7bBHlhAg" name="Actor2"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_m-iMcJHjEeSxOt7bBHlhAg" name="A_actor2_usecase2" memberEnd="_m-iMcZHjEeSxOt7bBHlhAg _m-iMdJHjEeSxOt7bBHlhAg">
-      <ownedEnd xmi:id="_m-iMcZHjEeSxOt7bBHlhAg" name="actor2" type="_lXmD0JHjEeSxOt7bBHlhAg" association="_m-iMcJHjEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_m-iMcZHjEeSxOt7bBHlhAg" name="actor2" type="_lXmD0JHjEeSxOt7bBHlhAg" association="_m-iMcJHjEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_m-iMcpHjEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_m-iMc5HjEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
-      <ownedEnd xmi:id="_m-iMdJHjEeSxOt7bBHlhAg" name="usecase2" type="_kNb90JHjEeSxOt7bBHlhAg" association="_m-iMcJHjEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_m-iMdJHjEeSxOt7bBHlhAg" name="usecase2" type="_kNb90JHjEeSxOt7bBHlhAg" association="_m-iMcJHjEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_m-iMdZHjEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_m-iMdpHjEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:UseCase" xmi:id="_91fEIJHlEeSxOt7bBHlhAg" name="UseCase3"/>
     <packagedElement xmi:type="uml:Association" xmi:id="__kotkJHlEeSxOt7bBHlhAg" name="A_actor1_usecase3" memberEnd="__kotkZHlEeSxOt7bBHlhAg __kotlJHlEeSxOt7bBHlhAg">
-      <ownedEnd xmi:id="__kotkZHlEeSxOt7bBHlhAg" name="actor1" type="_U_7HQJHiEeSxOt7bBHlhAg" association="__kotkJHlEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="__kotkZHlEeSxOt7bBHlhAg" name="actor1" type="_U_7HQJHiEeSxOt7bBHlhAg" association="__kotkJHlEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__kotkpHlEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__kotk5HlEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
-      <ownedEnd xmi:id="__kotlJHlEeSxOt7bBHlhAg" name="usecase3" type="_91fEIJHlEeSxOt7bBHlhAg" association="__kotkJHlEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="__kotlJHlEeSxOt7bBHlhAg" name="usecase3" type="_91fEIJHlEeSxOt7bBHlhAg" association="__kotkJHlEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__kotlZHlEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__kotlpHlEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_AGKtUJHmEeSxOt7bBHlhAg" name="A_actor2_usecase3" memberEnd="_AGKtUZHmEeSxOt7bBHlhAg _AGKtVJHmEeSxOt7bBHlhAg">
-      <ownedEnd xmi:id="_AGKtUZHmEeSxOt7bBHlhAg" name="actor2" type="_lXmD0JHjEeSxOt7bBHlhAg" association="_AGKtUJHmEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_AGKtUZHmEeSxOt7bBHlhAg" name="actor2" type="_lXmD0JHjEeSxOt7bBHlhAg" association="_AGKtUJHmEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AGKtUpHmEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AGKtU5HmEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
-      <ownedEnd xmi:id="_AGKtVJHmEeSxOt7bBHlhAg" name="usecase3" type="_91fEIJHlEeSxOt7bBHlhAg" association="_AGKtUJHmEeSxOt7bBHlhAg">
+      <ownedEnd xmi:type="uml:Property" xmi:id="_AGKtVJHmEeSxOt7bBHlhAg" name="usecase3" type="_91fEIJHlEeSxOt7bBHlhAg" association="_AGKtUJHmEeSxOt7bBHlhAg">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AGKtVZHmEeSxOt7bBHlhAg" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AGKtVpHmEeSxOt7bBHlhAg" value="1"/>
       </ownedEnd>
@@ -74,24 +74,24 @@ extension location : ExtensionPoint1</body>
     </specification>
   </packagedElement>
   <packagedElement xmi:type="uml:UseCase" xmi:id="_SndJIJHkEeSxOt7bBHlhAg" name="UseCase1">
-    <extend xmi:id="_YM-AIJHkEeSxOt7bBHlhAg" extendedCase="_Tbmi4JHkEeSxOt7bBHlhAg" extensionLocation="_XQmegJHkEeSxOt7bBHlhAg"/>
-    <include xmi:id="_ZlFpoJHkEeSxOt7bBHlhAg" addition="_TBk5UJHkEeSxOt7bBHlhAg"/>
+    <extend xmi:type="uml:Extend" xmi:id="_YM-AIJHkEeSxOt7bBHlhAg" extendedCase="_Tbmi4JHkEeSxOt7bBHlhAg" extensionLocation="_XQmegJHkEeSxOt7bBHlhAg"/>
+    <include xmi:type="uml:Include" xmi:id="_ZlFpoJHkEeSxOt7bBHlhAg" addition="_TBk5UJHkEeSxOt7bBHlhAg"/>
   </packagedElement>
   <packagedElement xmi:type="uml:UseCase" xmi:id="_TBk5UJHkEeSxOt7bBHlhAg" name="UseCase2"/>
   <packagedElement xmi:type="uml:UseCase" xmi:id="_Tbmi4JHkEeSxOt7bBHlhAg" name="UseCase3">
-    <extensionPoint xmi:id="_XQmegJHkEeSxOt7bBHlhAg" name="ExtensionPoint1"/>
-    <extensionPoint xmi:id="_ap8_8JHkEeSxOt7bBHlhAg" name="ExtensionPoint2"/>
+    <extensionPoint xmi:type="uml:ExtensionPoint" xmi:id="_XQmegJHkEeSxOt7bBHlhAg" name="ExtensionPoint1"/>
+    <extensionPoint xmi:type="uml:ExtensionPoint" xmi:id="_ap8_8JHkEeSxOt7bBHlhAg" name="ExtensionPoint2"/>
   </packagedElement>
   <packagedElement xmi:type="uml:UseCase" xmi:id="_I6dp8JHlEeSxOt7bBHlhAg" name="UseCase4">
-    <extensionPoint xmi:id="_MVtBwJHlEeSxOt7bBHlhAg" name="ExtensionPoint1"/>
-    <extensionPoint xmi:id="_jCtlMJHlEeSxOt7bBHlhAg" name="ExtensionPoint2"/>
-    <include xmi:id="_QPMb0JHlEeSxOt7bBHlhAg" addition="_TBk5UJHkEeSxOt7bBHlhAg"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Actor" xmi:id="_adA6sJHlEeSxOt7bBHlhAg" name="Actor4">
-    <generalization xmi:id="_ftbrcJHlEeSxOt7bBHlhAg" general="_nw8oMJHgEeSxOt7bBHlhAg"/>
+    <extensionPoint xmi:type="uml:ExtensionPoint" xmi:id="_MVtBwJHlEeSxOt7bBHlhAg" name="ExtensionPoint1"/>
+    <extensionPoint xmi:type="uml:ExtensionPoint" xmi:id="_jCtlMJHlEeSxOt7bBHlhAg" name="ExtensionPoint2"/>
+    <include xmi:type="uml:Include" xmi:id="_QPMb0JHlEeSxOt7bBHlhAg" addition="_TBk5UJHkEeSxOt7bBHlhAg"/>
   </packagedElement>
   <packagedElement xmi:type="uml:Package" xmi:id="_QFl-cJHmEeSxOt7bBHlhAg" name="Package2"/>
   <packagedElement xmi:type="uml:Abstraction" xmi:id="_Ztd3oJHmEeSxOt7bBHlhAg" client="_I6dp8JHlEeSxOt7bBHlhAg" supplier="_Tbmi4JHkEeSxOt7bBHlhAg"/>
   <packagedElement xmi:type="uml:Realization" xmi:id="_hEOCwJHmEeSxOt7bBHlhAg" client="_I6dp8JHlEeSxOt7bBHlhAg" supplier="_TBk5UJHkEeSxOt7bBHlhAg"/>
   <packagedElement xmi:type="uml:Usage" xmi:id="_jOXmIJHmEeSxOt7bBHlhAg" client="_SndJIJHkEeSxOt7bBHlhAg" supplier="_Tbmi4JHkEeSxOt7bBHlhAg"/>
+  <packagedElement xmi:type="uml:Actor" xmi:id="_lyTUUAKpEeWYofXebE0egA" name="Actor4">
+    <generalization xmi:type="uml:Generalization" xmi:id="_vhc6MAKpEeWYofXebE0egA" general="_nw8oMJHgEeSxOt7bBHlhAg"/>
+  </packagedElement>
 </uml:Model>