From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 16:08:49 +0200
Subject: Last bit of cleanup honest New castor and dependent commons libs

---
 .../instance/predefined/entitycreation/Aggregation.java    |  4 ++--
 .../instance/predefined/entitycreation/Dependency.java     |  7 +++----
 .../instance/predefined/entitycreation/NewAgent.java       |  7 +++----
 .../instance/predefined/entitycreation/NewItem.java        | 14 ++++++--------
 4 files changed, 14 insertions(+), 18 deletions(-)

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

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
index 073d662..2de12e0 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
@@ -5,12 +5,12 @@ import java.util.ArrayList;
 public class Aggregation implements java.io.Serializable {
 
     public boolean isDescription;
-    public ArrayList<?> aggregationMemberList;
+    public ArrayList<AggregationMember> aggregationMemberList;
     public String name;
 
     public Aggregation() {
         super();
-        aggregationMemberList = new ArrayList<Object>();
+        aggregationMemberList = new ArrayList<AggregationMember>();
     }
 
     public Aggregation(String name, boolean isDescription) {
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
index 311c108..dc31c73 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
@@ -11,11 +11,11 @@ public class Dependency implements java.io.Serializable {
     public String name;
     public boolean isDescription;
     public String itemDescriptionPath;
-    public ArrayList<?> dependencyMemberList;
+    public ArrayList<DependencyMember> dependencyMemberList;
 
     public Dependency() {
         super();
-        dependencyMemberList = new ArrayList<Object>();
+        dependencyMemberList = new ArrayList<DependencyMember>();
     }
 
     public Dependency(String itemDesc) {
@@ -32,8 +32,7 @@ public class Dependency implements java.io.Serializable {
             PropertyUtility.getPropertyDescriptionOutcome(new DomainPath(itemDescriptionPath).getSysKey());
             //TODO: set props and class identifiers
         }
-        for (Object name2 : dependencyMemberList) {
-            DependencyMember thisMem = (DependencyMember) name2;
+        for (DependencyMember thisMem : dependencyMemberList) {
             int syskey = new DomainPath(thisMem.itemPath).getSysKey();
             if (syskey == -1)
             	throw new MembershipException("Cannot find "+thisMem.itemPath+" specified for collection.");
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
index 30b80c4..540a6fc 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
@@ -21,11 +21,11 @@ public class NewAgent implements java.io.Serializable {
 
     public String password;
 
-    public ArrayList<?> roles;
+    public ArrayList<String> roles;
 
     public NewAgent() {
         super();
-        roles = new ArrayList<Object>();
+        roles = new ArrayList<String>();
     }
 
     public NewAgent(String name, String password) {
@@ -49,8 +49,7 @@ public class NewAgent implements java.io.Serializable {
             Logger.error(ex);
             throw new CannotManageException("Error initialising new agent");
         }
-        for (Object name2 : roles) {
-            String role = (String) name2;
+        for (String role : roles) {
             RolePath thisRole;
             try {
                 thisRole = Gateway.getLDAPLookup().getRoleManager().getRolePath(role);
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index 339e294..5666a00 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -47,19 +47,19 @@ public class NewItem  {
     /**
      * Field _aggregationList
      */
-    public ArrayList<?> aggregationList;
+    public ArrayList<Aggregation> aggregationList;
 
     /**
      * Field _dependencyList
      */
-    public ArrayList<?> dependencyList;
+    public ArrayList<Dependency> dependencyList;
 
 
     public NewItem() {
         super();
         propertyList = new ArrayList<Property>();
-        aggregationList = new ArrayList<Object>();
-        dependencyList = new ArrayList<Object>();
+        aggregationList = new ArrayList<Aggregation>();
+        dependencyList = new ArrayList<Dependency>();
     }
 
     public NewItem(String name, String initialPath, String wf) {
@@ -113,8 +113,7 @@ public class NewItem  {
 
         // create collections
 
-        for (Object name2 : dependencyList) {
-            Dependency element = (Dependency) name2;
+        for (Dependency element: dependencyList) {
             try {
                 Gateway.getStorage().put(entPath.getSysKey(), element.create(), null);
             } catch (ClusterStorageException ex) {
@@ -126,8 +125,7 @@ public class NewItem  {
             }
         }
 
-        for (Object name2 : aggregationList) {
-            Aggregation element = (Aggregation) name2;
+        for (Aggregation element : aggregationList) {
             try {
                 Gateway.getStorage().put(entPath.getSysKey(), element.create(), null);
             } catch (ClusterStorageException ex) {
-- 
cgit v1.2.3