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, 32 insertions, 16 deletions

diff --git a/source/com/c2kernel/gui/TreeBrowser.java b/source/com/c2kernel/gui/TreeBrowser.java
index ccee681..72cf738 100755..100644
--- a/source/com/c2kernel/gui/TreeBrowser.java
+++ b/source/com/c2kernel/gui/TreeBrowser.java
@@ -5,10 +5,19 @@ import java.awt.Dimension;
 import java.awt.event.MouseAdapter;

 import java.awt.event.MouseEvent;

 

-import javax.swing.*;

+import javax.swing.ImageIcon;

+import javax.swing.JOptionPane;

+import javax.swing.JPanel;

+import javax.swing.JScrollPane;

+import javax.swing.JTree;

+import javax.swing.ToolTipManager;

 import javax.swing.event.TreeExpansionEvent;

 import javax.swing.event.TreeExpansionListener;

-import javax.swing.tree.*;

+import javax.swing.tree.DefaultMutableTreeNode;

+import javax.swing.tree.DefaultTreeCellRenderer;

+import javax.swing.tree.DefaultTreeModel;

+import javax.swing.tree.TreePath;

+import javax.swing.tree.TreeSelectionModel;

 

 import com.c2kernel.gui.data.Node;

 import com.c2kernel.gui.data.NodeEntity;

@@ -20,7 +29,7 @@ import com.c2kernel.utils.Logger;
  * @version $Revision: 1.31 $ $Date: 2006/01/17 07:49:44 $

  * @author  $Author: abranson $

  */

- 

+

  // must put in top level list of loaded items, so we don't have duplicates

 public class TreeBrowser extends JPanel implements DomainKeyConsumer

 {

@@ -39,10 +48,12 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer
         tree.setToggleClickCount(3); // need three clicks to expand a branch

         tree.addTreeExpansionListener(

             new TreeExpansionListener() {

-                public void treeCollapsed(TreeExpansionEvent e) {

+                @Override

+				public void treeCollapsed(TreeExpansionEvent e) {

                     //REVISIT: possible reaping here if things are getting heavy

                 }

-                public void treeExpanded(TreeExpansionEvent e) {

+                @Override

+				public void treeExpanded(TreeExpansionEvent e) {

                     TreePath p = e.getPath();

                     // find the clicked tree node

                     DefaultMutableTreeNode nodeClicked = (DefaultMutableTreeNode)p.getLastPathComponent();

@@ -71,7 +82,8 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer
         loading.start();

     }

 

-    public void push(DomainPath target) {

+    @Override

+	public void push(DomainPath target) {

     	Logger.debug("Opening tree node "+target);

         String[] components = target.getPath();

         Node currentNode = userRoot;

@@ -109,15 +121,16 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer
             MainFrame.status.setText("Done");

         }

     }

-    

-    public void push(String name) {

+

+    @Override

+	public void push(String name) {

     	// only interested in real paths

-        JOptionPane.showMessageDialog(null, "'"+name+"' was not found.", 

+        JOptionPane.showMessageDialog(null, "'"+name+"' was not found.",

             "No results", JOptionPane.INFORMATION_MESSAGE);

 

     }

-    

-    private void dumpPath(TreePath selPath, int logLevel) {

+

+    private static void dumpPath(TreePath selPath, int logLevel) {

         if (selPath == null) { Logger.msg(logLevel, "TreeBrowser.dumpPath() - selPath null"); return; }

         for (int i =0; i<selPath.getPath().length; i++)

             Logger.msg(logLevel, "TreeBrowser.dumpPath() - selPath "+i+" = "+selPath.getPath()[i]);

@@ -127,7 +140,8 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer
         public ItemRenderer() {

         }

 

-        public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf,

+        @Override

+		public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf,

             int row, boolean hasFocus) {

                 super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);

                 Object thisLeaf = ((DefaultMutableTreeNode)value).getUserObject();

@@ -146,9 +160,10 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer
                 return this;

         }

     }

-    

+

     private class TreeMouseListener extends MouseAdapter {

-    	public void mousePressed(MouseEvent e) {

+    	@Override

+		public void mousePressed(MouseEvent e) {

     		if (e.isPopupTrigger())

     			showPopup(e);

     		else {

@@ -168,7 +183,8 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer
                 }

     		}

     	}

-        public void mouseReleased(MouseEvent e) {

+        @Override

+		public void mouseReleased(MouseEvent e) {

             if (e.isPopupTrigger()) {

             	showPopup(e);

             }

@@ -190,7 +206,7 @@ public class TreeBrowser extends JPanel implements DomainKeyConsumer
                     source = nodeClicked.getUserObject(); // fetch its nodeItem

                 }

             catch (Exception ex) { } // Not a node that was clicked on

-            

+

             return source;

         }

     }