diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-12-09 17:35:34 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-12-09 17:35:34 +0100 |
| commit | 0c8cb1a9eeb72820e9d52096180a1fd6c1419e24 (patch) | |
| tree | 888df9363720d606208861aeb2c8410ed9bdfa62 /src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java | |
| parent | b9402204384bb5cfc25e6038d2f976f9f0c16fba (diff) | |
hasOutcome now requires activity properties
Diffstat (limited to 'src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java')
| -rw-r--r-- | src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java index f8cbff2..eba4a18 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java @@ -149,8 +149,8 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen }
for (Transition trans:transitions.keySet()) {
-
- if (!trans.hasOutcome() || (trans.hasOutcome() && !trans.getOutcome().isRequired())) {
+ boolean hasOutcome = trans.hasOutcome(mCurrentAct.getProperties());
+ if (!hasOutcome || (hasOutcome && !trans.getOutcome().isRequired())) {
JButton thisTrans = new JButton(trans.getName());
thisTrans.setActionCommand("Trans:"+trans.getId());
thisTrans.addActionListener(this);
|