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.

---
 src/main/java/com/c2kernel/gui/tree/Node.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/gui/tree/Node.java b/src/main/java/com/c2kernel/gui/tree/Node.java
index 62e9d19..eb4ebb2 100644
--- a/src/main/java/com/c2kernel/gui/tree/Node.java
+++ b/src/main/java/com/c2kernel/gui/tree/Node.java
@@ -13,9 +13,10 @@ import javax.swing.tree.DefaultMutableTreeNode;
 
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.gui.DynamicTreeBuilder;
-import com.c2kernel.gui.ItemTabManager;
 import com.c2kernel.gui.ImageLoader;
+import com.c2kernel.gui.ItemTabManager;
 import com.c2kernel.lookup.AgentPath;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.lookup.Path;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.Language;
@@ -26,7 +27,7 @@ public abstract class Node implements Runnable {
     protected Path binding;
     protected DefaultMutableTreeNode treeNode;
     protected String name; // domain key
-    protected int sysKey; // target item
+    protected ItemPath itemPath; // target item
     // attributes
     protected String type = "";
     protected String toolTip = null;
@@ -52,7 +53,9 @@ public abstract class Node implements Runnable {
     public Node(Path path, ItemTabManager desktop) {
         this.binding = path;
         this.desktop = desktop;
-        this.sysKey = path.getSysKey();
+        try {
+			this.itemPath = path.getItemPath();
+		} catch (ObjectNotFoundException e) { }
         // get the name of this node (last path element)
         String[] pathComponents = path.getPath();
         if (pathComponents.length > 0)
@@ -68,7 +71,7 @@ public abstract class Node implements Runnable {
     public Node newNode(Path path)
     {
         try {
-            if (path.getEntity() instanceof AgentPath)
+            if (path.getItemPath() instanceof AgentPath)
                 return new NodeAgent(path, desktop);
             else
                 return new NodeItem(path, desktop);
@@ -184,7 +187,7 @@ public abstract class Node implements Runnable {
 
     // Getters and Setters
 
-    public int getSysKey() { return sysKey; }
+    public ItemPath getItemPath() { return itemPath; }
 //  public void setSysKey( int sysKey ) { this.sysKey = sysKey; }
 
     public String getName() { return name; }
-- 
cgit v1.2.3