| commit | d10e42da158264efdcc01d35f3f69efe6dabfbce | [log] [tgz] |
|---|---|---|
| author | Adolfo SBH <adolfosbh@gmail.com> | Sun Jun 28 17:42:00 2015 +0100 |
| committer | Ed Willink <ed@willink.me.uk> | Wed Jul 08 11:02:28 2015 +0100 |
| tree | 9a68552d46591488573b5f3f8e664c44327d0eec | |
| parent | a40b25909f0ed0f7b4e9e1f6c17d759e31ec3818 [diff] |
[ocl2qvti] - Minor fix in OCL2QVTi transformation
diff --git a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/etl/ocl2qvtp_v2.etl b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/etl/ocl2qvtp_v2.etl index f4d5367..067c9ea 100644 --- a/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/etl/ocl2qvtp_v2.etl +++ b/plugins/org.eclipse.qvtd.cs2as.compiler/src/org/eclipse/qvtd/cs2as/compiler/internal/etl/ocl2qvtp_v2.etl
@@ -299,11 +299,11 @@ operation OCL!OCLExpression createNegatedExpression() : OCL!OCLExpression { var negatedExpression; + var eUtil = emfTool.getEcoreUtil(); // We don't want to create a 'not not conditionExp' if (self.isBooleanNotOpCallExp()) { negatedExpression = eUtil.copy(self.ownedSource); } else { - var eUtil = emfTool.getEcoreUtil(); negatedExpression = new OCL!OperationCallExp; negatedExpression.name = 'not'; negatedExpression.referredOperation = getBooleanNotOp();
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/mwe/GenerateExample1Models.mwe2 b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/mwe/GenerateExample1Models.mwe2 index 1298478..aeb378f 100644 --- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/mwe/GenerateExample1Models.mwe2 +++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1/mwe/GenerateExample1Models.mwe2
@@ -18,11 +18,6 @@ var projectName = "org.eclipse.qvtd.cs2as.compiler.tests" var examplesFolder = "src/org/eclipse/qvtd/cs2as/compiler/tests/models/example1" -/** - * Generate the Pivot Model, by performing the merge to create the flattened package - * with additional MDT/OCL content, alphabeticsing the classes, reloading the genmodel - * and finally generating the model code. - */ Workflow { bean = ResourceSetImpl : resourceSet {} bean = ProjectMapSetup{ resourceSet = resourceSet}