Changeset 539 for DCWoRMS/trunk/build/classes/schedframe/scheduling/manager/tasks/AbstractJobRegistry.java

Timestamp:

10/31/12 13:52:06 (12 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/trunk/build/classes/schedframe/scheduling/manager/tasks/AbstractJobRegistry.java (modified) (5 diffs)

DCWoRMS/trunk/build/classes/schedframe/scheduling/manager/tasks/AbstractJobRegistry.java

@@ -2 +2 @@
 
 
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -14 +13 @@
 
 
-public abstract class AbstractJobRegistry /*extends ConcurrentHashMap<String, Job> */implements JobRegistry, Cloneable{
+public abstract class AbstractJobRegistry /*extends ConcurrentHashMap<String, Job>*/ implements JobRegistry, Cloneable{
         
         private static final long serialVersionUID = 8409060063583755824L;
+
         
-        private static Log log = LogFactory.getLog(AbstractJobRegistry.class);
-        
-        protected static final ConcurrentHashMap<String, Job> jobs = new ConcurrentHashMap<String, Job>();
+        protected static final ConcurrentHashMap<String, JobInterface<?>> jobs = new ConcurrentHashMap<String, JobInterface<?>>();
         
         protected AbstractJobRegistry(){
-                //log.warn("Methods from JobRegistry interface are not implemented.");
         }
         
         public boolean addJob(JobInterface<?> job) {
-                try {
-                         jobs.put(job.getId(), (Job) job);
-                } catch (NoSuchFieldException e) {
-                        log.error(e.getMessage());
-                        return false;
-                }
+                jobs.put(job.getId(),  job);
                 return true;
         }
@@ -38 +30 @@
         public boolean addTask(TaskInterface<?> task) {
                 if(jobs.containsKey(task.getJobId())){
-                        jobs.get(task.getJobId()).add((Task)task);
+                        getJob(task.getJobId()).add((Task)task);
                         return true;
                 } else {
@@ -45 +37 @@
         }
 
-        public Job get(String jobId){
+        public JobInterface<?> getJobInfo(String jobId) {
                 return jobs.get(jobId);
         }
-        
-        public JobInterface<?> getJobInfo(String jobID) {
-                return jobs.get(jobID);
-        }
 
-        public TaskInterface<?> getTaskInfo(String jobID, String taskId) {
+        public TaskInterface<?> getTaskInfo(String jobId, String taskId) {
                 Task task = null;
-                Job job = jobs.get(jobID);
+                Job job = getJob(jobId);
                 
                 if(job == null)
@@ -63 +51 @@
                         task = job.getTask(taskId);
                 } catch (NoSuchFieldException e) {
-                        log.error(e.getMessage());
                 }
                 return task;
         }
         
-        /*public List<JobInterface<?>> getActiveJobs() {
-                log.error("getActiveJobs() not implemented.");
-                return null;
+        public Job getJob(String jobId){
+                return (Job)jobs.get(jobId);
         }
 
-        public List<TaskInterface<?>> getActiveTasks() {
-                log.error("getActiveTasks() not implemented.");
-                return null;
-        }*/
-
-
-        
-
 }