From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/entity/agent/JobList.java | 41 ++++++++-------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

(limited to 'source/com/c2kernel/entity/agent/JobList.java')

diff --git a/source/com/c2kernel/entity/agent/JobList.java b/source/com/c2kernel/entity/agent/JobList.java
index 15ce0dd..f8a88ee 100644
--- a/source/com/c2kernel/entity/agent/JobList.java
+++ b/source/com/c2kernel/entity/agent/JobList.java
@@ -3,8 +3,6 @@ package com.c2kernel.entity.agent;
 import java.util.Iterator;
 import java.util.Vector;
 
-import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.lookup.InvalidEntityPathException;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.RemoteMap;
 import com.c2kernel.utils.Logger;
@@ -15,14 +13,13 @@ import com.c2kernel.utils.Logger;
 * @author $Author: abranson $ $Date: 2006/03/03 13:52:21 $
 * @version $Revision: 1.15 $
 ***************************************************************************/
-public class JobList extends RemoteMap
+public class JobList extends RemoteMap<Job>
 {
 
     /**************************************************************************
     * Empty constructor for Castor
     **************************************************************************/
-    public JobList(int sysKey, Object locker) 
-        throws ObjectNotFoundException, InvalidEntityPathException
+    public JobList(int sysKey, Object locker)
     {
         super(sysKey, ClusterStorage.JOB, locker);
     }
@@ -43,29 +40,15 @@ public class JobList extends RemoteMap
 	/**
 	 * Cannot be stored
 	 */
+	@Override
 	public String getClusterType() {
 		return null;
 	}
-    
-    public int containsJob( Job job )
-    {
-        Iterator actMembers = keySet().iterator();
-        Job           j = null;
 
-        while( actMembers.hasNext() )
-        {
-            j = (Job)actMembers.next();
 
-            if( j.equals(job) )
-                return j.getID();
-        }
-
-        return -1;
-    }
-    
     public Job getJob(int id) {
-        return (Job)get(String.valueOf(id));
-    }    
+        return get(String.valueOf(id));
+    }
 
 
    /**
@@ -73,12 +56,12 @@ public class JobList extends RemoteMap
     */
     public void removeJobsWithSysKey( int sysKey )
     {
-        Iterator currentMembers = values().iterator();
+        Iterator<Job> currentMembers = values().iterator();
         Job           j = null;
 
         while( currentMembers.hasNext() )
         {
-            j = (Job)currentMembers.next();
+            j = currentMembers.next();
 
             if( j.getItemSysKey() == sysKey )
                 remove( String.valueOf(j.getID()) );
@@ -89,10 +72,10 @@ public class JobList extends RemoteMap
 
     public void removeJobsForStep( int sysKey, String stepPath )
     {
-        Iterator currentMembers = values().iterator();
+        Iterator<Job> currentMembers = values().iterator();
         while( currentMembers.hasNext() )
         {
-            Job j = (Job)currentMembers.next();
+            Job j = currentMembers.next();
             if( j.getItemSysKey() == sysKey && j.getStepPath().equals(stepPath))
                 remove( String.valueOf(j.getID()) );
         }
@@ -104,15 +87,15 @@ public class JobList extends RemoteMap
      * @param string
      * @return
      */
-    public Vector getJobsOfSysKey(int sysKey)
+    public Vector<Job> getJobsOfSysKey(int sysKey)
     {
-        Iterator currentMembers = values().iterator();
+        Iterator<Job> currentMembers = values().iterator();
         Job           j = null;
         Vector<Job> jobs = new Vector<Job>();
 
         while( currentMembers.hasNext() )
         {
-            j = (Job)currentMembers.next();
+            j = currentMembers.next();
 
             if( j.getItemSysKey() == sysKey )
                 jobs.add(j);
-- 
cgit v1.2.3