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, 14 insertions, 10 deletions

diff --git a/source/com/c2kernel/lifecycle/LoopDef.java b/source/com/c2kernel/lifecycle/LoopDef.java
index bee97c5..36108ad 100755..100644
--- a/source/com/c2kernel/lifecycle/LoopDef.java
+++ b/source/com/c2kernel/lifecycle/LoopDef.java
@@ -26,6 +26,7 @@ public class LoopDef extends XOrSplitDef
 	/**

 	 * @see com.c2kernel.lifecycle.WfVertexDef#loop()

 	 */

+	@Override

 	public boolean loop()

 	{

 		return true;

@@ -34,6 +35,7 @@ public class LoopDef extends XOrSplitDef
 	/**

 	 * @see com.c2kernel.lifecycle.WfVertexDef#verify()

 	 */

+	@Override

 	public boolean verify()

 	{

 		if (!super.verify()) return false;

@@ -43,11 +45,11 @@ public class LoopDef extends XOrSplitDef
         int k = 0;

         int l = 0;

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

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

-            if (brothers[i] instanceof LoopDef) l++; 

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

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

-				if (nexts[i].equals(anteVertices[j]))

+        for (Vertex brother : brothers)

+			if (brother instanceof LoopDef) l++;

+        for (Vertex next : nexts)

+			for (Vertex anteVertice : anteVertices)

+				if (next.equals(anteVertice))

 					k++;

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

 		{

@@ -60,15 +62,17 @@ public class LoopDef extends XOrSplitDef
 //        }

 		return true;

 	}

-    

-    public boolean isLoop() {

+

+    @Override

+	public boolean isLoop() {

         return true;

-    }     

-    

+    }

+

+	@Override

 	public WfVertex instantiate() {

 		Loop newLoop = new Loop();

 		configureInstance(newLoop);

 		return newLoop;

 	}

-    

+

 }