1 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
index 47afc5f..3d624ee 100644
--- a/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
+++ b/src/main/java/com/c2kernel/gui/tree/NodeCollection.java
@@ -8,27 +8,27 @@ import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.CollectionMember;
 import com.c2kernel.collection.Dependency;
 import com.c2kernel.common.ObjectNotFoundException;
-import com.c2kernel.entity.proxy.EntityProxyObserver;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.entity.proxy.MemberSubscription;
-import com.c2kernel.gui.EntityTabManager;
+import com.c2kernel.entity.proxy.ProxyObserver;
+import com.c2kernel.gui.ItemTabManager;
 import com.c2kernel.gui.MainFrame;
-import com.c2kernel.lookup.EntityPath;
-import com.c2kernel.lookup.InvalidEntityPathException;
+import com.c2kernel.lookup.InvalidItemPathException;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.lookup.Path;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.utils.CastorHashMap;
 import com.c2kernel.utils.KeyValuePair;
 import com.c2kernel.utils.Logger;
 
-public class NodeCollection extends Node implements EntityProxyObserver<Collection<? extends CollectionMember>> {
+public class NodeCollection extends Node implements ProxyObserver<Collection<? extends CollectionMember>> {
 
     ItemProxy parent;
     Collection<? extends CollectionMember> thisCollection;
     String path;
 
-    public NodeCollection(ItemProxy parent, String name, EntityTabManager desktop) {
-    	this.desktop = desktop;
+    public NodeCollection(ItemProxy parent, String name, ItemTabManager desktop) {
+    	super(desktop);
         this.parent = parent;
         this.name = name;
         this.path = parent.getSystemKey()+"/Collection/"+name;
@@ -36,8 +36,8 @@ public class NodeCollection extends Node implements EntityProxyObserver<Collecti
         this.makeExpandable();
     }
     
-    public NodeCollection(ItemProxy parent, Collection<? extends CollectionMember> coll, EntityTabManager desktop) {
-    	this.desktop = desktop;
+    public NodeCollection(ItemProxy parent, Collection<? extends CollectionMember> coll, ItemTabManager desktop) {
+    	super(desktop);
         this.parent = parent;
         this.name = coll.getName();
         this.path = parent.getSystemKey()+"/Collection/"+name;
@@ -75,17 +75,17 @@ public class NodeCollection extends Node implements EntityProxyObserver<Collecti
         ArrayList<Path> currentPaths = new ArrayList<Path>();
         // add any missing paths
         for (CollectionMember newMember : newMembers) {
-            if (!oldMembers.contains(newMember) && newMember.getEntityKey()>-1)
+            if (!oldMembers.contains(newMember) && newMember.getSystemKey()>-1)
                 try
                 {
-                    EntityPath entityPath = new EntityPath(newMember.getEntityKey());
-                    currentPaths.add(entityPath);
-                    NodeItem newMemberNode = new NodeItem(entityPath, desktop);
+                    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 (InvalidEntityPathException ex)
+                catch (InvalidItemPathException ex)
                 {
                     Logger.error("NodeCollection::loadChildren() " + ex.toString());
                 }