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

diff --git a/source/com/c2kernel/gui/tabs/collection/AggregationView.java b/source/com/c2kernel/gui/tabs/collection/AggregationView.java
index 8a97c6c..3291906 100755..100644
--- a/source/com/c2kernel/gui/tabs/collection/AggregationView.java
+++ b/source/com/c2kernel/gui/tabs/collection/AggregationView.java
@@ -47,7 +47,8 @@ public class AggregationView extends CollectionView
         mEditorPanel.setEditable(MainFrame.isAdmin);

 	}

 

-	public void setCollection(Collection contents)

+	@Override

+	public void setCollection(Collection<?> contents)

 	{

         thisColl = contents;

         Aggregation agg = (Aggregation)thisColl;

@@ -70,6 +71,7 @@ public class AggregationView extends CollectionView
 	{

 		mSaveButton.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				saveCollection();

@@ -77,10 +79,11 @@ public class AggregationView extends CollectionView
 		});

 		mHistoryButton.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				new CollectionHistoryWindow(item, thisColl);

 			}

-		});		

+		});

 	}

 }