From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 source/com/c2kernel/process/Bootstrap.java       | 2 +-
 source/com/c2kernel/process/Gateway.java         | 1 +
 source/com/c2kernel/process/StandardClient.java  | 2 ++
 source/com/c2kernel/process/UserCodeProcess.java | 6 +++---
 4 files changed, 7 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/process/Bootstrap.java
 mode change 100755 => 100644 source/com/c2kernel/process/Gateway.java
 mode change 100755 => 100644 source/com/c2kernel/process/StandardClient.java
 mode change 100755 => 100644 source/com/c2kernel/process/UserCodeProcess.java

(limited to 'source/com/c2kernel/process')

diff --git a/source/com/c2kernel/process/Bootstrap.java b/source/com/c2kernel/process/Bootstrap.java
old mode 100755
new mode 100644
index 61ce46f..ce6791c
--- 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
old mode 100755
new mode 100644
index fcec1c4..276b7b4
--- 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
old mode 100755
new mode 100644
index 00cebe6..2b04613
--- 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
old mode 100755
new mode 100644
index 7eff37b..18fed06
--- 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) {
-- 
cgit v1.2.3