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, 15 insertions, 7 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/Workflow.java b/source/com/c2kernel/lifecycle/instance/Workflow.java
index 4c8aa94..1d12ee6 100644
--- a/source/com/c2kernel/lifecycle/instance/Workflow.java
+++ b/source/com/c2kernel/lifecycle/instance/Workflow.java
@@ -46,7 +46,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	{

 		getProperties().put("ItemSystemKey", null);

 	}

-	

+

 	public Workflow(CompositeActivity domain) {

 		this();

 		domain.setName("domain");

@@ -54,10 +54,10 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 		PredefinedStepContainer act = new PredefinedStepContainer();

 		addChild(act, new GraphPoint(300, 100));

 	}

-	

+

 	/**

 	 * Method getVertexTypeNameAndConstructionInfo.

-	 * 

+	 *

 	 * @return TypeNameAndConstructionInfo[]

 	 */

 	/** getVertexTypeNameAndConstructionInfo() added by Steve */

@@ -67,7 +67,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	}

 	/**

 	 * Method getEdgeTypeNameAndConstructionInfo.

-	 * 

+	 *

 	 * @return TypeNameAndConstructionInfo[]

 	 */

 	/** getVertexTypeNameAndConstructionInfo() added by Steve */

@@ -77,7 +77,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	}

 	/**

 	 * Method requestAction.

-	 * 

+	 *

 	 * @param agentInfo

 	 * @param stepPath

 	 * @param transitionID

@@ -101,6 +101,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	/**

 	 * @see com.c2kernel.graph.model.GraphableVertex#getPath()

 	 */

+	@Override

 	public String getPath()

 	{

 		return "workflow";

@@ -108,6 +109,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#getName()

 	 */

+	@Override

 	public String getName()

 	{

 		return "workflow";

@@ -115,6 +117,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	/**

 	 * @see com.c2kernel.lifecycle.instance.Activity#getType()

 	 */

+	@Override

 	public String getType()

 	{

 		return "workflow";

@@ -122,12 +125,14 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	/**

 	 * @see com.c2kernel.graph.model.Vertex#setName(java.lang.String)

 	 */

+	@Override

 	public void setName(String name)

 	{

 	}

 	/**

 	 * @see com.c2kernel.lifecycle.instance.WfVertex#verify()

 	 */

+	@Override

 	public boolean verify()

 	{

 		for (int i = 0; i < getChildren().length; i++)

@@ -143,13 +148,14 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	/**

 	 * @see com.c2kernel.lifecycle.instance.Activity#getWf()

 	 */

+	@Override

 	public Workflow getWf()

 	{

 		return this;

 	}

 	/**

 	 * Method initialise.

-	 * 

+	 *

 	 * @param systemKey

 	 */

 	public void initialise(int systemKey, AgentPath agent)

@@ -166,7 +172,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	}

 	/**

 	 * Method calculateJobs.

-	 * 

+	 *

 	 * @param type

 	 * @return JobList

 	 */

@@ -185,6 +191,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	/**

 	 * @see com.c2kernel.lifecycle.instance.CompositeActivity#hasGoodNumberOfActivity()

 	 */

+	@Override

 	public boolean hasGoodNumberOfActivity()

 	{

 		return true;

@@ -192,6 +199,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	/**

 	 * @see com.c2kernel.entity.C2KLocalObject#getClusterType()

 	 */

+	@Override

 	public String getClusterType()

 	{

 		return ClusterStorage.LIFECYCLE;