From e99ed30f6cae36c5f3fa03007d991e67894a01bb Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 23 Jul 2013 09:41:43 +0200
Subject: More

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

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

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Join.java b/src/main/java/com/c2kernel/lifecycle/instance/Join.java
index 94f3086..b643ff8 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Join.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/Join.java
@@ -1,10 +1,10 @@
 package com.c2kernel.lifecycle.instance;
 import java.util.Vector;
 
+import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.graph.model.Vertex;
 import com.c2kernel.graph.traversal.GraphTraversal;
 import com.c2kernel.lookup.AgentPath;
-import com.c2kernel.scripting.ScriptingEngineException;
 /**
  * @version $Revision: 1.52 $ $Date: 2005/05/10 15:14:54 $
  * @author $Author: abranson $
@@ -24,10 +24,11 @@ public class Join extends WfVertex
 	public int counter = 0;
 
 	/**
+	 * @throws InvalidDataException 
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#runNext()
 	 */
 	@Override
-	public void runNext(AgentPath agent) throws ScriptingEngineException
+	public void runNext(AgentPath agent, int itemSysKey) throws InvalidDataException
 	{
 		AdvancementCalculator adv = new AdvancementCalculator();
 		adv.calculate((CompositeActivity) getParent());
@@ -37,10 +38,10 @@ public class Join extends WfVertex
 			if (outVertices.length > 0)
 			{
 				WfVertex nextAct = (WfVertex) outVertices[0];
-				nextAct.run(agent);
+				nextAct.run(agent, itemSysKey);
 			}
 			else
-				super.runNext(agent);
+				super.runNext(agent, itemSysKey);
 		}
 	}
 	/**
@@ -53,6 +54,7 @@ public class Join extends WfVertex
 		new Next(this, (WfVertex) getParent().search(idNext));
 	}
 	/**
+	 * @throws InvalidDataException 
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#reinit(int)
 	 */
 	@Override
@@ -139,12 +141,13 @@ public class Join extends WfVertex
 			return mErrors.elementAt(0);
 	}
 	/**
+	 * @throws InvalidDataException 
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#run()
 	 */
 	@Override
-	public void run(AgentPath agent) throws ScriptingEngineException
+	public void run(AgentPath agent, int itemSysKey) throws InvalidDataException
 	{
-		runNext(agent);
+		runNext(agent, itemSysKey);
 	}
 	/**
 	 * @see com.c2kernel.lifecycle.instance.WfVertex#addNext(com.c2kernel.lifecycle.instance.WfVertex)
@@ -173,9 +176,9 @@ public class Join extends WfVertex
 		return loop2;
 	}
 	@Override
-	public void runfirst(AgentPath agent) throws ScriptingEngineException
+	public void runFirst(AgentPath agent, int itemSysKey) throws InvalidDataException
 	{
-		runNext(agent);
+		runNext(agent, itemSysKey);
 	}
 	/*
 	 * (non-Javadoc)
-- 
cgit v1.2.3