Huge exception overhaul: Merged ClusterStorageException with

PersistencyException. Replaced MembershipException with
InvalidCollectionModification CORBA Exception. Made all predef steps
throw more accurate exceptions when they go wrong, and let more
exceptions bubble through from underneath.

1 files changed, 6 insertions, 6 deletions

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 efa5667..54a7267 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/StateMachine.java
@@ -25,9 +25,9 @@ import java.util.HashMap;
 import java.util.Map;

 

 import com.c2kernel.common.AccessRightsException;

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.InvalidTransitionException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.InvalidTransition;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.lifecycle.instance.Activity;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.utils.DescriptionObject;

@@ -142,7 +142,7 @@ public class StateMachine implements DescriptionObject
 		return stateCodes.get(stateID);

 	}

 	

-	public Map<Transition, String> getPossibleTransitions(Activity act, AgentPath agent) throws ObjectNotFoundException, InvalidDataException {

+	public Map<Transition, String> getPossibleTransitions(Activity act, AgentPath agent) throws ObjectNotFound, InvalidData {

 		HashMap<Transition, String> returnList = new HashMap<Transition, String>();

 		State currentState = getState(act.getState());

 		for (Integer transCode : currentState.getPossibleTransitionIds()) {

@@ -158,14 +158,14 @@ public class StateMachine implements DescriptionObject
 		return returnList;

 	}

 

-	public State traverse(Activity act, Transition transition, AgentPath agent) throws InvalidTransitionException, AccessRightsException, ObjectNotFoundException, InvalidDataException {

+	public State traverse(Activity act, Transition transition, AgentPath agent) throws InvalidTransition, AccessRightsException, ObjectNotFound, InvalidData {

 		State currentState = getState(act.getState());

 		if (transition.originState.equals(currentState)) {

 			transition.getPerformingRole(act, agent);

 			return transition.targetState;

 		}

 		else

-			throw new InvalidTransitionException("Transition '"+transition.getName()+"' not valid from state '"+currentState.getName(), "");

+			throw new InvalidTransition("Transition '"+transition.getName()+"' not valid from state '"+currentState.getName());

 			

 	}