From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Thu, 4 Aug 2011 00:42:34 +0200
Subject: More code cleanup: Refactored Entity Proxy Subscription to handle
 generics better Rewrote RemoteMap to use TreeMap instead of the internal
 array for order. It now sorts its keys by number if they parse, else as
 strings. Removed a no-longer-in-progress outcome form class

---
 source/com/c2kernel/gui/data/NodeCollection.java | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/gui/data/NodeCollection.java

(limited to 'source/com/c2kernel/gui/data/NodeCollection.java')

diff --git a/source/com/c2kernel/gui/data/NodeCollection.java b/source/com/c2kernel/gui/data/NodeCollection.java
old mode 100755
new mode 100644
index 3b02098..f55f8cd
--- 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<?> thisCollection;
     String path;
 
     public NodeCollection(ItemProxy parent, String name, EntityTabManager desktop) {
@@ -28,19 +28,20 @@ public class NodeCollection extends Node {
         this.makeExpandable();
     }
 
-    public void loadChildren() {
+    @Override
+	public void loadChildren() {
         Logger.msg(8, "NodeCollection::loadChildren()");
         try {
-            thisCollection = (Parent2ChildCollection)parent.getObject("Collection/"+name);
+            thisCollection = (Parent2ChildCollection<?>)parent.getObject("Collection/"+name);
         } catch (ObjectNotFoundException ex) {
             end(false);
-            return;            
+            return;
         }
-            
+
         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<?> collectionMembers = thisCollection.getMembers().list;
         for (int i=0; i<collectionMembers.size(); i++)
         {
 			CollectionMember aMember = (CollectionMember)collectionMembers.get(i);
@@ -59,8 +60,9 @@ public class NodeCollection extends Node {
         end(false);
 
     }
-       
-    public DefaultMutableTreeNode getTreeNode() {
+
+    @Override
+	public DefaultMutableTreeNode getTreeNode() {
         return treeNode;
     }
 }
-- 
cgit v1.2.3