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

diff --git a/source/com/c2kernel/collection/gui/view/PropertyPanel.java b/source/com/c2kernel/collection/gui/view/PropertyPanel.java
index 903ddf9..f566d70 100755..100644
--- a/source/com/c2kernel/collection/gui/view/PropertyPanel.java
+++ b/source/com/c2kernel/collection/gui/view/PropertyPanel.java
@@ -1,7 +1,7 @@
 package com.c2kernel.collection.gui.view;

 

+import com.c2kernel.collection.Aggregation;

 import com.c2kernel.collection.AggregationMember;

-import com.c2kernel.collection.Collection;

 import com.c2kernel.collection.CollectionMember;

 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.graph.model.Vertex;

@@ -9,17 +9,18 @@ import com.c2kernel.graph.view.VertexPropertyPanel;
 

 public class PropertyPanel extends VertexPropertyPanel {

 

-    Collection mCollection;

-    

+    Aggregation mCollection;

+

     public PropertyPanel() {

        super();

     }

-    

-    public void setCollection(Collection collection) {

+

+    public void setCollection(Aggregation collection) {

         mCollection = collection;

     }

 

-    public void setVertex(Vertex vert) {

+    @Override

+	public void setVertex(Vertex vert) {

         try {

             CollectionMember newMember = mCollection.getMember(vert.getID());

             if (newMember instanceof AggregationMember) {