From 0c8cb1a9eeb72820e9d52096180a1fd6c1419e24 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 9 Dec 2013 17:35:34 +0100
Subject: hasOutcome now requires activity properties

---
 .../java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java')

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);
-- 
cgit v1.2.3