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

warnings :)

10 files changed, 31 insertions, 36 deletions

diff --git a/source/com/c2kernel/entity/CorbaServer.java b/source/com/c2kernel/entity/CorbaServer.java
index 948b1a6..883bb1b 100755..100644
--- a/source/com/c2kernel/entity/CorbaServer.java
+++ b/source/com/c2kernel/entity/CorbaServer.java
@@ -31,14 +31,14 @@ import com.c2kernel.utils.SoftCache;
 

 

 public class CorbaServer {

-    private Map         mEntityCache;

+    private Map<EntityPath, Servant>         mEntityCache;

     private POA         mRootPOA;

     private POA         mItemPOA;

     private POA         mAgentPOA;

     private POAManager  mPOAManager;

 

     public CorbaServer() throws InvalidDataException {

-        mEntityCache   = new SoftCache(50);

+        mEntityCache   = new SoftCache<EntityPath, Servant>(50);

         

         // init POA

         try {

diff --git a/source/com/c2kernel/entity/agent/JobArrayList.java b/source/com/c2kernel/entity/agent/JobArrayList.java
index b6eb2c2..fa85368 100755..100644
--- a/source/com/c2kernel/entity/agent/JobArrayList.java
+++ b/source/com/c2kernel/entity/agent/JobArrayList.java
@@ -13,7 +13,7 @@ import java.util.ArrayList;
 

 import com.c2kernel.utils.CastorArrayList;

 

-public class JobArrayList extends CastorArrayList 

+public class JobArrayList extends CastorArrayList<Job>

 {

 

     public JobArrayList()

@@ -21,7 +21,7 @@ public class JobArrayList extends CastorArrayList
         super();

     }

     

-    public JobArrayList(ArrayList aList)

+    public JobArrayList(ArrayList<Job> aList)

     {  

         super(aList);

     }

diff --git a/source/com/c2kernel/entity/agent/JobList.java b/source/com/c2kernel/entity/agent/JobList.java
index d0d05d5..15ce0dd 100755..100644
--- a/source/com/c2kernel/entity/agent/JobList.java
+++ b/source/com/c2kernel/entity/agent/JobList.java
@@ -108,7 +108,7 @@ public class JobList extends RemoteMap
     {

         Iterator currentMembers = values().iterator();

         Job           j = null;

-        Vector jobs = new Vector();

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

 

         while( currentMembers.hasNext() )

         {

diff --git a/source/com/c2kernel/entity/proxy/EntityProxy.java b/source/com/c2kernel/entity/proxy/EntityProxy.java
index a5b6822..b34653f 100755..100644
--- a/source/com/c2kernel/entity/proxy/EntityProxy.java
+++ b/source/com/c2kernel/entity/proxy/EntityProxy.java
@@ -35,7 +35,7 @@ abstract public class EntityProxy implements ManageableEntity
     protected ManageableEntity    mEntity = null;

     protected org.omg.CORBA.Object mIOR;

     protected   int                 mSystemKey;

-    private   HashMap             mSubscriptions;

+    private   HashMap<MemberSubscription, EntityProxyObserver>             mSubscriptions;

 

    /**************************************************************************

     *

@@ -60,7 +60,7 @@ abstract public class EntityProxy implements ManageableEntity
 

         mIOR            = ior;

         mSystemKey      = systemKey;

-        mSubscriptions  = new HashMap();

+        mSubscriptions  = new HashMap<MemberSubscription, EntityProxyObserver>();

     }

 

 

diff --git a/source/com/c2kernel/entity/proxy/EntityProxyManager.java b/source/com/c2kernel/entity/proxy/EntityProxyManager.java
index 386bc2c..3224da7 100755..100644
--- a/source/com/c2kernel/entity/proxy/EntityProxyManager.java
+++ b/source/com/c2kernel/entity/proxy/EntityProxyManager.java
@@ -27,12 +27,12 @@ import com.c2kernel.utils.server.SimpleTCPIPServer;
 

 public class EntityProxyManager 

 {

-    SoftCache       proxyPool     = new SoftCache(50);

-    HashMap         treeSubscribers = new HashMap();

-    HashMap         connections = new HashMap();

+    SoftCache<Integer, EntityProxy>       proxyPool     = new SoftCache<Integer, EntityProxy>(50);

+    HashMap<DomainPathSubscriber, DomainPath>         treeSubscribers = new HashMap<DomainPathSubscriber, DomainPath>();

+    HashMap<String, ProxyServerConnection>         connections = new HashMap<String, ProxyServerConnection>();

         

     // server objects

-    static ArrayList proxyClients      = new ArrayList();

+    static ArrayList<ProxyClientConnection> proxyClients      = new ArrayList<ProxyClientConnection>();

     static SimpleTCPIPServer proxyServer = null;

     static String serverName = null;

 

diff --git a/source/com/c2kernel/entity/proxy/ItemProxy.java b/source/com/c2kernel/entity/proxy/ItemProxy.java
index e816a53..702dd26 100755..100644
--- a/source/com/c2kernel/entity/proxy/ItemProxy.java
+++ b/source/com/c2kernel/entity/proxy/ItemProxy.java
@@ -152,7 +152,7 @@ public class ItemProxy extends EntityProxy
    /**************************************************************************

     *

     **************************************************************************/

-    private ArrayList getJobList(int agentId, boolean filter)

+    private ArrayList<Job> getJobList(int agentId, boolean filter)

         throws AccessRightsException,

                ObjectNotFoundException,

                PersistencyException

@@ -163,14 +163,13 @@ public class ItemProxy extends EntityProxy
             thisJobList = (JobArrayList)CastorXMLUtility.unmarshall(jobs);

             }

         catch (Exception e) {

-            Logger.error("Exception::ItemProxy::getJobList() - Cannot unmarshall the jobs");

             Logger.error(e);

-            return new ArrayList();

+            throw new PersistencyException("Exception::ItemProxy::getJobList() - Cannot unmarshall the jobs", null);

         }

         return thisJobList.list;

     }

     

-    public ArrayList getJobList(AgentProxy agent)

+    public ArrayList<Job> getJobList(AgentProxy agent)

     throws AccessRightsException,

            ObjectNotFoundException,

            PersistencyException

@@ -178,7 +177,7 @@ public class ItemProxy extends EntityProxy
         return getJobList(agent.getSystemKey());	

     }

     

-    private ArrayList getJobList(int agentId)

+    private ArrayList<Job> getJobList(int agentId)

         throws AccessRightsException,

                ObjectNotFoundException,

                PersistencyException

@@ -191,9 +190,8 @@ public class ItemProxy extends EntityProxy
            ObjectNotFoundException,

            PersistencyException {

     	

-    	ArrayList jobList = getJobList(agentId);

-    	for (Object jobObj : jobList) {

-			Job job = (Job)jobObj;

+    	ArrayList<Job> jobList = getJobList(agentId);

+    	for (Job job : jobList) {

 			int transition = job.getPossibleTransition();

 			if (job.getStepName().equals(actName))

 				if (transition == Transitions.COMPLETE || transition == Transitions.DONE)

diff --git a/source/com/c2kernel/entity/proxy/MemberSubscription.java b/source/com/c2kernel/entity/proxy/MemberSubscription.java
index fdd3e96..ba2d725 100755..100644
--- a/source/com/c2kernel/entity/proxy/MemberSubscription.java
+++ b/source/com/c2kernel/entity/proxy/MemberSubscription.java
@@ -2,7 +2,6 @@
 package com.c2kernel.entity.proxy;

 import java.lang.ref.WeakReference;

 import java.util.ArrayList;

-import java.util.Iterator;

 import java.util.StringTokenizer;

 

 import com.c2kernel.common.ObjectNotFoundException;

@@ -13,8 +12,8 @@ public class MemberSubscription implements Runnable {
     EntityProxy subject;

     String interest;

     // keep the subscriber by weak reference, so it is not kept from the garbage collector if no longer used

-    WeakReference observerReference;

-    ArrayList contents = new ArrayList();

+    WeakReference<EntityProxyObserver> observerReference;

+    ArrayList<String> contents = new ArrayList<String>();

     boolean preLoad;

 

     public MemberSubscription(EntityProxy subject, String interest, 

@@ -38,13 +37,12 @@ public class MemberSubscription implements Runnable {
             // fetch contents of path

             String children = subject.queryData(interest+"/all");

             StringTokenizer tok = new StringTokenizer(children, ",");

-            ArrayList newContents = new ArrayList();

+            ArrayList<String> newContents = new ArrayList<String>();

             while (tok.hasMoreTokens())

                 newContents.add(tok.nextToken());

                 

             // look to see what's new

-            for (Iterator iter = newContents.iterator(); iter.hasNext();) {

-                String newChild = (String)iter.next();

+            for (String newChild: newContents) {

                 

                 // load child object

                 try {

@@ -61,8 +59,7 @@ public class MemberSubscription implements Runnable {
                 }

             }

             // report what's left in old contents as deleted

-            for (Iterator iter = contents.iterator(); iter.hasNext();) {

-                String oldChild = (String)iter.next();

+            for (String oldChild: contents) {

                 observer.remove(interest+"/"+oldChild);

             }

             //replace contents arraylist

@@ -110,7 +107,7 @@ public class MemberSubscription implements Runnable {
     }

     

     public void setObserver(EntityProxyObserver observer) {

-        observerReference = new WeakReference(observer);

+        observerReference = new WeakReference<EntityProxyObserver>(observer);

     }

     

     public EntityProxyObserver getObserver() {

diff --git a/source/com/c2kernel/entity/proxy/ProxyClientConnection.java b/source/com/c2kernel/entity/proxy/ProxyClientConnection.java
index 46f1e3d..f041012 100755..100644
--- a/source/com/c2kernel/entity/proxy/ProxyClientConnection.java
+++ b/source/com/c2kernel/entity/proxy/ProxyClientConnection.java
@@ -28,7 +28,7 @@ public class ProxyClientConnection implements SocketHandler {
 	Socket clientSocket = null;

     static int clientId = -1;

     int thisClientId;

-    ArrayList sysKeys;

+    ArrayList<Integer> sysKeys;

     PrintWriter response;

     BufferedReader request;

     boolean closing = false;

@@ -55,7 +55,7 @@ public class ProxyClientConnection implements SocketHandler {
             newSocket.setSoTimeout(500);

             clientSocket = newSocket;

             response = new PrintWriter(clientSocket.getOutputStream(), true);

-            sysKeys = new ArrayList();

+            sysKeys = new ArrayList<Integer>();

         } catch (SocketException ex) {

             Logger.msg("Could not set socket timeout:");

             Logger.error(ex);

diff --git a/source/com/c2kernel/entity/transfer/TransferItem.java b/source/com/c2kernel/entity/transfer/TransferItem.java
index a869741..e4e84ec 100755..100644
--- a/source/com/c2kernel/entity/transfer/TransferItem.java
+++ b/source/com/c2kernel/entity/transfer/TransferItem.java
@@ -14,7 +14,7 @@ import com.c2kernel.property.*;
 import com.c2kernel.utils.*;

 

 public class TransferItem {

-    public ArrayList domainPaths;

+    public ArrayList<String> domainPaths;

     public int sysKey;

     static int importAgentId;

 

@@ -29,7 +29,7 @@ public class TransferItem {
 

     public TransferItem(int sysKey) throws Exception {

         this.sysKey = sysKey;

-        domainPaths = new ArrayList();

+        domainPaths = new ArrayList<String>();

         Property name = (Property)Gateway.getStorage().get(sysKey, ClusterStorage.PROPERTY + "/Name", null);

         Enumeration paths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());

         while (paths.hasMoreElements()) {

@@ -69,7 +69,7 @@ public class TransferItem {
         ArrayList events, outcomes, viewpoints = new ArrayList();

         // retrieve objects

         ArrayList objectFiles = FileStringUtility.listDir(dir.getCanonicalPath(), false, true);

-        ArrayList objects = new ArrayList();

+        ArrayList<C2KLocalObject> objects = new ArrayList<C2KLocalObject>();

         for (Iterator iter = objectFiles.iterator(); iter.hasNext();) {

             String element = (String)iter.next();

             String xmlFile = FileStringUtility.file2String(element);

@@ -95,7 +95,7 @@ public class TransferItem {
         for (Iterator iter = objects.iterator(); iter.hasNext();) {

             C2KLocalObject obj = (C2KLocalObject)iter.next();

             if (obj instanceof Property)

-                props.list.add(obj);

+                props.list.add((Property)obj);

             else if (obj instanceof Workflow)

                 wf = (Workflow)obj;

         }

diff --git a/source/com/c2kernel/entity/transfer/TransferSet.java b/source/com/c2kernel/entity/transfer/TransferSet.java
index ee98f8d..f67ba9c 100755..100644
--- a/source/com/c2kernel/entity/transfer/TransferSet.java
+++ b/source/com/c2kernel/entity/transfer/TransferSet.java
@@ -22,13 +22,13 @@ import com.c2kernel.utils.Logger;
 

 public class TransferSet {

 

-    public ArrayList items;

+    public ArrayList<TransferItem> items;

     

     public TransferSet() {

     }

     

     public TransferSet(int[] sysKeys) {

-        items = new ArrayList();

+        items = new ArrayList<TransferItem>();

         for (int i = 0; i < sysKeys.length; i++) {

             try {

                 items.add(new TransferItem(sysKeys[i]));