More code cleanup:

Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class

10 files changed, 51 insertions, 54 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
index 3677220..073d662 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java
@@ -5,20 +5,20 @@ import java.util.ArrayList;
 public class Aggregation implements java.io.Serializable {

 

     public boolean isDescription;

-    public ArrayList aggregationMemberList;

+    public ArrayList<?> aggregationMemberList;

     public String name;

 

     public Aggregation() {

         super();

-        aggregationMemberList = new ArrayList();

-    } 

-    

+        aggregationMemberList = new ArrayList<Object>();

+    }

+

     public Aggregation(String name, boolean isDescription) {

         this();

         this.name = name;

         this.isDescription = isDescription;

     }

-    

+

     public com.c2kernel.collection.Aggregation create() {

         return new com.c2kernel.collection.AggregationInstance();

     }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java
index 87baa1d..29d3cf9 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/AggregationMember.java
@@ -11,7 +11,7 @@ public class AggregationMember implements java.io.Serializable {
     public AggregationMember() {

         super();

     }

-    

+

     public AggregationMember(int slotNo, String itemDescPath, String itemPath, Geometry geometry) {

         this.slotNo = slotNo;

         this.itemDescriptionPath = itemDescPath;

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
index b0eaaec..96371dd 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
@@ -26,7 +26,8 @@ public class CreateNewAgent extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request( AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request( AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
index 49f8ada..a66b062 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewItem.java
@@ -26,7 +26,8 @@ public class CreateNewItem extends PredefinedStep
     }

 

 	//requestdata is xmlstring

-    public void request( AgentPath agent, int transitionID, String requestData)

+    @Override

+	public void request( AgentPath agent, int transitionID, String requestData)

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
index 0896534..311c108 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Dependency.java
@@ -1,7 +1,6 @@
 package com.c2kernel.lifecycle.instance.predefined.entitycreation;

 

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import com.c2kernel.collection.MembershipException;

 import com.c2kernel.lookup.DomainPath;

@@ -12,13 +11,13 @@ public class Dependency implements java.io.Serializable {
     public String name;

     public boolean isDescription;

     public String itemDescriptionPath;

-    public ArrayList dependencyMemberList;

+    public ArrayList<?> dependencyMemberList;

 

     public Dependency() {

         super();

-        dependencyMemberList = new ArrayList();

-    } 

-    

+        dependencyMemberList = new ArrayList<Object>();

+    }

+

     public Dependency(String itemDesc) {

         this();

         this.itemDescriptionPath = itemDesc;

@@ -33,8 +32,8 @@ public class Dependency implements java.io.Serializable {
             PropertyUtility.getPropertyDescriptionOutcome(new DomainPath(itemDescriptionPath).getSysKey());

             //TODO: set props and class identifiers

         }

-        for (Iterator mems = dependencyMemberList.iterator(); mems.hasNext();) {

-            DependencyMember thisMem = (DependencyMember) mems.next();

+        for (Object name2 : dependencyMemberList) {

+            DependencyMember thisMem = (DependencyMember) name2;

             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/DependencyMember.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java
index 00ac445..b70619f 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/DependencyMember.java
@@ -9,10 +9,10 @@ public class DependencyMember implements java.io.Serializable {
     public DependencyMember() {

         super();

     }

-    

+

     public DependencyMember(String itemPath) {

         this.itemPath = itemPath;

-        

+

     }

 

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java
index 25a1455..f18b6d4 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Geometry.java
@@ -25,5 +25,5 @@ public class Geometry implements java.io.Serializable {
         this.width = width;

         this.height = height;

     }

-    

+

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
index fa575a3..30b80c4 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewAgent.java
@@ -2,7 +2,6 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 

 import java.security.NoSuchAlgorithmException;

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import com.c2kernel.common.CannotManageException;

 import com.c2kernel.common.ObjectAlreadyExistsException;

@@ -21,19 +20,19 @@ public class NewAgent implements java.io.Serializable {
     public String name;

 

     public String password;

-    

-    public ArrayList roles;

+

+    public ArrayList<?> roles;

 

     public NewAgent() {

         super();

-        roles = new ArrayList();

-    } 

-    

+        roles = new ArrayList<Object>();

+    }

+

     public NewAgent(String name, String password) {

         this.name = name;

         this.password = password;

     }

-    

+

     protected void create(int agentId) throws ObjectNotFoundException, ObjectCannotBeUpdated, NoSuchAlgorithmException, CannotManageException, ObjectAlreadyExistsException {

         AgentPath newAgent = Gateway.getLDAPLookup().getNextKeyManager().generateNextAgentKey();

         newAgent.setAgentName(name);

@@ -50,8 +49,8 @@ public class NewAgent implements java.io.Serializable {
             Logger.error(ex);

             throw new CannotManageException("Error initialising new agent");

         }

-        for (Iterator iter = roles.iterator(); iter.hasNext();) {

-            String role = (String) iter.next();

+        for (Object name2 : roles) {

+            String role = (String) name2;

             RolePath thisRole;

             try {

                 thisRole = Gateway.getLDAPLookup().getRoleManager().getRolePath(role);

@@ -60,6 +59,6 @@ public class NewAgent implements java.io.Serializable {
             }

             thisRole.addAgent(newAgent);

         }

-               

+

     }

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index 32ca623..339e294 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -2,7 +2,6 @@ package com.c2kernel.lifecycle.instance.predefined.entitycreation;
 

 

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import com.c2kernel.collection.MembershipException;

 import com.c2kernel.common.CannotManageException;

@@ -22,7 +21,7 @@ import com.c2kernel.utils.Logger;
 

 /**

  * Complete Structure for new item

- * 

+ *

  * @version $Revision: 1.8 $ $Date: 2006/03/03 13:52:21 $

  */

 public class NewItem  {

@@ -48,31 +47,30 @@ public class NewItem  {
     /**

      * Field _aggregationList

      */

-    public ArrayList aggregationList;

+    public ArrayList<?> aggregationList;

 

     /**

      * Field _dependencyList

      */

-    public ArrayList dependencyList;

+    public ArrayList<?> dependencyList;

 

 

     public NewItem() {

         super();

         propertyList = new ArrayList<Property>();

-        aggregationList = new ArrayList();

-        dependencyList = new ArrayList();

+        aggregationList = new ArrayList<Object>();

+        dependencyList = new ArrayList<Object>();

     }

-    

+

     public NewItem(String name, String initialPath, String wf) {

         this();

         this.name = name;

         this.initialPath = initialPath;

         this.workflow = wf;

     }

-    

+

     public void setProperty(String name, String value) {

-        for (Iterator iter = propertyList.iterator(); iter.hasNext();) {

-            Property prop = (Property) iter.next();

+        for (Property prop : propertyList) {

             if (prop.name.equals(name)) {

                 prop.value = value;

                 return;

@@ -80,30 +78,29 @@ public class NewItem  {
         }

         propertyList.add(new Property(name, value));

     }

-    

+

     protected void create(int agentId) throws ObjectCannotBeUpdated, ObjectNotFoundException, CannotManageException, ObjectAlreadyExistsException {

         DomainPath domPath = new DomainPath(new DomainPath(initialPath), name);

         if (domPath.exists())

             throw new ObjectAlreadyExistsException(domPath+" already exists!", "");

-        

+

         // create item

         EntityPath entPath = Gateway.getLDAPLookup().getNextKeyManager().generateNextEntityKey();

         TraceableEntity newItem = (TraceableEntity)Gateway.getCorbaServer().createEntity(entPath);

         Gateway.getLDAPLookup().add(entPath);

-        

+

         // assemble properties

         PropertyArrayList propList = new PropertyArrayList();

         propList.list.add(new com.c2kernel.property.Property("Name", name));

-        for (Iterator iter = propertyList.iterator(); iter.hasNext();) {

-            Property element = (Property) iter.next();

+        for (Property element : propertyList) {

             propList.list.add(new com.c2kernel.property.Property(element.name, element.value));

         }

         // init the new item

         try {

-        

+

         	// find workflow def

         	CompositeActivityDef compact = (CompositeActivityDef)LocalObjectLoader.getActDef(workflow, "last");

-        

+

             newItem.initialise(

                     agentId,

                     CastorXMLUtility.marshall(propList),

@@ -113,11 +110,11 @@ public class NewItem  {
             Logger.error(ex);

             throw new CannotManageException("Problem initialising new item. See server log.", "");

         }

-        

+

         // create collections

-        

-        for (Iterator iter = dependencyList.iterator(); iter.hasNext();) {

-            Dependency element = (Dependency) iter.next();

+

+        for (Object name2 : dependencyList) {

+            Dependency element = (Dependency) name2;

             try {

                 Gateway.getStorage().put(entPath.getSysKey(), element.create(), null);

             } catch (ClusterStorageException ex) {

@@ -128,9 +125,9 @@ public class NewItem  {
                 throw new CannotManageException("A specified member is not of the correct type in "+element.name, "");

             }

         }

-        

-        for (Iterator iter = aggregationList.iterator(); iter.hasNext();) {

-            Aggregation element = (Aggregation) iter.next();

+

+        for (Object name2 : aggregationList) {

+            Aggregation element = (Aggregation) name2;

             try {

                 Gateway.getStorage().put(entPath.getSysKey(), element.create(), null);

             } catch (ClusterStorageException ex) {

@@ -140,6 +137,6 @@ public class NewItem  {
         }

         // register domain path

         domPath.setEntity(entPath);

-        Gateway.getLDAPLookup().add(domPath);        

+        Gateway.getLDAPLookup().add(domPath);

     }

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java
index d99a3e3..e2d214c 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Property.java
@@ -1,7 +1,7 @@
 package com.c2kernel.lifecycle.instance.predefined.entitycreation;

 /**

  * New Properties for the item

- * 

+ *

  * @version $Revision: 1.1 $ $Date: 2005/04/28 13:48:26 $

  */

 public class Property implements java.io.Serializable {