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

1 files changed, 13 insertions, 13 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
index 88f89c3..40fe740 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java
@@ -11,7 +11,6 @@
 

 package com.c2kernel.lifecycle.instance.predefined;

 

-import java.util.Iterator;

 

 import com.c2kernel.collection.Collection;

 import com.c2kernel.collection.CollectionMember;

@@ -41,14 +40,15 @@ public class AssignItemToSlot extends PredefinedStep
         super();

     }

 

-	

+

     /**

      * Params:

      * 0 - collection name

      * 1 - slot number

      * 2 - target entity key

      */

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

+    @Override

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

         throws AccessRightsException,

                InvalidTransitionException,

                InvalidDataException

@@ -57,35 +57,35 @@ public class AssignItemToSlot extends PredefinedStep
         String collName;

         int slotNo;

         int entityKey;

-        Collection coll;

+        Collection<?> coll;

 

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

 

         checkAccessRights(agent);

-        

+

         // extract parameters

         try {

             entityPath = getItemEntityPath();

             String[] params = getDataList(requestData);

             collName = params[0];

             slotNo = Integer.parseInt(params[1]);

-            entityKey = Integer.parseInt(params[2]);           

+            entityKey = Integer.parseInt(params[2]);

         } catch (Exception e) {

             throw new InvalidDataException("Invalid parameters", "");

         }

-        

+

         // load collection

         try {

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

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

         } catch (Exception e) {

             Logger.error(e);

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

         }

-        

+

         // find member and assign entity

         boolean stored = false;

-        for (Iterator iter = coll.getMembers().list.iterator(); iter.hasNext();) {

-            CollectionMember member = (CollectionMember)iter.next();

+        for (Object name : coll.getMembers().list) {

+            CollectionMember member = (CollectionMember)name;

             if (member.getID() == slotNo) {

                 if (member.getEntityKey() > -1)

                     throw new InvalidDataException("Member slot not empty", "");

@@ -101,8 +101,8 @@ public class AssignItemToSlot extends PredefinedStep
         if (!stored) {

             throw new InvalidDataException("Member slot "+slotNo+" not found.", "");

         }

-        

-        

+

+

 		try {

             Gateway.getStorage().put(entityPath.getSysKey(), coll, null);

         } catch (ClusterStorageException e) {