diff options
| author | Arnaud Cuccuru | 2014-07-10 15:28:55 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2014-07-21 12:13:11 +0000 |
| commit | 6fe4e1c4ca17ecb53903cd42ed3511cc06eba34c (patch) | |
| tree | 2d6dbd210c89c290571aee0349df982e7ef3136e | |
| parent | 9610df5fcfc326ea5fdf323ee7904c45d44d0956 (diff) | |
| download | org.eclipse.papyrus-6fe4e1c4ca17ecb53903cd42ed3511cc06eba34c.tar.gz org.eclipse.papyrus-6fe4e1c4ca17ecb53903cd42ed3511cc06eba34c.tar.xz org.eclipse.papyrus-6fe4e1c4ca17ecb53903cd42ed3511cc06eba34c.zip | |
439321: [Moka] The factory generator of oepm.composite.utils is invalid
in the case of an Active class
https://bugs.eclipse.org/bugs/show_bug.cgi?id=439321
Change-Id: I17296ed0a88a653cfd96bb0214a22f00b3c68897
| -rw-r--r-- | extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java index cf3c23c6680..61c88159c9f 100644 --- a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java +++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/src/org/eclipse/papyrus/moka/composites/utils/handlers/Utils.java @@ -35,6 +35,7 @@ import org.eclipse.uml2.uml.CallOperationAction; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.CreateObjectAction; import org.eclipse.uml2.uml.Element; +import org.eclipse.uml2.uml.ForkNode; import org.eclipse.uml2.uml.InputPin; import org.eclipse.uml2.uml.LiteralInteger; import org.eclipse.uml2.uml.ObjectFlow; @@ -141,14 +142,24 @@ public class Utils { LiteralInteger startBehaviorInputPinUpperBound = UMLFactory.eINSTANCE.createLiteralInteger(); startBehaviorInputPinUpperBound.setValue(1) ; startBehaviorInputPin.setUpperBound(startBehaviorInputPinUpperBound) ; - OutputPin startBehaviorResultPin = startBehavior.createResult("result", context); - LiteralInteger startBehaviorResultPinUpperBound = UMLFactory.eINSTANCE.createLiteralInteger(); - startBehaviorResultPinUpperBound.setValue(1) ; - startBehaviorResultPin.setUpperBound(startBehaviorResultPinUpperBound) ; - toReturnParamNode.setSource(startBehaviorResultPin); + /* + // 439321: [Moka] The factory generator of oepm.composite.utils is invalid in the case of an Active class + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=439321 + //OutputPin startBehaviorResultPin = startBehavior.createResult("result", context); + //LiteralInteger startBehaviorResultPinUpperBound = UMLFactory.eINSTANCE.createLiteralInteger(); + //startBehaviorResultPinUpperBound.setValue(1) ; + //startBehaviorResultPin.setUpperBound(startBehaviorResultPinUpperBound) ; + //toReturnParamNode.setSource(startBehaviorResultPin); + */ + ForkNode fork = (ForkNode)factory.createOwnedNode("forkInstanciatedObject", UMLPackage.eINSTANCE.getForkNode()) ; + toReturnParamNode.setSource(fork); + ObjectFlow forkToStartBehaviorInputPin = (ObjectFlow)factory.createEdge("fork to startbehavior input pin", UMLPackage.eINSTANCE.getObjectFlow()) ; + forkToStartBehaviorInputPin.setSource(fork) ; + forkToStartBehaviorInputPin.setTarget(startBehaviorInputPin) ; + // ObjectFlow callConstructor_startBehavior = (ObjectFlow)factory.createEdge("callConstructor to startBehavior", UMLPackage.eINSTANCE.getObjectFlow()); callConstructor_startBehavior.setSource(callConstructorResultPin); - callConstructor_startBehavior.setTarget(startBehaviorInputPin); + callConstructor_startBehavior.setTarget(fork); } return factory; |