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, 23 insertions, 26 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
index a0d4aab..6a3abe7 100644
--- a/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
+++ b/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
@@ -47,14 +47,14 @@ public class AdvancementCalculator implements Serializable
 	{

 		current.isMarked.put(v, "");

 		Vertex[] nexts = current.activity.getChildGraphModel().getOutVertices(v);

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

-			if (current.isMarked.get(nexts[i]) != null)

-				current.HasNextMarked.put(v, nexts[i]);

+		for (Vertex next : nexts)

+			if (current.isMarked.get(next) != null)

+				current.HasNextMarked.put(v, next);

 			else

-				check(nexts[i], current);

+				check(next, current);

         int j=0;

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

-			if (current.HasNextMarked.get(nexts[i]) != null)

+		for (Vertex next : nexts)

+			if (current.HasNextMarked.get(next) != null)

 				j++;

         if (j != 0 && j==nexts.length) current.HasNextMarked.put(v, nexts[0]);

 	}

@@ -133,33 +133,30 @@ public class AdvancementCalculator implements Serializable
 			long NbActpassedWithCurrent = 0;

 			long NbActLeftWithCurrent = 0;

 			long NbActLeftWithoutCurrent = 0;

-			boolean isbranchFinished = true;

 			boolean hasNobranchFinished = true;

 			boolean hasNoBranchActive = true;

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

-			{

-				if (advs[i].mIsbranchActive)

+			for (AdvancementCalculator adv : advs) {

+				if (adv.mIsbranchActive)

 					hasNoBranchActive = false;

-				if (advs[i].mIsbranchFinished)

+				if (adv.mIsbranchFinished)

 					hasNobranchFinished = false;

 			}

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

-			{

+			for (AdvancementCalculator adv : advs) {

 

-				if (maximuNbActexp < advs[i].mMaximuNbActexp)

-					maximuNbActexp = advs[i].mMaximuNbActexp;

-				if (advs[i].mIsbranchActive || advs[i].mIsbranchFinished || (hasNoBranchActive && hasNobranchFinished))

+				if (maximuNbActexp < adv.mMaximuNbActexp)

+					maximuNbActexp = adv.mMaximuNbActexp;

+				if (adv.mIsbranchActive || adv.mIsbranchFinished || (hasNoBranchActive && hasNobranchFinished))

 				{

-					if (NbActpassed < advs[i].mNbActpassed)

-						NbActpassed = advs[i].mNbActpassed;

-					if (NbActpassedWithCurrent < advs[i].mNbActpassedWithCurrent)

-						NbActpassedWithCurrent = advs[i].mNbActpassedWithCurrent;

-					if (NbActLeftWithCurrent < advs[i].mNbActLeftWithCurrent)

-						NbActLeftWithCurrent = advs[i].mNbActLeftWithCurrent;

-					if (NbActLeftWithoutCurrent < advs[i].mNbActLeftWithoutCurrent)

-						NbActLeftWithoutCurrent += advs[i].mNbActLeftWithoutCurrent;

-					if (currentNbActExp < advs[i].mCurrentNbActExp)

-						currentNbActExp = advs[i].mCurrentNbActExp;

+					if (NbActpassed < adv.mNbActpassed)

+						NbActpassed = adv.mNbActpassed;

+					if (NbActpassedWithCurrent < adv.mNbActpassedWithCurrent)

+						NbActpassedWithCurrent = adv.mNbActpassedWithCurrent;

+					if (NbActLeftWithCurrent < adv.mNbActLeftWithCurrent)

+						NbActLeftWithCurrent = adv.mNbActLeftWithCurrent;

+					if (NbActLeftWithoutCurrent < adv.mNbActLeftWithoutCurrent)

+						NbActLeftWithoutCurrent += adv.mNbActLeftWithoutCurrent;

+					if (currentNbActExp < adv.mCurrentNbActExp)

+						currentNbActExp = adv.mCurrentNbActExp;

 				}

 			}

 			current.mCurrentNbActExp += currentNbActExp;