From a4db06fec3cdbbfa506f0fc5b68a043644a29214 Mon Sep 17 00:00:00 2001 From: Ansgar Radermacher Date: Mon, 31 Mar 2014 14:46:52 +0200 Subject: [Bug 429744] New: [UML 2.5] Migrate Papyrus to UML 2.5 - recompiled acceleo files --- .../cpp/codegen/acceleo/CppClassHeader.emtl | 7 +- .../cpp/codegen/acceleo/util/CppAttribute.emtl | 268 +++++++++++++-------- .../cpp/codegen/acceleo/util/CppDocumentation.emtl | 22 +- .../codegen/acceleo/util/CppPrimitiveTypes.emtl | 13 +- .../util/clazz/CppClassIncludeDeclaration.emtl | 19 +- .../acceleo/util/operation/CppOperations.emtl | 17 +- 6 files changed, 222 insertions(+), 124 deletions(-) (limited to 'extraplugins/codegen') diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl index a82c773b1e5..5e5fa6f0ac2 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl @@ -233,12 +233,11 @@ - + - @@ -573,6 +572,10 @@ + + + + diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl index 8810a83d0be..00dc5ae5ffc 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl @@ -369,13 +369,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -803,6 +828,9 @@ + + + @@ -1397,7 +1425,7 @@
-
+
@@ -1407,32 +1435,32 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -1441,38 +1469,38 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -1481,38 +1509,38 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -1521,114 +1549,154 @@
-
-
+
+
-
-
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
- + +
+
+
+ + +
+
+
+ + +
+
+
+ +
-
+
- -
-
-
+ +
+
+
+ + +
+
+
+ + +
+
+
- -
-
+ +
+
- +
- -
-
-
+ +
+
+
- -
-
-
+ +
+
+
- -
-
-
+ +
+
+
- -
-
+ +
+
- +
- -
-
-
+ +
+
+
- -
-
+ +
+
- -
-
+ +
+
- +
- -
-
+ +
+
- -
-
+ +
+
- +
- -
-
+ +
+
- -
-
+ +
+
- +
- -
-
-
+ +
+
+
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl index 5b331857943..6dad5303306 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl @@ -7,7 +7,7 @@ - + @@ -22,7 +22,6 @@ - @@ -31,7 +30,7 @@ - + @@ -46,7 +45,6 @@ - @@ -70,7 +68,7 @@ - + @@ -85,7 +83,6 @@ - @@ -117,7 +114,7 @@ - + @@ -132,7 +129,6 @@ - @@ -144,6 +140,16 @@ + + + + + + + + + + diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl index da7d17226dc..f347149afb0 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl @@ -24,7 +24,7 @@ - + @@ -57,7 +57,6 @@ - @@ -132,6 +131,16 @@ + + + + + + + + + + diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl index 8431c80f360..4a8bb6965dd 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl @@ -79,13 +79,13 @@ - + - + - + - + @@ -101,7 +101,6 @@ - @@ -110,12 +109,10 @@ - - @@ -124,7 +121,6 @@ - @@ -196,6 +192,13 @@ + + + + + + + diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl index 12ada4e50f1..defb56ec5e7 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl @@ -251,7 +251,7 @@ - + @@ -263,7 +263,6 @@ - @@ -676,7 +675,7 @@ - + @@ -688,7 +687,6 @@ - @@ -983,6 +981,17 @@ + + + + + + + + + + + -- cgit v1.2.3