From fd8108209688cda9e782a4c3c91be522eb3ed1f4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 29 Oct 2013 16:21:08 +0100 Subject: Exception cleanup Allow versions to be null: use Integer or String --- .../com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java | 2 +- .../java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance/stateMachine') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java index 3896ac5..c165e6f 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java @@ -144,7 +144,7 @@ public class StateMachine implements DescriptionObject return transition.targetState; } else - throw new InvalidTransitionException(); + throw new InvalidTransitionException("Transition '"+transition.getName()+"' not valid from state '"+currentState.getName(), ""); } diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java index e7bcba9..9922c7c 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java @@ -173,11 +173,11 @@ public class Transition implements Serializable { // check available if (!isEnabled(act.getProperties())) - throw new AccessRightsException("Transition '"+name+"' is disabled by the '"+enabledProp+"' property."); + throw new AccessRightsException("Transition '"+name+"' is disabled by the '"+enabledProp+"' property.", ""); // check active if (isRequiresActive() && !act.getActive()) - throw new AccessRightsException("Activity must be active to perform this transition", null); + throw new AccessRightsException("Activity must be active to perform this transition", ""); RolePath role = null; String overridingRole = resolveValue(roleOverride, act.getProperties()); -- cgit v1.2.3