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

diff --git a/source/com/c2kernel/lifecycle/instance/XOrSplit.java b/source/com/c2kernel/lifecycle/instance/XOrSplit.java
index 108aa61..25baf0b 100644
--- a/source/com/c2kernel/lifecycle/instance/XOrSplit.java
+++ b/source/com/c2kernel/lifecycle/instance/XOrSplit.java
@@ -21,32 +21,32 @@ public class XOrSplit extends Split
         super();

     }

 

-    public void runNext(AgentPath agent) throws ScriptingEngineException

+    @Override

+	public void runNext(AgentPath agent) throws ScriptingEngineException

     {

         ArrayList<DirectedEdge> nextsToFollow = new ArrayList<DirectedEdge>();

         String nexts = this.evaluateScript(

-            (String) getProperties().get("RoutingScriptName"), 

+            (String) getProperties().get("RoutingScriptName"),

             (String) getProperties().get("RoutingScriptVersion")).toString();

-            

+

         StringTokenizer tok = new StringTokenizer(nexts,",");

         String[] nextsTab = new String[tok.countTokens()];

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

-            nextsTab[i] = tok.nextToken();        

+            nextsTab[i] = tok.nextToken();

 

         DirectedEdge[] outEdges = getOutEdges();

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

-        {

-            if (isInTable((String)((Next)outEdges[i]).getProperties().get("Alias"), nextsTab))

-                nextsToFollow.add(outEdges[i]);

+        for (DirectedEdge outEdge : outEdges) {

+            if (isInTable((String)((Next)outEdge).getProperties().get("Alias"), nextsTab))

+                nextsToFollow.add(outEdge);

         }

 //        Logger.debug(0, getID()+" following "+nexts);

         if (nextsToFollow.size() != 1)

             throw new ScriptingEngineException("not good number of active next");

-            

+

         followNext((Next)nextsToFollow.get(0), agent);

-        

+

     }

-    

+

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

         activeNext.getTerminusVertex().run(agent);

     }