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

1 files changed, 15 insertions, 13 deletions

diff --git a/source/com/c2kernel/gui/data/NodeItem.java b/source/com/c2kernel/gui/data/NodeItem.java
index 84cba97..30f7ce3 100644
--- a/source/com/c2kernel/gui/data/NodeItem.java
+++ b/source/com/c2kernel/gui/data/NodeItem.java
@@ -3,7 +3,6 @@ package com.c2kernel.gui.data;
 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

 import java.util.ArrayList;

-import java.util.Iterator;

 import java.util.StringTokenizer;

 

 import javax.swing.JMenuItem;

@@ -31,10 +30,11 @@ public class NodeItem extends NodeEntity {
 			makeExpandable();

 		} catch (Exception e) {

 			Logger.error(e);

-		} 

+		}

     }

 

-    public void loadChildren() {

+    @Override

+	public void loadChildren() {

         try {

             String collections = myEntity.queryData("Collection/all");

             StringTokenizer tok = new StringTokenizer(collections, ",");

@@ -47,16 +47,16 @@ public class NodeItem extends NodeEntity {
             Logger.error(e);

         }

     }

-    

+

+	@Override

 	public JPopupMenu getPopupMenu() {

 		JPopupMenu popup = super.getPopupMenu();

 		popup.addSeparator();

 		try {

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

+            ArrayList<Job> jobList = ((ItemProxy)myEntity).getJobList(MainFrame.userAgent);

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

 			if (jobList.size() > 0) {

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

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

+	            for (Job thisJob : jobList) {

 	                String stepName = thisJob.getStepName();

 					if (already.contains(stepName))

 						continue;

@@ -64,12 +64,13 @@ public class NodeItem extends NodeEntity {
 					JMenuItem menuItem = new JMenuItem(stepName);

 					menuItem.setActionCommand(stepName);

 					menuItem.addActionListener(new ActionListener() {

-                        public void actionPerformed(ActionEvent e) {

+                        @Override

+						public void actionPerformed(ActionEvent e) {

                             execute(e.getActionCommand());

                         }

                     });

 					popup.add(menuItem);

-					

+

 				}

 			}

             else {

@@ -85,13 +86,14 @@ public class NodeItem extends NodeEntity {
 

 		return popup;

 	}

-    

+

 	public void execute(String stepName) {

 		EntityDetails thisDetail = desktop.add(this);

 		thisDetail.runCommand("Execution", stepName);

 	}

 

-    public ArrayList<String> getTabs() {

+    @Override

+	public ArrayList<String> getTabs() {

 

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

         requiredTabs.add("Properties");

@@ -99,12 +101,12 @@ public class NodeItem extends NodeEntity {
             String collNames = myEntity.queryData(ClusterStorage.COLLECTION+"/all");

             if (collNames.length() > 0)

                 requiredTabs.add("Collection");

-        } catch (Exception e) { } 

+        } catch (Exception e) { }

         requiredTabs.add("Execution");

         requiredTabs.add("History");

         requiredTabs.add("Viewpoint");

         requiredTabs.add("Workflow");

         return requiredTabs;

-      

+

     }

 }