From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 16:08:49 +0200
Subject: Last bit of cleanup honest New castor and dependent commons libs

---
 source/com/c2kernel/gui/data/NodeCollection.java | 8 ++++----
 source/com/c2kernel/gui/data/NodeContext.java    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'source/com/c2kernel/gui/data')

diff --git a/source/com/c2kernel/gui/data/NodeCollection.java b/source/com/c2kernel/gui/data/NodeCollection.java
index f55f8cd..ceee16f 100644
--- a/source/com/c2kernel/gui/data/NodeCollection.java
+++ b/source/com/c2kernel/gui/data/NodeCollection.java
@@ -16,7 +16,7 @@ import com.c2kernel.utils.Logger;
 public class NodeCollection extends Node {
 
     ItemProxy parent;
-    Parent2ChildCollection<?> thisCollection;
+    Parent2ChildCollection<CollectionMember> thisCollection;
     String path;
 
     public NodeCollection(ItemProxy parent, String name, EntityTabManager desktop) {
@@ -32,7 +32,7 @@ public class NodeCollection extends Node {
 	public void loadChildren() {
         Logger.msg(8, "NodeCollection::loadChildren()");
         try {
-            thisCollection = (Parent2ChildCollection<?>)parent.getObject("Collection/"+name);
+            thisCollection = (Parent2ChildCollection<CollectionMember>)parent.getObject("Collection/"+name);
         } catch (ObjectNotFoundException ex) {
             end(false);
             return;
@@ -41,10 +41,10 @@ public class NodeCollection extends Node {
         this.type = thisCollection.getClass().getName();
         int lastDot = this.type.lastIndexOf('.');
         if (lastDot > -1) this.type = this.type.substring(lastDot+1);
-        ArrayList<?> collectionMembers = thisCollection.getMembers().list;
+        ArrayList<CollectionMember> collectionMembers = thisCollection.getMembers().list;
         for (int i=0; i<collectionMembers.size(); i++)
         {
-			CollectionMember aMember = (CollectionMember)collectionMembers.get(i);
+			CollectionMember aMember = collectionMembers.get(i);
             if (aMember!=null)
                 try
                 {
diff --git a/source/com/c2kernel/gui/data/NodeContext.java b/source/com/c2kernel/gui/data/NodeContext.java
index 9240af4..ded3dd4 100644
--- a/source/com/c2kernel/gui/data/NodeContext.java
+++ b/source/com/c2kernel/gui/data/NodeContext.java
@@ -11,7 +11,7 @@ import com.c2kernel.utils.Logger;
 
 
 public class NodeContext extends Node implements DomainPathSubscriber {
-    Enumeration<?> children;
+    Enumeration<? extends Path> children;
 
     public NodeContext(Path path, EntityTabManager desktop) {
         super(path, desktop);
@@ -31,7 +31,7 @@ public class NodeContext extends Node implements DomainPathSubscriber {
 
         int batch = 75;
         while (children.hasMoreElements() && batch > 0) {
-            Path newPath = (Path)children.nextElement();
+            Path newPath = children.nextElement();
             if (newPath == null) break;
             Logger.msg(2, "Subscription.run() - new node: " + newPath );
             add( newNode(newPath));
-- 
cgit v1.2.3