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 :)

---
 .../lifecycle/instance/predefined/CreateItemFromDescription.java      | 2 +-
 .../lifecycle/instance/predefined/entitycreation/Aggregation.java     | 1 -
 .../lifecycle/instance/predefined/entitycreation/NewItem.java         | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java

(limited to 'source/com/c2kernel/lifecycle/instance/predefined')

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
old mode 100755
new mode 100644
index eddec34..7bedc81
--- a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
@@ -82,7 +82,7 @@ public class CreateItemFromDescription extends PredefinedStep
             									
             // get init objects
             String[] collNames = storage.getClusterContents(myPath.getSysKey(), ClusterStorage.COLLECTION);
-            ArrayList collections = new ArrayList();
+            ArrayList<String> collections = new ArrayList<String>();
             
             
             // loop through collections to instantiate
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
old mode 100755
new mode 100644
index 4abb0e6..3677220
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
@@ -20,7 +20,6 @@ public class Aggregation implements java.io.Serializable {
     }
     
     public com.c2kernel.collection.Aggregation create() {
-        // TODO: create aggregation
         return new com.c2kernel.collection.AggregationInstance();
     }
 }
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
old mode 100755
new mode 100644
index 4988700..32ca623
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -43,7 +43,7 @@ public class NewItem  {
     /**
      * New Properties for the item
      */
-    public ArrayList propertyList;
+    public ArrayList<Property> propertyList;
 
     /**
      * Field _aggregationList
@@ -58,7 +58,7 @@ public class NewItem  {
 
     public NewItem() {
         super();
-        propertyList = new ArrayList();
+        propertyList = new ArrayList<Property>();
         aggregationList = new ArrayList();
         dependencyList = new ArrayList();
     }
-- 
cgit v1.2.3