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

diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
index d363dc6..0b6c9e4 100644
--- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
+++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
@@ -19,6 +19,7 @@ import com.c2kernel.utils.Resource;
 public class WfVertexFactory implements VertexFactory, WorkflowDialogue

 {

 	protected CompositeActivity mRootAct = null;

+	@Override

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

 	{

 		String vertexTypeId = null;

@@ -44,12 +45,14 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 				mRootAct.newChild(vertexTypeId, location);

 		}

 	}

+	@Override

 	public void setCreationContext(Object newContext)

 	{

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

 			mRootAct = (CompositeActivity) newContext;

 	}

-	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");

@@ -69,7 +72,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 					Resource.getImageResource("graph/newvertex_large.png"),

 					null,

 					null);

-			if (newName == null || newName.equals(""))

+			if (newName.equals(""))

 				return;

 		}

 		Activity act = null;

@@ -80,7 +83,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 		}

 		catch (Exception e)

 		{

-		}		

+		}

 		if (act == null)

 			mRootAct.newChild(unicName, vertexTypeId, location);

 		else