Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2014-11-23 18:43:06 +0000
committerEd Willink2014-11-23 22:24:04 +0000
commit702f595e66bfda8c4e065a1b1336b215aed73fd2 (patch)
treec7e1449b1e1d051c9df115652e88b92bd2d936a8
parent824ab3eae481edbe7474e28c89bf0273d04dca84 (diff)
downloadorg.eclipse.ocl-702f595e66bfda8c4e065a1b1336b215aed73fd2.tar.gz
org.eclipse.ocl-702f595e66bfda8c4e065a1b1336b215aed73fd2.tar.xz
org.eclipse.ocl-702f595e66bfda8c4e065a1b1336b215aed73fd2.zip
[452621] Prefer EOperation to OCL Operation implementation
-rw-r--r--examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/OperationImpl.java32
1 files changed, 12 insertions, 20 deletions
diff --git a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/OperationImpl.java b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/OperationImpl.java
index 29e0182494..1809f22c36 100644
--- a/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/OperationImpl.java
+++ b/examples/org.eclipse.ocl.examples.pivot/emf-gen/org/eclipse/ocl/examples/pivot/internal/impl/OperationImpl.java
@@ -1748,26 +1748,6 @@ public class OperationImpl
}
LibraryFeature bodyImplementation2 = bodyImplementation;
if (bodyImplementation2 == null) {
- for (Operation redefinedOperation : getRedefinedOperation()) {
- bodyImplementation2 = redefinedOperation.getImplementation();
- if (bodyImplementation2 != null) {
- break;
- }
- }
- }
- if (bodyImplementation2 == null) {
- OpaqueExpression specification = getBodyExpression();
- if (specification != null) {
- Type owningType = getOwningType();
- if (owningType != null) {
- ExpressionInOCL expression = specification.getExpressionInOCL();
- if (expression != null) {
- bodyImplementation2 = new ConstrainedOperation(expression);
- }
- }
- }
- }
- if (bodyImplementation2 == null) {
EObject eTarget = getETarget();
if (eTarget != null) {
EOperation eOperation = null;
@@ -1799,6 +1779,18 @@ public class OperationImpl
}
}
if (bodyImplementation2 == null) {
+ OpaqueExpression specification = getBodyExpression();
+ if (specification != null) {
+ Type owningType = getOwningType();
+ if (owningType != null) {
+ ExpressionInOCL expression = specification.getExpressionInOCL();
+ if (expression != null) {
+ bodyImplementation2 = new ConstrainedOperation(expression);
+ }
+ }
+ }
+ }
+ if (bodyImplementation2 == null) {
bodyImplementation2 = UnsupportedOperation.INSTANCE;
}
bodyImplementation = bodyImplementation2;

Back to the top