From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 source/com/c2kernel/lifecycle/instance/CompositeActivity.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/CompositeActivity.java

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

diff --git a/source/com/c2kernel/lifecycle/instance/CompositeActivity.java b/source/com/c2kernel/lifecycle/instance/CompositeActivity.java
old mode 100755
new mode 100644
index 5292127..797a5db
--- a/source/com/c2kernel/lifecycle/instance/CompositeActivity.java
+++ b/source/com/c2kernel/lifecycle/instance/CompositeActivity.java
@@ -8,6 +8,7 @@ import com.c2kernel.common.AccessRightsException;
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.InvalidTransitionException;
 import com.c2kernel.common.ObjectAlreadyExistsException;
+import com.c2kernel.entity.agent.Job;
 import com.c2kernel.graph.model.GraphModel;
 import com.c2kernel.graph.model.GraphPoint;
 import com.c2kernel.graph.model.GraphableVertex;
@@ -297,7 +298,7 @@ public class CompositeActivity extends Activity
      */
     public Activity[] query(AgentPath agent, int stateID, boolean filter)
     {
-        Vector steps = new Vector();
+        Vector<Activity[]> steps = new Vector<Activity[]>();
         Activity[] returnArray = null;
         for (int i = 0; i < getChildren().length; i++)
         {
@@ -327,9 +328,9 @@ public class CompositeActivity extends Activity
     /**
      * @see com.c2kernel.lifecycle.instance.Activity#calculateJobs()
      */
-    public ArrayList calculateJobs(AgentPath agent, boolean recurse)
+    public ArrayList<Job> calculateJobs(AgentPath agent, boolean recurse)
     {
-        ArrayList jobs = new ArrayList();
+        ArrayList<Job> jobs = new ArrayList<Job>();
         boolean childActive = false;
         if (recurse)
             for (int i = 0; i < getChildren().length; i++)
@@ -344,9 +345,9 @@ public class CompositeActivity extends Activity
         return jobs;
     }
 
-    public ArrayList calculateAllJobs(AgentPath agent, boolean recurse)
+    public ArrayList<Job> calculateAllJobs(AgentPath agent, boolean recurse)
     {
-        ArrayList jobs = new ArrayList();
+        ArrayList<Job> jobs = new ArrayList<Job>();
         if (recurse)
             for (int i = 0; i < getChildren().length; i++)
                 if (getChildren()[i] instanceof Activity)
-- 
cgit v1.2.3