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, 12 insertions, 9 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/Loop.java b/source/com/c2kernel/lifecycle/instance/Loop.java
index 556a9ca..8228ba9 100755..100644
--- a/source/com/c2kernel/lifecycle/instance/Loop.java
+++ b/source/com/c2kernel/lifecycle/instance/Loop.java
@@ -20,10 +20,12 @@ public class Loop extends XOrSplit
 	/**

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

 	 */

+	@Override

 	public boolean loop()

 	{

 		return true;

 	}

+	@Override

 	public void followNext(Next activeNext, AgentPath agent) throws ScriptingEngineException

 	{

 		WfVertex v = activeNext.getTerminusVertex();

@@ -38,6 +40,7 @@ public class Loop extends XOrSplit
 	/**

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

 	 */

+	@Override

 	public void reinit(int idLoop)

 	{

 		Logger.msg(8, "Loop.reinit");

@@ -56,6 +59,7 @@ public class Loop extends XOrSplit
 	/**

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

 	 */

+	@Override

 	public boolean verify()

 	{

 		boolean err = super.verify();

@@ -64,13 +68,12 @@ public class Loop extends XOrSplit
 		int k = 0;

 		int l = 0;

 		Vertex[] brothers = getParent().getChildren();

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

-			if (brothers[i] instanceof Loop)

+		for (Vertex brother : brothers)

+			if (brother instanceof Loop)

 				l++;

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

-		{

-			for (int j = 0; j < anteVertices.length; j++)

-				if (nexts[i].getID() == anteVertices[j].getID())

+		for (Vertex next : nexts) {

+			for (Vertex anteVertice : anteVertices)

+				if (next.getID() == anteVertice.getID())

 					k++;

 		}

 		if (k != 1 && !(l > 1))

@@ -88,15 +91,15 @@ public class Loop extends XOrSplit
 	{

 		int id = vertex.getID();

 		Vertex[] anteVertices = GraphTraversal.getTraversal(getParent().getChildrenGraphModel(), this, GraphTraversal.kUp, false);

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

-		{

-			if (anteVertices[i].getID() == id)

+		for (Vertex anteVertice : anteVertices) {

+			if (anteVertice.getID() == id)

 			{

 				return true;

 			}

 		}

 		return false;

 	}

+	@Override

 	public boolean isLoop()

 	{

 		return true;