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/Aggregation.java | 38 ++++++++++++++-----------
 1 file changed, 21 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/collection/Aggregation.java

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

diff --git a/source/com/c2kernel/collection/Aggregation.java b/source/com/c2kernel/collection/Aggregation.java
old mode 100755
new mode 100644
index 72b8005..29cb067
--- a/source/com/c2kernel/collection/Aggregation.java
+++ b/source/com/c2kernel/collection/Aggregation.java
@@ -1,29 +1,31 @@
 package com.c2kernel.collection;
 
-import java.util.Iterator;
 
 import com.c2kernel.collection.gui.model.AggregationVertexOutlineCreator;
-import com.c2kernel.graph.model.*;
-import com.c2kernel.utils.*;
+import com.c2kernel.graph.model.GraphModel;
+import com.c2kernel.graph.model.GraphPoint;
+import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
+import com.c2kernel.utils.CastorHashMap;
+import com.c2kernel.utils.Language;
+import com.c2kernel.utils.Logger;
 
 /**
  * @version $Revision: 1.59 $ $Date: 2004/08/10 07:56:08 $
  * @author  $Author: abranson $
  */
 
-abstract public class Aggregation extends Parent2ChildCollection
+abstract public class Aggregation extends Parent2ChildCollection<AggregationMember>
 {
 
     protected GraphModel mLayout = new GraphModel(new AggregationVertexOutlineCreator());
 
     private final TypeNameAndConstructionInfo[] mVertexTypeNameAndConstructionInfo = {
-            new TypeNameAndConstructionInfo(Language.translate("Slot"), "AggregationMember") 
+            new TypeNameAndConstructionInfo(Language.translate("Slot"), "AggregationMember")
     };
 
     public Aggregation()
     {
     	setName("Aggregation");
-        mMembers = new CollectionMemberList();
     }
 
 
@@ -46,22 +48,22 @@ abstract public class Aggregation extends Parent2ChildCollection
     {
     	for (int i=0; i<size(); i++)
     	{
-    		AggregationMember element = (AggregationMember) mMembers.list.get(i);
+    		AggregationMember element = mMembers.list.get(i);
             if (element.getEntityKey() == entityKey)
                 return true;
     	}
-    	return false;   	
+    	return false;
     }
 
 	public AggregationMember getMemberPair(int vertexID)
 	{
     	for (int i=0; i<size(); i++)
     	{
-    		AggregationMember element = (AggregationMember) mMembers.list.get(i);
+    		AggregationMember element = mMembers.list.get(i);
             if (element.getID() == vertexID)
                 return element;
     	}
-    	return null;		
+    	return null;
 	}
 
     public void addMember(int entityKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)
@@ -86,19 +88,21 @@ abstract public class Aggregation extends Parent2ChildCollection
     }
 
 
-    public void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException 
+    @Override
+	public void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException
     {
         addMember(entityKey, props, classProps, new GraphPoint(100,100*getCounter()), 20, 20);
     }
-    
-    public void addMember(int entityKey) throws MembershipException {
+
+    @Override
+	public void addMember(int entityKey) throws MembershipException {
         throw new MembershipException("Aggregations cannot accept arbitrary members without type info");
-        
+
     }
 
-    public void removeMember(int memberId) throws MembershipException {
-        for (Iterator iter = mMembers.list.iterator(); iter.hasNext();) {
-            AggregationMember element = (AggregationMember)iter.next();
+    @Override
+	public void removeMember(int memberId) throws MembershipException {
+        for (AggregationMember element : mMembers.list) {
             if (element.getID() == memberId) {
                 element.clearEntity();
                 mLayout.removeVertex(getLayout().getVertexById(memberId));
-- 
cgit v1.2.3