From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 16:08:49 +0200
Subject: Last bit of cleanup honest New castor and dependent commons libs

---
 source/com/c2kernel/gui/tabs/collection/AggregationView.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'source/com/c2kernel/gui/tabs/collection/AggregationView.java')

diff --git a/source/com/c2kernel/gui/tabs/collection/AggregationView.java b/source/com/c2kernel/gui/tabs/collection/AggregationView.java
index 3291906..35cdb11 100644
--- a/source/com/c2kernel/gui/tabs/collection/AggregationView.java
+++ b/source/com/c2kernel/gui/tabs/collection/AggregationView.java
@@ -7,6 +7,7 @@ import javax.swing.JButton;
 import javax.swing.JSplitPane;
 
 import com.c2kernel.collection.Aggregation;
+import com.c2kernel.collection.AggregationMember;
 import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.gui.model.AggregationVertexFactory;
 import com.c2kernel.collection.gui.model.AggregationVertexOutlineCreator;
@@ -22,7 +23,7 @@ import com.c2kernel.utils.Resource;
  * @version $Revision: 1.5 $ $Date: 2006/09/15 15:02:24 $
  * @author $Author: abranson $
  */
-public class AggregationView extends CollectionView
+public class AggregationView extends CollectionView<AggregationMember>
 {
 	protected JButton mSaveButton = new JButton(Resource.getImageResource("graph/save.png"));
 	protected JButton mHistoryButton = new JButton(Resource.getImageResource("graph/history.png"));
@@ -32,8 +33,8 @@ public class AggregationView extends CollectionView
 	// Objects to view/modify the properties of the selected activity
 	protected PropertyPanel mPropertyPanel;
 	protected JSplitPane mSplitPane;
-	private AggregationVertexFactory mAggregationVertexFactory = new AggregationVertexFactory();
-	private AggregationMemberRenderer mAggregationMemberRenderer = new AggregationMemberRenderer();
+	private final AggregationVertexFactory mAggregationVertexFactory = new AggregationVertexFactory();
+	private final AggregationMemberRenderer mAggregationMemberRenderer = new AggregationMemberRenderer();
 	public AggregationView()
 	{
 		super();
@@ -48,7 +49,7 @@ public class AggregationView extends CollectionView
 	}
 
 	@Override
-	public void setCollection(Collection<?> contents)
+	public void setCollection(Collection<AggregationMember> contents)
 	{
         thisColl = contents;
         Aggregation agg = (Aggregation)thisColl;
@@ -82,7 +83,7 @@ public class AggregationView extends CollectionView
 			@Override
 			public void actionPerformed(ActionEvent ae)
 			{
-				new CollectionHistoryWindow(item, thisColl);
+				new CollectionHistoryWindow(item, (Aggregation)thisColl);
 			}
 		});
 	}
-- 
cgit v1.2.3