diff options
Diffstat (limited to 'src/main/java/com/c2kernel')
| -rw-r--r-- | src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java | 2 |
2 files changed, 2 insertions, 4 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);
diff --git a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java index a265bc1..82c45ff 100644 --- a/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java +++ b/src/main/java/com/c2kernel/gui/tabs/execution/ActivityViewer.java @@ -28,9 +28,7 @@ import com.c2kernel.gui.tabs.EntityTabPane; import com.c2kernel.gui.tabs.ExecutionPane;
import com.c2kernel.gui.tabs.outcome.InvalidOutcomeException;
import com.c2kernel.gui.tabs.outcome.InvalidSchemaException;
-import com.c2kernel.gui.tabs.outcome.OutcomeException;
import com.c2kernel.gui.tabs.outcome.OutcomeHandler;
-import com.c2kernel.persistency.outcome.Schema;
import com.c2kernel.utils.FileStringUtility;
import com.c2kernel.utils.Language;
import com.c2kernel.utils.LocalObjectLoader;
|