Changeset 481 for DCWoRMS/trunk/src/schedframe/scheduling/plan

Timestamp:

10/08/12 10:23:45 (13 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src/schedframe/scheduling/plan

Files:

• ScheduledTaskInterface.java (modified) (2 diffs)
• SchedulingPlanInterface.java (modified) (1 diff)
• impl/ScheduledTask.java (modified) (3 diffs)
• impl/SchedulingPlan.java (modified) (2 diffs)

DCWoRMS/trunk/src/schedframe/scheduling/plan/ScheduledTaskInterface.java

@@ -4 +4 @@
 
 import schedframe.DescriptionContainer;
-import schedframe.scheduling.tasks.WorkloadUnit;
+import schedframe.scheduling.tasks.TaskInterface;
 
 public interface ScheduledTaskInterface<T> extends DescriptionContainer<T> {
@@ -190 +190 @@
         
 
-        public ArrayList<AllocationInterface> getAllocations();
+        public ArrayList<AllocationInterface<?>> getAllocations();
         
-        public WorkloadUnit getTask();
+        public TaskInterface<?> getTask();
 
 }

DCWoRMS/trunk/src/schedframe/scheduling/plan/SchedulingPlanInterface.java

@@ -99 +99 @@
 
 
-        public ArrayList<ScheduledTaskInterface> getTasks();
+        public ArrayList<ScheduledTaskInterface<?>> getTasks();
 }

DCWoRMS/trunk/src/schedframe/scheduling/plan/impl/ScheduledTask.java

@@ -6 +6 @@
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.ValidationException;
+import org.qcg.broker.schemas.schedulingplan.types.AllocationStatus;
 
 import schedframe.scheduling.plan.AllocationInterface;
 import schedframe.scheduling.plan.ScheduledTaskInterface;
 import schedframe.scheduling.plan.ScheduledTimeInterface;
-import schedframe.scheduling.tasks.WorkloadUnit;
-
-
-import org.qcg.broker.schemas.schedulingplan.types.AllocationStatus;
+import schedframe.scheduling.tasks.TaskInterface;
 
 public class ScheduledTask implements ScheduledTaskInterface<org.qcg.broker.schemas.schedulingplan.Task> {
@@ -22 +20 @@
         public ScheduledTask(){
                 t = new org.qcg.broker.schemas.schedulingplan.Task();
-                allocationList = new ArrayList<AllocationInterface>();
+                allocationList = new ArrayList<AllocationInterface<?>>();
         }
         
         public ScheduledTask(org.qcg.broker.schemas.schedulingplan.Task value){
                 t = value;
-                allocationList = new ArrayList<AllocationInterface>();
+                allocationList = new ArrayList<AllocationInterface<?>>();
         }
         
@@ -178 +176 @@
         
 
-        protected WorkloadUnit task;
-        protected ArrayList<AllocationInterface> allocationList;
+        protected TaskInterface<?> task;
+        protected ArrayList<AllocationInterface<?>> allocationList;
 
-        public ScheduledTask(WorkloadUnit task){
+        public ScheduledTask(TaskInterface<?> task){
                 this();
                 this.task = task;
         }
 
-        public ArrayList<AllocationInterface> getAllocations() {
+        public ArrayList<AllocationInterface<?>> getAllocations() {
                 return this.allocationList;
         }
         
-        public WorkloadUnit getTask(){
+        public TaskInterface<?> getTask(){
                 return this.task;
         }

DCWoRMS/trunk/src/schedframe/scheduling/plan/impl/SchedulingPlan.java

@@ -18 +18 @@
         public SchedulingPlan(){
                 sp = new org.qcg.broker.schemas.schedulingplan.SchedulingPlan();
-                taskList = new ArrayList<ScheduledTaskInterface>();
+                taskList = new ArrayList<ScheduledTaskInterface<?>>();
         }
         
         public SchedulingPlan(org.qcg.broker.schemas.schedulingplan.SchedulingPlan value){
                 sp = value;
-                taskList = new ArrayList<ScheduledTaskInterface>();
+                taskList = new ArrayList<ScheduledTaskInterface<?>>();
         }
         
@@ -106 +106 @@
 
         
-        protected ArrayList<ScheduledTaskInterface> taskList;
+        protected ArrayList<ScheduledTaskInterface<?>> taskList;
 
-        public ArrayList<ScheduledTaskInterface> getTasks() {
+        public ArrayList<ScheduledTaskInterface<?>> getTasks() {
 
                 return this.taskList;