From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: 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

---
 source/com/c2kernel/collection/AggregationInstance.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/collection/AggregationInstance.java

(limited to 'source/com/c2kernel/collection/AggregationInstance.java')

diff --git a/source/com/c2kernel/collection/AggregationInstance.java b/source/com/c2kernel/collection/AggregationInstance.java
old mode 100755
new mode 100644
index 0fbbf71..2eca928
--- 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);
-    }        			
+    }
 }
 
-- 
cgit v1.2.3