Finished move to generics. Enforced 1.6 compliance for now. No errors or

warnings :)

4 files changed, 9 insertions, 9 deletions

diff --git a/source/com/c2kernel/gui/data/Node.java b/source/com/c2kernel/gui/data/Node.java
index b82ee92..79eb3ad 100755..100644
--- a/source/com/c2kernel/gui/data/Node.java
+++ b/source/com/c2kernel/gui/data/Node.java
@@ -31,8 +31,8 @@ public abstract class Node implements Runnable {
     protected String type = "";

     protected Icon icon;

     protected boolean isExpandable = false;

-    protected HashMap childNodes = new HashMap();

-    protected ArrayList subscribers = new ArrayList();

+    protected HashMap<Path, Node> childNodes = new HashMap<Path, Node>();

+    protected ArrayList<NodeSubscriber> subscribers = new ArrayList<NodeSubscriber>();

     protected DynamicTreeBuilder loader = null;

     private boolean loaded = false;

     private String iconName;

diff --git a/source/com/c2kernel/gui/data/NodeAgent.java b/source/com/c2kernel/gui/data/NodeAgent.java
index 9ef738a..138b576 100755..100644
--- a/source/com/c2kernel/gui/data/NodeAgent.java
+++ b/source/com/c2kernel/gui/data/NodeAgent.java
@@ -21,9 +21,9 @@ public class NodeAgent extends NodeEntity {
     public void loadChildren() {

     }

     

-    public ArrayList getTabs() {

+    public ArrayList<String> getTabs() {

 

-        ArrayList requiredTabs = super.getTabs();

+        ArrayList<String> requiredTabs = super.getTabs();

         requiredTabs.add("AgentProperties");

         requiredTabs.add("JobList");

         return requiredTabs;   

diff --git a/source/com/c2kernel/gui/data/NodeEntity.java b/source/com/c2kernel/gui/data/NodeEntity.java
index adff241..8c05afd 100755..100644
--- a/source/com/c2kernel/gui/data/NodeEntity.java
+++ b/source/com/c2kernel/gui/data/NodeEntity.java
@@ -73,8 +73,8 @@ public abstract class NodeEntity extends Node {
         desktop.add(this);

     }

     

-    public ArrayList getTabs() {

-        ArrayList requiredTabs = new ArrayList();

+    public ArrayList<String> getTabs() {

+        ArrayList<String> requiredTabs = new ArrayList<String>();

         return requiredTabs;

     }

 }

diff --git a/source/com/c2kernel/gui/data/NodeItem.java b/source/com/c2kernel/gui/data/NodeItem.java
index 410f13a..84cba97 100755..100644
--- a/source/com/c2kernel/gui/data/NodeItem.java
+++ b/source/com/c2kernel/gui/data/NodeItem.java
@@ -53,7 +53,7 @@ public class NodeItem extends NodeEntity {
 		popup.addSeparator();

 		try {

             ArrayList jobList = ((ItemProxy)myEntity).getJobList(MainFrame.userAgent);

-            ArrayList already = new ArrayList();

+            ArrayList<String> already = new ArrayList<String>();

 			if (jobList.size() > 0) {

 	            for (Iterator e = jobList.iterator(); e.hasNext();) {

 	                Job thisJob = (Job)e.next();

@@ -91,9 +91,9 @@ public class NodeItem extends NodeEntity {
 		thisDetail.runCommand("Execution", stepName);

 	}

 

-    public ArrayList getTabs() {

+    public ArrayList<String> getTabs() {

 

-        ArrayList requiredTabs = super.getTabs();

+        ArrayList<String> requiredTabs = super.getTabs();

         requiredTabs.add("Properties");

         try {

             String collNames = myEntity.queryData(ClusterStorage.COLLECTION+"/all");