From 4fb2c8d2a573b2078a3ced1c6142de3a20cfa660 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 6 Mar 2014 16:27:08 +0100
Subject: Fixes #166 Also allows multiple errors in each node, and composites
 collect the errors of their children.

---
 .../com/c2kernel/lifecycle/ActivitySlotDef.java    | 47 ++++++++++++++--------
 .../java/com/c2kernel/lifecycle/WfVertexDef.java   | 12 +++++-
 2 files changed, 40 insertions(+), 19 deletions(-)

(limited to 'src/main/java/com/c2kernel')

diff --git a/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java b/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java
index 514dc72..85c942f 100644
--- a/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java
+++ b/src/main/java/com/c2kernel/lifecycle/ActivitySlotDef.java
@@ -65,17 +65,17 @@ public class ActivitySlotDef extends WfVertexDef
 			mErrors.add("Unreachable");
 			err = false;
 		}
-		else if (nbInEdgres > 1)
+		if (nbInEdgres > 1)
 		{
 			mErrors.add("Bad nb of previous");
 			err = false;
 		}
-		else if (nbOutEdges > 1)
+		if (nbOutEdges > 1)
 		{
 			mErrors.add("too many next");
 			err = false;
 		}
-		else if (nbOutEdges == 0)
+		if (nbOutEdges == 0)
 		{
 			if (!((CompositeActivityDef) getParent()).hasGoodNumberOfActivity())
 			{
@@ -83,22 +83,35 @@ public class ActivitySlotDef extends WfVertexDef
 				err = false;
 			}
 		}
-		else
-		{
-			Vertex[] outV = getOutGraphables();
-			Vertex[] anteVertices = GraphTraversal.getTraversal(getParent().getChildrenGraphModel(), this, GraphTraversal.kUp, false);
-			boolean errInLoop = false;
-			for (Vertex element : outV) {
-				for (Vertex anteVertice : anteVertices)
-					if (!loop() && element.getID() == anteVertice.getID())
-						errInLoop = true;
-			}
-			if (errInLoop)
-			{
-				mErrors.add("Problem in Loop");
-				err = false;
+		
+		Vertex[] allSiblings = getParent().getChildGraphModel().getVertices();
+		String thisName = (String)getProperties().get("Name");
+		if (thisName == null || thisName.length()==0) mErrors.add("Slot name is empty");
+		else for (Vertex v : allSiblings) {
+			if (v instanceof ActivitySlotDef && v.getID()!=getID()) {
+				ActivitySlotDef otherSlot = (ActivitySlotDef)v;
+				String otherName = (String)otherSlot.getProperties().get("Name");
+				if (otherName != null && otherName.equals(thisName)) {
+					mErrors.add("Duplicate slot name");
+					err = false;
+				}
 			}
 		}
+
+		// Loop check
+		Vertex[] outV = getOutGraphables();
+		Vertex[] anteVertices = GraphTraversal.getTraversal(getParent().getChildrenGraphModel(), this, GraphTraversal.kUp, false);
+		boolean errInLoop = false;
+		for (Vertex element : outV) {
+			for (Vertex anteVertice : anteVertices)
+				if (!loop() && element.getID() == anteVertice.getID())
+					errInLoop = true;
+		}
+		if (errInLoop)
+		{
+			mErrors.add("Problem in Loop");
+			err = false;
+		}
 		return err;
 	}
 	/**
diff --git a/src/main/java/com/c2kernel/lifecycle/WfVertexDef.java b/src/main/java/com/c2kernel/lifecycle/WfVertexDef.java
index 6a46bee..b2bd306 100644
--- a/src/main/java/com/c2kernel/lifecycle/WfVertexDef.java
+++ b/src/main/java/com/c2kernel/lifecycle/WfVertexDef.java
@@ -59,8 +59,16 @@ public abstract class WfVertexDef extends GraphableVertex
     {
         if (mErrors.size() == 0)
             return "No error";
-        else
-            return mErrors.elementAt(0);
+        else if (mErrors.size() == 1)
+        	return mErrors.elementAt(0);
+        else {
+        	StringBuffer errorBuffer = new StringBuffer();
+        	for (String error : mErrors) {
+        		if (errorBuffer.length() > 0) errorBuffer.append("\n");
+				errorBuffer.append(error);
+			}
+            return errorBuffer.toString();
+        }
     }
 
     /**
-- 
cgit v1.2.3