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

warnings :)

4 files changed, 7 insertions, 4 deletions

diff --git a/source/com/c2kernel/process/Bootstrap.java b/source/com/c2kernel/process/Bootstrap.java
index 61ce46f..ce6791c 100755..100644
--- a/source/com/c2kernel/process/Bootstrap.java
+++ b/source/com/c2kernel/process/Bootstrap.java
@@ -45,7 +45,7 @@ import com.c2kernel.utils.Resource;
 

 public class Bootstrap

 {

-    static HashMap bootstrapFactoryItems = new HashMap();

+    static HashMap<String, String> bootstrapFactoryItems = new HashMap<String, String>();

     static DomainPath thisServerPath;

 

 	/**

diff --git a/source/com/c2kernel/process/Gateway.java b/source/com/c2kernel/process/Gateway.java
index fcec1c4..276b7b4 100755..100644
--- a/source/com/c2kernel/process/Gateway.java
+++ b/source/com/c2kernel/process/Gateway.java
@@ -143,6 +143,7 @@ public class Gateway
                 sysProps.put("ORBHost", serverName);

             String serverPort = getProperty("ItemServer.iiop", "1500");

             sysProps.put("ORBPort", serverPort);

+            //TODO: externalize this (or replace corba completely)

             sysProps.put("com.sun.CORBA.POA.ORBServerId", "1");

             sysProps.put("com.sun.CORBA.POA.ORBPersistentServerPort", serverPort);

 

diff --git a/source/com/c2kernel/process/StandardClient.java b/source/com/c2kernel/process/StandardClient.java
index 00cebe6..2b04613 100755..100644
--- a/source/com/c2kernel/process/StandardClient.java
+++ b/source/com/c2kernel/process/StandardClient.java
@@ -12,5 +12,7 @@ package com.c2kernel.process;
 

 abstract public class StandardClient extends AbstractMain

 {

+	

+	//TODO: Auto-update from server

 

 }

diff --git a/source/com/c2kernel/process/UserCodeProcess.java b/source/com/c2kernel/process/UserCodeProcess.java
index 7eff37b..18fed06 100755..100644
--- a/source/com/c2kernel/process/UserCodeProcess.java
+++ b/source/com/c2kernel/process/UserCodeProcess.java
@@ -28,8 +28,8 @@ import com.c2kernel.utils.Logger;
 public class UserCodeProcess extends StandardClient implements EntityProxyObserver, Runnable {

     protected AgentProxy agent;

     static boolean active = true;

-    ArrayList ignoredPaths = new ArrayList();

-    HashMap jobs;

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

+    HashMap<String, C2KLocalObject> jobs;

         

     public UserCodeProcess(String agentName, String agentPass) {

         // login - try for a while in case server hasn't imported our user yet

@@ -51,7 +51,7 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
     

     public void run() {

         Thread.currentThread().setName("Usercode Process");

-        jobs = new HashMap();

+        jobs = new HashMap<String, C2KLocalObject>();

         // subscribe to job list

         agent.subscribe(this, ClusterStorage.JOB, true);

         while (active) {