From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: 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

---
 source/com/c2kernel/lifecycle/instance/Join.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'source/com/c2kernel/lifecycle/instance/Join.java')

diff --git a/source/com/c2kernel/lifecycle/instance/Join.java b/source/com/c2kernel/lifecycle/instance/Join.java
index b61100e..3a4fd7d 100644
--- a/source/com/c2kernel/lifecycle/instance/Join.java
+++ b/source/com/c2kernel/lifecycle/instance/Join.java
@@ -26,6 +26,7 @@ public class Join extends WfVertex
 	/**
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#runNext()
 	 */
+	@Override
 	public void runNext(AgentPath agent) throws ScriptingEngineException
 	{
 		AdvancementCalculator adv = new AdvancementCalculator();
@@ -44,7 +45,7 @@ public class Join extends WfVertex
 	}
 	/**
 	 * Method addNext.
-	 * 
+	 *
 	 * @param idNext
 	 */
 	public void addNext(String idNext)
@@ -54,6 +55,7 @@ public class Join extends WfVertex
 	/**
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#reinit(int)
 	 */
+	@Override
 	public void reinit(int idLoop)
 	{
 		Vertex[] outVertices = getOutGraphables();
@@ -65,7 +67,7 @@ public class Join extends WfVertex
 	}
 	/**
 	 * Method getItemSystemKey.
-	 * 
+	 *
 	 * @return String
 	 */
 	/*
@@ -77,7 +79,7 @@ public class Join extends WfVertex
 	}
 	/**
 	 * Method setItemSystemKey.
-	 * 
+	 *
 	 * @param itemSystemKey
 	 */
 	public void setItemSystemKey(String itemSystemKey)
@@ -90,6 +92,7 @@ public class Join extends WfVertex
 	//    public void initItemSystemKey(String systemKey) {
 	//        this.setItemSystemKey(systemKey);
 	//    }
+	@Override
 	public boolean verify()
 	{
 		mErrors.removeAllElements();
@@ -153,16 +156,18 @@ public class Join extends WfVertex
 	/**
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#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()
 	 */
+	@Override
 	public void run(AgentPath agent) throws ScriptingEngineException
 	{
 		runNext(agent);
@@ -170,6 +175,7 @@ public class Join extends WfVertex
 	/**
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#addNext(com.c2kernel.lifecycle.instance.WfVertex)
 	 */
+	@Override
 	public Next addNext(WfVertex vertex)
 	{
 		return new Next(this, vertex);
@@ -177,6 +183,7 @@ public class Join extends WfVertex
 	/**
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#loop()
 	 */
+	@Override
 	public boolean loop()
 	{
 		boolean loop2 = false;
@@ -191,15 +198,17 @@ public class Join extends WfVertex
 		loopTested = false;
 		return loop2;
 	}
+	@Override
 	public void runfirst(AgentPath agent) throws ScriptingEngineException
 	{
 		runNext(agent);
 	}
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see com.c2kernel.graph.model.Vertex#isJoin()
 	 */
+	@Override
 	public boolean isJoin()
 	{
 		return true;
-- 
cgit v1.2.3