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/entity/agent/Job.java | 2 +- src/main/java/com/c2kernel/entity/imports/ImportAgent.java | 2 +- src/main/java/com/c2kernel/entity/imports/ImportAggregation.java | 6 ++---- src/main/java/com/c2kernel/entity/imports/ImportDependency.java | 4 +--- src/main/java/com/c2kernel/entity/transfer/TransferItem.java | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) (limited to 'src/main/java/com/c2kernel/entity') diff --git a/src/main/java/com/c2kernel/entity/agent/Job.java b/src/main/java/com/c2kernel/entity/agent/Job.java index 97f8eef..0c62bb1 100644 --- a/src/main/java/com/c2kernel/entity/agent/Job.java +++ b/src/main/java/com/c2kernel/entity/agent/Job.java @@ -133,7 +133,7 @@ public class Job 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/entity/imports/ImportAgent.java b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java index 2bbd307..52546a6 100644 --- a/src/main/java/com/c2kernel/entity/imports/ImportAgent.java +++ b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java @@ -64,7 +64,7 @@ public class ImportAgent extends ModuleImport implements java.io.Serializable { AgentPath existAgent = Gateway.getLookup().getAgentPath(name); itemPath = existAgent; } catch (ObjectNotFoundException ex) { - itemPath = new AgentPath(name); + itemPath = new AgentPath(new ItemPath(), name); } } return itemPath; diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java b/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java index 2d8f0a2..46cb0b6 100644 --- a/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java +++ b/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java @@ -36,7 +36,7 @@ public class ImportAggregation implements java.io.Serializable { if (thisMem.itemDescriptionPath != null && thisMem.itemDescriptionPath.length()>0) { ItemPath itemPath; try { - itemPath = ItemPath.fromUUIDString(thisMem.itemDescriptionPath); + itemPath = new ItemPath(thisMem.itemDescriptionPath); } catch (InvalidItemPathException ex) { itemPath = new DomainPath(thisMem.itemDescriptionPath).getItemPath(); } @@ -50,12 +50,10 @@ public class ImportAggregation implements java.io.Serializable { if (thisMem.itemPath != null && thisMem.itemPath.length()>0) { ItemPath itemPath; try { - itemPath = ItemPath.fromUUIDString(thisMem.itemPath); + itemPath = new ItemPath(thisMem.itemPath); } catch (InvalidItemPathException ex) { itemPath = new DomainPath(thisMem.itemPath).getItemPath(); } - if (itemPath == null) - throw new MembershipException("Cannot find "+thisMem.itemPath+" specified for collection."); newAgg.addMember(itemPath, thisMem.props, classProps.toString(), new GraphPoint(thisMem.geometry.x, thisMem.geometry.y), thisMem.geometry.width, thisMem.geometry.height); } } diff --git a/src/main/java/com/c2kernel/entity/imports/ImportDependency.java b/src/main/java/com/c2kernel/entity/imports/ImportDependency.java index 87e6b11..3fafd6f 100644 --- a/src/main/java/com/c2kernel/entity/imports/ImportDependency.java +++ b/src/main/java/com/c2kernel/entity/imports/ImportDependency.java @@ -58,13 +58,11 @@ public class ImportDependency implements java.io.Serializable { for (ImportDependencyMember thisMem : dependencyMemberList) { ItemPath itemPath; try { - itemPath = ItemPath.fromUUIDString(thisMem.itemPath); + itemPath = new ItemPath(thisMem.itemPath); } catch (InvalidItemPathException ex) { itemPath = new DomainPath(thisMem.itemPath).getItemPath(); } - if (itemPath == null) - throw new MembershipException("Cannot find "+thisMem.itemPath+" specified for collection."); com.c2kernel.collection.DependencyMember newDepMem = newDep.addMember(itemPath); newDepMem.getProperties().putAll(thisMem.props); } diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java index 4ec8953..d1379cf 100644 --- a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java +++ b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java @@ -57,7 +57,7 @@ public class TransferItem { public void setUUID( String uuid ) throws InvalidItemPathException { - itemPath = ItemPath.fromUUIDString(uuid); + itemPath = new ItemPath(uuid); } public String getUUID() { -- cgit v1.2.3