Finished move to generics. Enforced 1.6 compliance for now. No errors or

warnings :)

1 files changed, 6 insertions, 6 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/Activity.java b/source/com/c2kernel/lifecycle/instance/Activity.java
index 458c0a5..a0df570 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/Activity.java
+++ b/source/com/c2kernel/lifecycle/instance/Activity.java
@@ -38,7 +38,7 @@ public class Activity extends WfVertex
 	/**

 	 * vector of errors (Strings) that is constructed each time verify() is launched

 	 */

-	protected Vector mErrors;

+	protected Vector<String> mErrors;

 	/** @associates a State machine engine */

 	private StateMachine machine;

 	/** true is avalaibe to be executed */

@@ -56,7 +56,7 @@ public class Activity extends WfVertex
 	{

 		super();

 		setProperties(new WfCastorHashMap());

-		mErrors = new Vector(0, 1);

+		mErrors = new Vector<String>(0, 1);

 		machine = new StateMachine(this);

 		eventIds = new EventStorage();

 		mStartDate = new GTimeStamp();

@@ -483,20 +483,20 @@ public class Activity extends WfVertex
 	/**

 	 * returns the lists of jobs for the activity and children (cf com.c2kernel.entity.Job)

 	 */

-	public ArrayList calculateJobs(AgentPath agent, boolean recurse)

+	public ArrayList<Job> calculateJobs(AgentPath agent, boolean recurse)

 	{

 		return calculateJobsBase(agent, false);

 	} //

-	public ArrayList calculateAllJobs(AgentPath agent, boolean recurse)

+	public ArrayList<Job> calculateAllJobs(AgentPath agent, boolean recurse)

 	{

 		return calculateJobsBase(agent, true);

 	}

-	private ArrayList calculateJobsBase(AgentPath agent, boolean all)

+	private ArrayList<Job> calculateJobsBase(AgentPath agent, boolean all)

 	{

 		Logger.msg(7, "calculateJobs - " + getPath());

 		int[] transitions = {

 		};

-		ArrayList jobs = new ArrayList();

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

 		try

 		{

 			String agentName = checkAccessRights(agent);