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, 6 insertions, 7 deletions

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.");