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

diff --git a/source/com/c2kernel/collection/AggregationInstance.java b/source/com/c2kernel/collection/AggregationInstance.java
index 0fbbf71..2eca928 100755..100644
--- a/source/com/c2kernel/collection/AggregationInstance.java
+++ b/source/com/c2kernel/collection/AggregationInstance.java
@@ -14,32 +14,32 @@ public class AggregationInstance extends Aggregation
     public AggregationInstance()

     {

     	setName("AggregationInstance");

-        mMembers = new CollectionMemberList();    	

     }

 

     public AggregationInstance(String name)

     {

     	setName(name);

-        mMembers = new CollectionMemberList();    	

     }

-    

 

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

+

+    @Override

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

         throws MembershipException

-    {       

+    {

         if( entityKey!=-1 && exists(entityKey))

             throw new MembershipException(entityKey+" already exists in this collection.");

         else

             super.addMember(entityKey, props, classProps);

     }

 

-    public void addMember(int entityKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)

+    @Override

+	public void addMember(int entityKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)

         throws MembershipException

     {

         if( entityKey!=-1 && exists(entityKey))

 			throw new MembershipException(entityKey+" already exists in this collection.");

         else

             super.addMember(entityKey, props, classProps, location, w, h);

-    }        			

+    }

 }