diff options
author | Henrik Rentz-Reichert | 2011-09-28 15:17:58 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2011-09-28 15:17:58 +0000 |
commit | 68f481113c978d9f42a7704ebd85806de837780c (patch) | |
tree | 10b579ecce896f55eca03733e4d90cc1b027e477 /plugins | |
parent | 6120676fe522334677d15033be4c2c26afa3dd4e (diff) | |
download | org.eclipse.etrice-68f481113c978d9f42a7704ebd85806de837780c.tar.gz org.eclipse.etrice-68f481113c978d9f42a7704ebd85806de837780c.tar.xz org.eclipse.etrice-68f481113c978d9f42a7704ebd85806de837780c.zip |
[ui.behavior] bug fix: reconnect transition of data driven state machine
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java index e0bab3e92..bf1220c40 100644 --- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java +++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/TransitionSupport.java @@ -21,6 +21,7 @@ import org.eclipse.etrice.core.room.ContinuationTransition; import org.eclipse.etrice.core.room.EntryPoint;
import org.eclipse.etrice.core.room.InitialTransition;
import org.eclipse.etrice.core.room.NonInitialTransition;
+import org.eclipse.etrice.core.room.GuardedTransition;
import org.eclipse.etrice.core.room.RoomFactory;
import org.eclipse.etrice.core.room.StateGraph;
import org.eclipse.etrice.core.room.SubStateTrPointTerminal;
@@ -395,8 +396,16 @@ public class TransitionSupport { trans = t;
}
else {
- TriggeredTransition t = (orig instanceof TriggeredTransition)?
- (TriggeredTransition)orig : RoomFactory.eINSTANCE.createTriggeredTransition();
+ ActorClass ac = SupportUtil.getActorClass(getDiagram());
+ NonInitialTransition t = ac.getStateMachine().isDataDriven()?
+ ((orig instanceof GuardedTransition)?
+ (GuardedTransition)orig : RoomFactory.eINSTANCE.createGuardedTransition()
+ )
+ :
+ ((orig instanceof TriggeredTransition)?
+ (TriggeredTransition)orig : RoomFactory.eINSTANCE.createTriggeredTransition()
+ )
+ ;
t.setFrom(src);
t.setTo(dst);
trans = t;
|