summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Eidsness2014-04-04 09:10:35 (EDT)
committerAndrew Eidsness2014-04-07 08:55:52 (EDT)
commit03089b18ab513a4a7dbf43e60dd1bee3bc193033 (patch)
tree3ed7c093175ed075c5094d9942df608f8b3daf45
parent14abf6eb100eb0f1ba5a980d4b1437dbbf60f201 (diff)
downloadorg.eclipse.papyrus-03089b18ab513a4a7dbf43e60dd1bee3bc193033.zip
org.eclipse.papyrus-03089b18ab513a4a7dbf43e60dd1bee3bc193033.tar.gz
org.eclipse.papyrus-03089b18ab513a4a7dbf43e60dd1bee3bc193033.tar.bz2
Bug 431912: C++ code generation test model out of daterefs/changes/48/24548/1
The CDT test model has stale references to UML 4.0.0. This patch regenerates the model for 5.0.0. Change-Id: I2205bb1e660762d287ca1511be76b095467d603b Signed-off-by: Andrew Eidsness <eclipse@jfront.com>
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di22
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml2
3 files changed, 8 insertions, 18 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
index 62c9413..e11d475 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
@@ -17,24 +17,14 @@
<emfPageIdentifier href="TestCDTintegration.notation#_rGh10FG-EeOLNIKOajeerQ"/>
</availablePage>
</pageList>
- <sashModel currentSelection="//@sashModel/@windows.0/@children.0/@children.1">
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
<windows>
- <children xsi:type="di:SashPanel" direction="256">
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="TestCDTintegration.notation#_8vp88DcVEeO6UdbIk03c9Q"/>
- </children>
- <children>
- <emfPageIdentifier href="TestCDTintegration.notation#_6nABcFG7EeOLNIKOajeerQ"/>
- </children>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="TestCDTintegration.notation#_8vp88DcVEeO6UdbIk03c9Q"/>
</children>
- <children xsi:type="di:TabFolder">
- <children>
- <emfPageIdentifier href="TestCDTintegration.notation#_EItkYEG6EeOMv8cdTsw5Zg"/>
- </children>
- <children>
- <emfPageIdentifier href="TestCDTintegration.notation#_rGh10FG-EeOLNIKOajeerQ"/>
- </children>
+ <children>
+ <emfPageIdentifier href="TestCDTintegration.notation#_6nABcFG7EeOLNIKOajeerQ"/>
</children>
</children>
</windows>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
index 7d50140..14cc0e4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:texteditormodel="http://www.eclipse.org/Papyrus/TextEditor/0.10.0/texteditormodel" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:texteditormodel="http://www.eclipse.org/Papyrus/TextEditor/0.10.0/texteditormodel" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<notation:Diagram xmi:id="_8vp88DcVEeO6UdbIk03c9Q" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="__McvgDcVEeO6UdbIk03c9Q" type="2008" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Md9oDcVEeO6UdbIk03c9Q" source="ShadowFigure">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
index e8f2461..e7c80e2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<uml:Model xmi:id="_Ae6MwPccEd-KM6l7lmIPkw" name="TestCDTintegration">
<ownedComment xmi:type="uml:Comment" xmi:id="_EbtcwFG8EeOLNIKOajeerQ" annotatedElement="_419y0A7hEeKpbseGaEy1LA">
<body>This class contains a state machine</body>