From b68ea0f2b12c4c5189c5fc7c182a1b242dc63579 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 23:18:47 +0200
Subject: Rolled back the renaming of existing exceptions.

---
 .../lifecycle/instance/stateMachine/StateMachine.java      | 12 ++++++------
 .../lifecycle/instance/stateMachine/Transition.java        | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 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 54a7267..cd61713 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.InvalidData;
-import com.c2kernel.common.InvalidTransition;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.InvalidTransitionException;
+import com.c2kernel.common.ObjectNotFoundException;
 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 ObjectNotFound, InvalidData {
+	public Map<Transition, String> getPossibleTransitions(Activity act, AgentPath agent) throws ObjectNotFoundException, InvalidDataException {
 		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 InvalidTransition, AccessRightsException, ObjectNotFound, InvalidData {
+	public State traverse(Activity act, Transition transition, AgentPath agent) throws InvalidTransitionException, AccessRightsException, ObjectNotFoundException, InvalidDataException {
 		State currentState = getState(act.getState());
 		if (transition.originState.equals(currentState)) {
 			transition.getPerformingRole(act, agent);
 			return transition.targetState;
 		}
 		else
-			throw new InvalidTransition("Transition '"+transition.getName()+"' not valid from state '"+currentState.getName());
+			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 78786da..76ae602 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
@@ -25,8 +25,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.lifecycle.instance.Activity;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.RolePath;
@@ -188,7 +188,7 @@ public class Transition {
 		this.targetStateId = targetStateId;
 	}
 	
-	public String getPerformingRole(Activity act, AgentPath agent) throws ObjectNotFound, AccessRightsException {
+	public String getPerformingRole(Activity act, AgentPath agent) throws ObjectNotFoundException, AccessRightsException {
 		
 		// check available
 		if (!isEnabled(act.getProperties()))
@@ -284,13 +284,13 @@ public class Transition {
 		return true;
 	}
 
-	public Schema getSchema(CastorHashMap actProps) throws InvalidData, ObjectNotFound {
+	public Schema getSchema(CastorHashMap actProps) throws InvalidDataException, ObjectNotFoundException {
 		if (hasOutcome(actProps))
 			try {
 				return LocalObjectLoader.getSchema(resolveValue(outcome.schemaName, actProps), 
 					Integer.parseInt(resolveValue(outcome.schemaVersion, actProps)));
 			} catch (NumberFormatException ex) {
-				throw new InvalidData("Bad schema version number: "+outcome.schemaVersion+" ("+resolveValue(outcome.schemaVersion, actProps)+")");
+				throw new InvalidDataException("Bad schema version number: "+outcome.schemaVersion+" ("+resolveValue(outcome.schemaVersion, actProps)+")");
 			}
 		else
 			return null;
@@ -300,11 +300,11 @@ public class Transition {
 		return resolveValue(script.scriptName, actProps);
 	}
 	
-	public int getScriptVersion(CastorHashMap actProps) throws InvalidData {
+	public int getScriptVersion(CastorHashMap actProps) throws InvalidDataException {
 		try {
 			return Integer.parseInt(resolveValue(script.scriptVersion, actProps));
 		} catch (NumberFormatException ex) {
-			throw new InvalidData("Bad Script version number: "+script.scriptVersion+" ("+resolveValue(script.scriptVersion, actProps)+")");
+			throw new InvalidDataException("Bad Script version number: "+script.scriptVersion+" ("+resolveValue(script.scriptVersion, actProps)+")");
 		}
 	}
 	
-- 
cgit v1.2.3