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, 24 insertions, 16 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/Split.java b/source/com/c2kernel/lifecycle/instance/Split.java
index e7b275c..4fe1bfc 100644
--- a/source/com/c2kernel/lifecycle/instance/Split.java
+++ b/source/com/c2kernel/lifecycle/instance/Split.java
@@ -32,11 +32,12 @@ public abstract class Split extends WfVertex
     /**

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

      */

-    public abstract void runNext(AgentPath agent) throws ScriptingEngineException;

+    @Override

+	public abstract void runNext(AgentPath agent) throws ScriptingEngineException;

 

     /**

      * Method addNext.

-     * 

+     *

      * @param idNext

      */

     void addNext(String idNext)

@@ -47,7 +48,8 @@ public abstract class Split extends WfVertex
     /**

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

      */

-    public Next addNext(WfVertex vertex)

+    @Override

+	public Next addNext(WfVertex vertex)

     {

         Next nxt = new Next(this, vertex);

         int num = getOutGraphables().length;

@@ -64,7 +66,7 @@ public abstract class Split extends WfVertex
 

     /**

      * Method getItemSystemKey.

-     * 

+     *

      * @return int

      */

     public int getItemSystemKey()

@@ -74,7 +76,7 @@ public abstract class Split extends WfVertex
 

     /**

      * Method setItemSystemKey.

-     * 

+     *

      * @param itemSystemKey

      */

     public void setItemSystemKey(int itemSystemKey)

@@ -88,17 +90,19 @@ public abstract class Split extends WfVertex
     //    public void initItemSystemKey(String systemKey) {

     //        setItemSystemKey(systemKey);

     //    }

-    public void reinit(int idLoop)

+    @Override

+	public void reinit(int idLoop)

     {

         Vertex[] outVertices = getOutGraphables();

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

-            ((WfVertex) outVertices[i]).reinit(idLoop);

+        for (Vertex outVertice : outVertices)

+			((WfVertex) outVertice).reinit(idLoop);

     }

 

     /**

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

      */

-    public boolean verify()

+    @Override

+	public boolean verify()

     {

         mErrors.removeAllElements();

         int nbInEdgres = getParent().getChildrenGraphModel().getInEdges(this).length;

@@ -151,18 +155,20 @@ public abstract class Split extends WfVertex
     /**

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

      */

-    public String getErrors()

+    @Override

+	public String getErrors()

     {

         if (mErrors.size() == 0)

             return "No error";

         else

-            return (String) mErrors.elementAt(0);

+            return mErrors.elementAt(0);

     }

 

     /**

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

      */

-    public void run(AgentPath agent) throws ScriptingEngineException

+    @Override

+	public void run(AgentPath agent) throws ScriptingEngineException

     {

         runNext(agent);

     }

@@ -170,7 +176,8 @@ public abstract class Split extends WfVertex
     /**

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

      */

-    public boolean loop()

+    @Override

+	public boolean loop()

     {

         boolean loop2 = false;

         if (!loopTested)

@@ -203,13 +210,14 @@ public abstract class Split extends WfVertex
     {

         if (test == null)

             return false;

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

-            if (test.equals(list[i]))

+        for (String element : list)

+			if (test.equals(element))

                 return true;

         return false;

     }

 

-    public void runfirst(AgentPath agent) throws ScriptingEngineException

+    @Override

+	public void runfirst(AgentPath agent) throws ScriptingEngineException

     {

         runNext(agent);

     }