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/entity/transfer/TransferItem.java | 8 ++++----
 source/com/c2kernel/entity/transfer/TransferSet.java  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/entity/transfer/TransferItem.java
 mode change 100755 => 100644 source/com/c2kernel/entity/transfer/TransferSet.java

(limited to 'source/com/c2kernel/entity/transfer')

diff --git a/source/com/c2kernel/entity/transfer/TransferItem.java b/source/com/c2kernel/entity/transfer/TransferItem.java
old mode 100755
new mode 100644
index a869741..e4e84ec
--- 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
old mode 100755
new mode 100644
index ee98f8d..f67ba9c
--- 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]));
-- 
cgit v1.2.3