From da731d2bb81666b9c697d9099da632e7dfcdc0f7 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Tue, 9 Sep 2014 12:13:21 +0200 Subject: Replaced int sysKey Item identifier with UUID, which is now portable. ItemPath objects are now used to identify Items throughout the kernel, replacing ints and Integers. --- src/main/java/com/c2kernel/collection/Dependency.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/c2kernel/collection/Dependency.java') diff --git a/src/main/java/com/c2kernel/collection/Dependency.java b/src/main/java/com/c2kernel/collection/Dependency.java index 4fb4f70..11ef16e 100644 --- a/src/main/java/com/c2kernel/collection/Dependency.java +++ b/src/main/java/com/c2kernel/collection/Dependency.java @@ -1,6 +1,7 @@ package com.c2kernel.collection; +import com.c2kernel.lookup.ItemPath; import com.c2kernel.utils.CastorHashMap; import com.c2kernel.utils.KeyValuePair; import com.c2kernel.utils.Logger; @@ -57,7 +58,7 @@ public class Dependency extends Parent2ChildCollection } @Override - public DependencyMember addMember(int sysKey) throws MembershipException { + public DependencyMember addMember(ItemPath itemPath) throws MembershipException { // create member object DependencyMember depMember = new DependencyMember(); depMember.setID(getCounter()); @@ -65,14 +66,14 @@ public class Dependency extends Parent2ChildCollection depMember.setClassProps(mClassProps); // assign entity - depMember.assignItem(sysKey); + depMember.assignItem(itemPath); mMembers.list.add(depMember); - Logger.msg(8, "Dependency::addMember(" + sysKey + ") added to children."); + Logger.msg(8, "Dependency::addMember(" + itemPath + ") added to children."); return depMember; } @Override - public DependencyMember addMember(int sysKey, CastorHashMap props, String classProps) + public DependencyMember addMember(ItemPath itemPath, CastorHashMap props, String classProps) throws MembershipException { if (classProps != null && !classProps.equals(mClassProps)) @@ -97,9 +98,9 @@ public class Dependency extends Parent2ChildCollection depMember.setClassProps(mClassProps); // assign entity - depMember.assignItem(sysKey); + depMember.assignItem(itemPath); mMembers.list.add(depMember); - Logger.msg(8, "Dependency::addMember(" + sysKey + ") added to children."); + Logger.msg(8, "Dependency::addMember(" + itemPath + ") added to children."); return depMember; } -- cgit v1.2.3