From a7cefce58cdb0f7f2d0868a1d5ee2f24f3890646 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 22 Sep 2014 16:01:18 +0200 Subject: ItemPath.fromUUIDString unnecessary as ItemPath(String) supports both plain UUIDs and an /entity prefix. Tightened that up and removed the fromUUIDString method for a simpler API. Also switched AgentPath(String) to a path argument for consistency. New AgentPaths should be created with AgentPath(new ItemPath(), String) instead. --- src/main/java/com/c2kernel/lifecycle/instance/Workflow.java | 2 +- .../c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java | 2 +- .../java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java | 2 +- .../com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java | 2 +- .../lifecycle/instance/predefined/RemoveSlotFromCollection.java | 2 +- .../lifecycle/instance/predefined/agent/CreateAgentFromDescription.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle/instance') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java index 304c604..e3ae682 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java @@ -201,7 +201,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject public void setItemUUID( String uuid ) throws InvalidItemPathException { - setItemPath(ItemPath.fromUUIDString(uuid)); + setItemPath(new ItemPath(uuid)); } public String getItemUUID() { diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java index 76b6adf..f421b09 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddMemberToCollection.java @@ -64,7 +64,7 @@ public class AddMemberToCollection extends PredefinedStep if (Logger.doLog(3)) Logger.msg(3, "AddMemberToCollection: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params)); try { collName = params[0]; - newChild = ItemPath.fromUUIDString(params[1]); + newChild = new ItemPath(params[1]); if (params.length > 2) props = (CastorHashMap)Gateway.getMarshaller().unmarshall(params[2]); 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 58b1263..a482a43 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddNewSlot.java @@ -66,7 +66,7 @@ public class AddNewSlot extends PredefinedStep try { collName = params[0]; - if (params.length > 1 && params[1].length() > 0) descKey = ItemPath.fromUUIDString(params[1]); + if (params.length > 1 && params[1].length() > 0) descKey = new ItemPath(params[1]); } catch (Exception e) { throw new InvalidDataException("AddNewSlot: Invalid parameters "+Arrays.toString(params), ""); } diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java index 20ad473..71ab287 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AssignItemToSlot.java @@ -65,7 +65,7 @@ public class AssignItemToSlot extends PredefinedStep try { collName = params[0]; slotNo = Integer.parseInt(params[1]); - childItem = ItemPath.fromUUIDString(params[2]); + childItem = new ItemPath(params[2]); } catch (Exception e) { throw new InvalidDataException("AssignItemToSlot: Invalid parameters "+Arrays.toString(params), ""); } diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java index 26bf104..6196025 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/RemoveSlotFromCollection.java @@ -64,7 +64,7 @@ public class RemoveSlotFromCollection extends PredefinedStep try { collName = params[0]; if (params.length>1 && params[1].length()>0) slotNo = Integer.parseInt(params[1]); - if (params.length>2 && params[2].length()>0) currentChild = ItemPath.fromUUIDString(params[2]); + if (params.length>2 && params[2].length()>0) currentChild = new ItemPath(params[2]); } catch (Exception e) { throw new InvalidDataException("RemoveSlotFromCollection: Invalid parameters "+Arrays.toString(params), ""); } diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java index 7683143..088bee1 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java @@ -69,7 +69,7 @@ public class CreateAgentFromDescription extends CreateItemFromDescription // generate new entity key Logger.msg(6, "CreateItemFromDescription - Requesting new agent path"); - AgentPath newAgentPath = new AgentPath(newName); + AgentPath newAgentPath = new AgentPath(new ItemPath(), newName); // resolve the item factory Logger.msg(6, "CreateItemFromDescription - Resolving item factory"); -- cgit v1.2.3