Merge and tidy after 2.4

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
index 689fbb8..f7d39ae 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java
@@ -6,6 +6,7 @@ import com.c2kernel.common.AccessRightsException;
 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.InvalidTransitionException;

 import com.c2kernel.common.ObjectAlreadyExistsException;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.agent.Job;

 import com.c2kernel.graph.model.GraphModel;

 import com.c2kernel.graph.model.GraphPoint;

@@ -297,10 +298,12 @@ public class CompositeActivity extends Activity
 

 
     /**

+     * @throws InvalidDataException 

+     * @throws ObjectNotFoundException 

      * @see com.c2kernel.lifecycle.instance.Activity#calculateJobs()

      */

     @Override

-	public ArrayList<Job> calculateJobs(AgentPath agent, int itemSysKey, boolean recurse)

+	public ArrayList<Job> calculateJobs(AgentPath agent, int itemSysKey, boolean recurse) throws ObjectNotFoundException, InvalidDataException

     {

         ArrayList<Job> jobs = new ArrayList<Job>();

         boolean childActive = false;

@@ -318,7 +321,7 @@ public class CompositeActivity extends Activity
     }

 

     @Override

-	public ArrayList<Job> calculateAllJobs(AgentPath agent, int itemSysKey, boolean recurse)

+	public ArrayList<Job> calculateAllJobs(AgentPath agent, int itemSysKey, boolean recurse) throws ObjectNotFoundException, InvalidDataException

     {

         ArrayList<Job> jobs = new ArrayList<Job>();

         if (recurse)