Tweak Admin predef step restriction. Set correct activity property.

Closes #152
Fix nulls in exceptions

8 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
index 064bd4d..4763a05 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java
@@ -148,7 +148,7 @@ public class Activity extends WfVertex
 			if (requestData != null && requestData.length()>0)

 				storeOutcome = true;

 			else if (transition.getOutcome().isRequired()) 

-				throw new InvalidDataException("Transition requires outcome data, but none was given", null);

+				throw new InvalidDataException("Transition requires outcome data, but none was given", "");

 		}

 		

 		// Get new state

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
index 989817c..8416820 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddC2KObject.java
@@ -30,7 +30,7 @@ public class AddC2KObject extends PredefinedStep
     public AddC2KObject()

     {

         super();

-        getProperties().put("AgentRole", "Admin");

+        getProperties().put("Agent Role", "Admin");

     }

 

 	//requestdata is xmlstring

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
index 0ed6e07..e38f71d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java
@@ -39,7 +39,6 @@ public class AddNewSlot extends PredefinedStep
     public AddNewSlot()

     {

         super();

-        getProperties().put("AgentRole", "Admin");

     }

 

 

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
index 45afde9..30d014c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
@@ -15,7 +15,6 @@ public class AddStepsFromDescription extends PredefinedStep
 	public AddStepsFromDescription()

 	{

 		super();

-		getProperties().put("AgentRole", "Admin");

 	}

 

 	@Override

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
index 20c9fb7..305128b 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/Erase.java
@@ -36,6 +36,7 @@ public class Erase extends PredefinedStep
     public Erase()

     {

         super();

+        getProperties().put("Agent Role", "Admin");

     }

 

 	//requestdata is xmlstring

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
index df78daa..44d4c5d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveC2KObject.java
@@ -29,7 +29,7 @@ public class RemoveC2KObject extends PredefinedStep
     public RemoveC2KObject()

     {

         super();

-        getProperties().put("AgentRole", "Admin");

+        getProperties().put("Agent Role", "Admin");

     }

 

 	//requestdata is xmlstring

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
index b9639a4..2163d4c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
@@ -14,7 +14,7 @@ public class ReplaceDomainWorkflow extends PredefinedStep
 	public ReplaceDomainWorkflow()

 	{

 		super();

-		getProperties().put("AgentRole", "Admin");

+		getProperties().put("Agent Role", "Admin");

 	}

 

 	@Override

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
index 704f2bf..455ab2d 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
@@ -205,7 +205,7 @@ public class Transition implements Serializable {
 		// Decide the access

 		if (isOwned && !override && !isOwner) 

 			throw new AccessRightsException("Agent '"+agent.getAgentName()

-					+"' cannot perform this transition because the activity '"+act.getName()+"' is currently owned by "+agentName, null);

+					+"' cannot perform this transition because the activity '"+act.getName()+"' is currently owned by "+agentName, "");

 		

 		if (role != null) {

 			if (agent.hasRole(role))

@@ -214,7 +214,7 @@ public class Transition implements Serializable {
 				return "Admin";

 			else

 				throw new AccessRightsException("Agent '"+agent.getAgentName()

-						+"' does not hold a suitable role '"+role.getName()+"' for the activity "+act.getName(), null);

+						+"' does not hold a suitable role '"+role.getName()+"' for the activity "+act.getName(), "");

 		}

 		else

 			return null;