Last bit of cleanup honest

New castor and dependent commons libs

7 files changed, 22 insertions, 25 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
index 40fe740..0ad5adc 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
@@ -57,7 +57,7 @@ public class AssignItemToSlot extends PredefinedStep
         String collName;

         int slotNo;

         int entityKey;

-        Collection<?> coll;

+        Collection<? extends CollectionMember> coll;

 

         Logger.msg(1, "AssignItemToSlot::request() - Starting.");

 

@@ -76,7 +76,7 @@ public class AssignItemToSlot extends PredefinedStep
 

         // load collection

         try {

-            coll = (Collection<?>)Gateway.getStorage().get(entityPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);

+            coll = (Collection<? extends CollectionMember>)Gateway.getStorage().get(entityPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);

         } catch (Exception e) {

             Logger.error(e);

             throw new InvalidDataException("Error loading collection "+collName, "");

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
index ad92052..7faee59 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/CreateItemFromDescription.java
@@ -88,15 +88,15 @@ public class CreateItemFromDescription extends PredefinedStep
 

             // loop through collections to instantiate

             for (String collName : collNames) {

-            	Collection<?> thisCol = (Collection<?>)storage.get(myPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);

+            	Collection<? extends CollectionMember> thisCol = (Collection<? extends CollectionMember>)storage.get(myPath.getSysKey(), ClusterStorage.COLLECTION+"/"+collName, null);

             	if (thisCol instanceof CollectionDescription) {

-            		CollectionDescription<?> thisDesc = (CollectionDescription<?>)thisCol;

+            		CollectionDescription<? extends CollectionMember> thisDesc = (CollectionDescription<? extends CollectionMember>)thisCol;

             		collections.add(CastorXMLUtility.marshall(thisDesc.newInstance()));

             	}

             	else if (thisCol.getName().equals("Workflow") && wfDefName == null) {

-            		ArrayList<?> members = thisCol.getMembers().list;

+            		ArrayList<? extends CollectionMember> members = thisCol.getMembers().list;

             		// get the first member from the wf collection

-            		CollectionMember wfMember = (CollectionMember)members.get(0);

+            		CollectionMember wfMember = members.get(0);

             		wfDefName = wfMember.resolveEntity().getName();

             	}

             }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/Erase.java b/source/com/c2kernel/lifecycle/instance/predefined/Erase.java
index 07d76b1..ffdb07c 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -21,6 +21,7 @@ import com.c2kernel.common.InvalidTransitionException;
 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.lookup.EntityPath;

+import com.c2kernel.lookup.Path;

 import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.property.Property;

@@ -57,7 +58,7 @@ public class Erase extends PredefinedStep
             Property name = (Property)Gateway.getStorage().get(entityPath.getSysKey(), ClusterStorage.PROPERTY+"/Name", null);

 

             // get all domain paths

-            Enumeration<?> domPaths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());

+            Enumeration<Path> domPaths = Gateway.getLDAPLookup().search(new DomainPath(), name.getValue());

             while (domPaths.hasMoreElements()) {

                 DomainPath path = (DomainPath)domPaths.nextElement();

                 // delete them

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