From 8e5d28aec9368c29acec858e9d748ed2ed5eb397 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Tue, 9 Sep 2014 12:14:01 +0200
Subject: Support move to using UUIDs and ItemPaths as Item identifiers instead
 of ints.

---
 .../java/com/c2kernel/gui/tree/NodeCollection.java | 31 +++++++++-------------
 1 file changed, 12 insertions(+), 19 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/tree/NodeCollection.java')

diff --git a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
index 3d624ee..7cd66b5 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
+++ b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
@@ -13,7 +13,6 @@ import com.c2kernel.entity.proxy.MemberSubscription;
 import com.c2kernel.entity.proxy.ProxyObserver;
 import com.c2kernel.gui.ItemTabManager;
 import com.c2kernel.gui.MainFrame;
-import com.c2kernel.lookup.InvalidItemPathException;
 import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.lookup.Path;
 import com.c2kernel.persistency.ClusterStorage;
@@ -31,7 +30,7 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e
     	super(desktop);
         this.parent = parent;
         this.name = name;
-        this.path = parent.getSystemKey()+"/Collection/"+name;
+        this.path = parent.getPath()+"/Collection/"+name;
         createTreeNode();
         this.makeExpandable();
     }
@@ -40,7 +39,7 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e
     	super(desktop);
         this.parent = parent;
         this.name = coll.getName();
-        this.path = parent.getSystemKey()+"/Collection/"+name;
+        this.path = parent.getPath()+"/Collection/"+name;
         createTreeNode();
         this.makeExpandable();
         add(coll);
@@ -75,20 +74,14 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e
         ArrayList<Path> currentPaths = new ArrayList<Path>();
         // add any missing paths
         for (CollectionMember newMember : newMembers) {
-            if (!oldMembers.contains(newMember) && newMember.getSystemKey()>-1)
-                try
-                {
-                    ItemPath itemPath = new ItemPath(newMember.getSystemKey());
-                    currentPaths.add(itemPath);
-                    NodeItem newMemberNode = new NodeItem(itemPath, desktop);
-                    newMemberNode.setCollection(contents, newMember.getID(), parent);
-                    newMemberNode.setToolTip(getPropertyToolTip(newMember.getProperties()));
-                    add(newMemberNode);
-                }
-                catch (InvalidItemPathException ex)
-                {
-                    Logger.error("NodeCollection::loadChildren() " + ex.toString());
-                }
+        	ItemPath itemPath = newMember.getItemPath();
+            if (!oldMembers.contains(newMember) && itemPath != null) {
+                currentPaths.add(itemPath);
+                NodeItem newMemberNode = new NodeItem(itemPath, desktop);
+                newMemberNode.setCollection(contents, newMember.getID(), parent);
+                newMemberNode.setToolTip(getPropertyToolTip(newMember.getProperties()));
+                add(newMemberNode);
+            }
         }
         // remove those no longer present
         for (Path childPath : childNodes.keySet()) {
@@ -104,9 +97,9 @@ public class NodeCollection extends Node implements ProxyObserver<Collection<? e
     	end(false);
     }
     
-    public boolean addMember(int syskey) {
+    public boolean addMember(ItemPath itemPath) {
     	if (!isDependency()) return false;
-    	String[] params = { thisCollection.getName(), String.valueOf(syskey) };
+    	String[] params = { thisCollection.getName(), itemPath.getUUID().toString() };
 		try {
 			MainFrame.userAgent.execute(parent, "AddMemberToCollection", params);
 			return true;
-- 
cgit v1.2.3