[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard/global GlobalDashboardChildren.java,1.6,1.7 GlobalDas
Brought to you by:
ghinkl
Menu
▾
▴
[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard/global GlobalDashboardChildren.java,1.6,1.7 GlobalDashboardNode.java,1.4,1.5 GlobalDashboardSetNode.java,1.3,1.4 OpenDashboardAction.java,1.6,1.7
|
From: Greg H. <gh...@us...> - 2004-04-07 15:40:39
|
Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22877/src/org/mc4j/console/dashboard/global Modified Files: GlobalDashboardChildren.java GlobalDashboardNode.java GlobalDashboardSetNode.java OpenDashboardAction.java Log Message: Made all nodes comparable and started using Children.SortedArray so that all nodes in the explorer are always sorted by their display names. Index: OpenDashboardAction.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/OpenDashboardAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OpenDashboardAction.java 7 Apr 2004 02:59:16 -0000 1.6 --- OpenDashboardAction.java 7 Apr 2004 15:27:36 -0000 1.7 *************** *** 20,24 **** package org.mc4j.console.dashboard.global; - import java.util.HashMap; import java.util.Map; --- 20,23 ---- *************** *** 71,74 **** --- 70,77 ---- } + protected boolean asynchronous() { + return true; + } + protected boolean enable(Node[] nodes) { // can only browse to one noce Index: GlobalDashboardSetNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/GlobalDashboardSetNode.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GlobalDashboardSetNode.java 7 Apr 2004 02:59:16 -0000 1.3 --- GlobalDashboardSetNode.java 7 Apr 2004 15:27:36 -0000 1.4 *************** *** 22,25 **** --- 22,26 ---- import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; + import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.NodeAction; *************** *** 27,31 **** import org.mc4j.console.Refreshable; - import org.mc4j.console.dashboard.DashboardManager; import org.mc4j.console.bean.RefreshAction; import org.mc4j.console.connection.ConnectionNode; --- 28,31 ---- *************** *** 39,43 **** * @version $Revision$($Author$ / $Date$) */ ! public class GlobalDashboardSetNode extends AbstractNode implements Refreshable { private ConnectionNode parentConnection; --- 39,43 ---- * @version $Revision$($Author$ / $Date$) */ ! public class GlobalDashboardSetNode extends AbstractNode implements Refreshable, Comparable { private ConnectionNode parentConnection; *************** *** 63,67 **** public GlobalDashboardSetNode(ConnectionNode parentConnection, String name) { ! super(new Children.Array()); this.parentConnection = parentConnection; setIconBase("org/mc4j/console/dashboard/global/GlobalDashboardSetIcon"); --- 63,67 ---- public GlobalDashboardSetNode(ConnectionNode parentConnection, String name) { ! super(new Children.SortedArray()); this.parentConnection = parentConnection; setIconBase("org/mc4j/console/dashboard/global/GlobalDashboardSetIcon"); *************** *** 69,73 **** setName(name); setDisplayName(name); - } --- 69,72 ---- *************** *** 95,98 **** --- 94,102 ---- } + public int compareTo(Object o) { + Node otherNode = (Node) o; + + return this.getDisplayName().compareTo(otherNode.getDisplayName()); + } } Index: GlobalDashboardChildren.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/GlobalDashboardChildren.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GlobalDashboardChildren.java 7 Apr 2004 02:59:16 -0000 1.6 --- GlobalDashboardChildren.java 7 Apr 2004 15:27:35 -0000 1.7 *************** *** 20,24 **** package org.mc4j.console.dashboard.global; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; --- 20,23 ---- *************** *** 32,40 **** import org.openide.nodes.Node; - import org.mc4j.console.dashboard.DashboardManager; - import org.mc4j.console.bean.MBeanNode; import org.mc4j.console.connection.ConnectionNode; import org.mc4j.console.dashboard.Dashboard; ! import org.mc4j.console.dashboard.DashboardLoader; import org.mc4j.console.dashboard.match.MatchExecutor; --- 31,37 ---- import org.openide.nodes.Node; import org.mc4j.console.connection.ConnectionNode; import org.mc4j.console.dashboard.Dashboard; ! import org.mc4j.console.dashboard.DashboardManager; import org.mc4j.console.dashboard.match.MatchExecutor; *************** *** 46,65 **** * @version $Revision$($Author$ / $Date$) */ ! public class GlobalDashboardChildren extends Children.Array { private ConnectionNode connectionNode; ! private final Node[] LOADING_NODE = ! new Node[] { ! new AbstractNode(Children.LEAF) { ! public String getDisplayName() { ! return "loading..."; - } - } - }; public GlobalDashboardChildren() { ! ((AbstractNode) LOADING_NODE[0]).setIconBase("org/mc4j/console/bean/wait"); } --- 43,72 ---- * @version $Revision$($Author$ / $Date$) */ ! public class GlobalDashboardChildren extends Children.SortedArray { private ConnectionNode connectionNode; ! private final Node[] LOADING_NODE = new Node[1]; ! ! public static class LoadingNode extends AbstractNode implements Comparable { ! public LoadingNode() { ! super(Children.LEAF); ! setIconBase("org/mc4j/console/bean/wait"); ! } ! ! public String getDisplayName() { ! return "loading..."; ! } ! ! ! public int compareTo(Object o) { ! Node otherNode = (Node) o; ! return this.getDisplayName().compareTo(otherNode.getDisplayName()); ! } ! } public GlobalDashboardChildren() { ! LOADING_NODE[0] = new LoadingNode(); } *************** *** 76,80 **** - protected synchronized void addNotify() { --- 83,86 ---- *************** *** 112,116 **** globalDashboardNode = ! new GlobalDashboardNode(matchedDashboard,connectionNode); } } --- 118,122 ---- globalDashboardNode = ! new GlobalDashboardNode(matchedDashboard, connectionNode); } } *************** *** 134,138 **** if (location == null) { ! add(new Node[] { dashboardNode }); } else { StringTokenizer tok = new StringTokenizer(location, "/"); --- 140,144 ---- if (location == null) { ! add(new Node[]{dashboardNode}); } else { StringTokenizer tok = new StringTokenizer(location, "/"); *************** *** 143,151 **** if (pathNode == null) { pathNode = new GlobalDashboardSetNode(connectionNode, path); ! base.getChildren().add(new Node[] { pathNode }); } base = pathNode; } ! base.getChildren().add(new Node[] { dashboardNode }); } --- 149,157 ---- if (pathNode == null) { pathNode = new GlobalDashboardSetNode(connectionNode, path); ! base.getChildren().add(new Node[]{pathNode}); } base = pathNode; } ! base.getChildren().add(new Node[]{dashboardNode}); } Index: GlobalDashboardNode.java =================================================================== RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/GlobalDashboardNode.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GlobalDashboardNode.java 7 Apr 2004 02:59:16 -0000 1.4 --- GlobalDashboardNode.java 7 Apr 2004 15:27:36 -0000 1.5 *************** *** 24,32 **** import javax.swing.Action; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; import org.openide.util.HelpCtx; import org.openide.util.actions.SystemAction; - import org.openide.cookies.PrintCookie; import org.openide.windows.IOProvider; --- 24,33 ---- import javax.swing.Action; + import org.openide.cookies.PrintCookie; import org.openide.nodes.AbstractNode; import org.openide.nodes.Children; + import org.openide.nodes.Node; import org.openide.util.HelpCtx; import org.openide.util.actions.SystemAction; import org.openide.windows.IOProvider; *************** *** 42,46 **** * @version $Revision$($Author$ / $Date$) */ ! public class GlobalDashboardNode extends AbstractNode { private ConnectionNode connectionNode; --- 43,47 ---- * @version $Revision$($Author$ / $Date$) */ ! public class GlobalDashboardNode extends AbstractNode implements Comparable { private ConnectionNode connectionNode; *************** *** 145,148 **** --- 146,155 ---- } + public int compareTo(Object o) { + Node otherNode = (Node) o; + + return this.getDisplayName().compareTo(otherNode.getDisplayName()); + } + } |
