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/CompositeActivity.java      | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
index 8e08f99..9bb5c84 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
@@ -23,13 +23,13 @@ package com.c2kernel.lifecycle.instance;
 import java.util.ArrayList;
 
 import com.c2kernel.common.AccessRightsException;
-import com.c2kernel.common.CannotManage;
+import com.c2kernel.common.CannotManageException;
 import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.InvalidTransition;
-import com.c2kernel.common.ObjectAlreadyExists;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.InvalidTransitionException;
+import com.c2kernel.common.ObjectAlreadyExistsException;
 import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.common.PersistencyException;
 import com.c2kernel.entity.agent.Job;
 import com.c2kernel.graph.model.GraphModel;
@@ -306,17 +306,17 @@ public class CompositeActivity extends Activity
     }
 
     /**
-     * @throws InvalidData 
-     * @throws ObjectNotFound 
+     * @throws InvalidDataException 
+     * @throws ObjectNotFoundException 
      * @throws AccessRightsException 
-     * @throws InvalidTransition 
+     * @throws InvalidTransitionException 
      * @throws PersistencyException 
-     * @throws ObjectAlreadyExists 
+     * @throws ObjectAlreadyExistsException 
      * @throws ObjectCannotBeUpdated 
      * @see com.c2kernel.lifecycle.instance.WfVertex#run()
      */
     @Override
-	public void run(AgentPath agent, ItemPath itemPath) throws InvalidData
+	public void run(AgentPath agent, ItemPath itemPath) throws InvalidDataException
     {
         super.run(agent, itemPath);
         if (getChildrenGraphModel().getStartVertex() != null && !getStateMachine().getState(state).isFinished())
@@ -327,7 +327,7 @@ public class CompositeActivity extends Activity
     }
 
     @Override
-	public void runNext(AgentPath agent, ItemPath itemPath) throws InvalidData 
+	public void runNext(AgentPath agent, ItemPath itemPath) throws InvalidDataException 
     {
         if (!getStateMachine().getState(state).isFinished())
 			try {
@@ -342,13 +342,13 @@ public class CompositeActivity extends Activity
 
 
     /**
-     * @throws InvalidData 
-     * @throws ObjectNotFound 
+     * @throws InvalidDataException 
+     * @throws ObjectNotFoundException 
      * @throws InvalidAgentPathException 
      * @see com.c2kernel.lifecycle.instance.Activity#calculateJobs()
      */
     @Override
-	public ArrayList<Job> calculateJobs(AgentPath agent, ItemPath itemPath, boolean recurse) throws InvalidAgentPathException, ObjectNotFound, InvalidData 
+	public ArrayList<Job> calculateJobs(AgentPath agent, ItemPath itemPath, boolean recurse) throws InvalidAgentPathException, ObjectNotFoundException, InvalidDataException 
     {
         ArrayList<Job> jobs = new ArrayList<Job>();
         boolean childActive = false;
@@ -366,7 +366,7 @@ public class CompositeActivity extends Activity
     }
 
     @Override
-	public ArrayList<Job> calculateAllJobs(AgentPath agent, ItemPath itemPath, boolean recurse) throws InvalidAgentPathException, ObjectNotFound, InvalidData 
+	public ArrayList<Job> calculateAllJobs(AgentPath agent, ItemPath itemPath, boolean recurse) throws InvalidAgentPathException, ObjectNotFoundException, InvalidDataException 
     {
         ArrayList<Job> jobs = new ArrayList<Job>();
         if (recurse)
@@ -436,11 +436,11 @@ public class CompositeActivity extends Activity
     }
 
     /**
-     * @throws InvalidData 
+     * @throws InvalidDataException 
      *
      */
     @Override
-	public void reinit(int idLoop) throws InvalidData
+	public void reinit(int idLoop) throws InvalidDataException
     {
         super.reinit(idLoop);
         if (getChildrenGraphModel().getStartVertex() != null && !getStateMachine().getState(state).isFinished())
@@ -448,7 +448,7 @@ public class CompositeActivity extends Activity
     }
 
     @Override
-	public String request(AgentPath agent, ItemPath itemPath, int transitionID, String requestData) throws AccessRightsException, InvalidTransition, InvalidData, ObjectNotFound, PersistencyException, ObjectAlreadyExists, ObjectCannotBeUpdated, CannotManage, InvalidCollectionModification
+	public String request(AgentPath agent, ItemPath itemPath, int transitionID, String requestData) throws AccessRightsException, InvalidTransitionException, InvalidDataException, ObjectNotFoundException, PersistencyException, ObjectAlreadyExistsException, ObjectCannotBeUpdated, CannotManageException, InvalidCollectionModification
     {
         if (getChildrenGraphModel().getStartVertex() != null && !getStateMachine().getState(state).isFinished() && transitionID == CompositeActivity.START)
         	((WfVertex) getChildrenGraphModel().getStartVertex()).run(agent, itemPath);
-- 
cgit v1.2.3