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, 4 insertions, 1 deletions

diff --git a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
index 2ef9508..da59efd 100644
--- a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
+++ b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
@@ -20,6 +20,7 @@ import com.c2kernel.utils.Resource;
 public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue

 {

 	protected CompositeActivityDef mCompositeActivityDef = null;

+	@Override

 	public void create(GraphModelManager graphModelManager, Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo)

 	{

 		String vertexTypeId = null;

@@ -46,7 +47,8 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 				mCompositeActivityDef.newChild("", vertexTypeId, location);

 		}

 	}

-	public void loadThisWorkflow(String newName, HashMap hashMap)

+	@Override

+	public void loadThisWorkflow(String newName, HashMap<?, ?> hashMap)

 	{

 		String vertexTypeId = (String) hashMap.get("P1");

 		Point location = (Point) hashMap.get("P2");

@@ -86,6 +88,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 			mCompositeActivityDef.newChild(newName, vertexTypeId, location);

 		}

 	}

+	@Override

 	public void setCreationContext(Object newContext)

 	{

 		if (newContext != null && newContext instanceof CompositeActivityDef)