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, 32 insertions, 31 deletions

diff --git a/source/com/c2kernel/collection/Dependency.java b/source/com/c2kernel/collection/Dependency.java
index 1b74d42..9351731 100755..100644
--- a/source/com/c2kernel/collection/Dependency.java
+++ b/source/com/c2kernel/collection/Dependency.java
@@ -1,8 +1,9 @@
 package com.c2kernel.collection;

 

-import java.util.Iterator;

 

-import com.c2kernel.utils.*;

+import com.c2kernel.utils.CastorHashMap;

+import com.c2kernel.utils.KeyValuePair;

+import com.c2kernel.utils.Logger;

 

 /*

 Dependency Object

@@ -14,32 +15,30 @@ e.g.: Used for ProductDesc::Item-dependency-dependencymember-WfDesc::Item
  * @version $Revision: 1.15 $ $Date: 2005/04/07 08:03:21 $

  * @author  $Author: abranson $

  */

-public class Dependency extends Parent2ChildCollection

+public class Dependency extends Parent2ChildCollection<DependencyMember>

 {

 

     protected CastorHashMap mProperties = new CastorHashMap();

     protected String mClassProps = "";

-    

+

     public Dependency()

     {

     	setName("Dependency");

-        mMembers = new CollectionMemberList();

     }

 

     public Dependency(String name)

     {

     	setName(name);

-        mMembers = new CollectionMemberList();

     }

-    

+

     public CastorHashMap getProperties() {

         return mProperties;

     }

-    

+

     public void setProperties(CastorHashMap props) {

         mProperties = props;

     }

-    

+

     public KeyValuePair[] getKeyValuePairs()

     {

         return mProperties.getKeyValuePairs();

@@ -48,67 +47,69 @@ public class Dependency extends Parent2ChildCollection
     {

         mProperties.setKeyValuePairs(pairs);

     }

-    

+

     public void setClassProps(String classProps) {

         this.mClassProps = classProps;

     }

-    

+

     public String getClassProps() {

         return mClassProps;

     }

 

-    public void addMember(int entityKey) throws MembershipException {

+    @Override

+	public void addMember(int entityKey) throws MembershipException {

         // create member object

         DependencyMember depMember = new DependencyMember();

         depMember.setID(getCounter());

         depMember.setProperties(mProperties);

         depMember.setClassProps(mClassProps);

-        

+

         // assign entity

         depMember.assignEntity(entityKey);

         mMembers.list.add(depMember);

-        Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");        

+        Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");

     }

 

-    public void addMember(int entityKey, CastorHashMap props, String classProps)

+    @Override

+	public void addMember(int entityKey, CastorHashMap props, String classProps)

         throws MembershipException

     {

         if (classProps != null && !classProps.equals(mClassProps))

             throw new MembershipException("Cannot change classProps in dependency member");

         DependencyMember depMember = new DependencyMember();

         depMember.setID(getCounter());

-        

+

         // merge props

         CastorHashMap newProps = new CastorHashMap();

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

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

-            newProps.put(key, props.get(key));            

-            

+        for (Object name : props.keySet()) {

+            String key = (String)name;

+            newProps.put(key, props.get(key));

+

         }

         // class props override local

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

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

-            newProps.put(key, mProperties.get(key));            

-            

+        for (Object name : mProperties.keySet()) {

+            String key = (String)name;

+            newProps.put(key, mProperties.get(key));

+

         }

         depMember.setProperties(newProps);

         depMember.setClassProps(mClassProps);

-        

+

         // assign entity

         depMember.assignEntity(entityKey);

         mMembers.list.add(depMember);

-        Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");        

+        Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");

     }

-    

-    public void removeMember(int memberId) throws MembershipException {

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

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

+

+    @Override

+	public void removeMember(int memberId) throws MembershipException {

+        for (DependencyMember element : mMembers.list) {

             if (element.getID() == memberId) {

                 mMembers.list.remove(element);

                 return;

             }

         }

-        throw new MembershipException("Member "+memberId+" not found");        

+        throw new MembershipException("Member "+memberId+" not found");

     }

 

 }