[Mc4j-cvs] mc4j/src/org/mc4j/console/dashboard/global OpenDashboardAction.java,1.9,1.10 GlobalDashboardNode.java,1.6,1.7

[Greg H. <gh...@us...>]

Update of /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20162/src/org/mc4j/console/dashboard/global

Modified Files:
	OpenDashboardAction.java GlobalDashboardNode.java 
Log Message:
Merging EMS into head for the 2.0 release work

Index: OpenDashboardAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/OpenDashboardAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OpenDashboardAction.java	5 Oct 2004 05:16:00 -0000	1.9
--- OpenDashboardAction.java	12 Apr 2006 19:14:11 -0000	1.10
***************
*** 17,37 ****
  package org.mc4j.console.dashboard.global;
  
! import java.util.Map;
! 
! import javax.swing.JComponent;
! import javax.swing.SwingUtilities;
! 
! import org.openide.ErrorManager;
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
  import org.openide.util.actions.NodeAction;
- import org.openide.windows.TopComponent;
- 
- import org.mc4j.console.dashboard.Dashboard;
- import org.mc4j.console.dashboard.DashboardFactory;
- import org.mc4j.console.dashboard.DashboardTopComponent;
  
  /**
!  *
   *
   * @author Greg Hinkle (gh...@us...), May 2003
--- 17,29 ----
  package org.mc4j.console.dashboard.global;
  
! import org.mc4j.console.dashboard.Dashboard;
! import org.mc4j.console.dashboard.DashboardTopComponent;
! import org.mc4j.ems.connection.support.ConnectionListener;
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
  import org.openide.util.actions.NodeAction;
  
  /**
!  * Opens global dashboards
   *
   * @author Greg Hinkle (gh...@us...), May 2003
***************
*** 43,69 ****
          final GlobalDashboardNode node = (GlobalDashboardNode) nodes[0];
  
  
  
!         Map context = node.getDashboard().getContextStarter();
!         context.put(Dashboard.CONTEXT_MBEAN_SERVER, node.getConnectionNode().getMBeanServer());
  
!         
  
!         DashboardFactory factory = new DashboardFactory();
!         try {
!             JComponent component = factory.buildDashboard(node.getDashboard(), context);
!             final TopComponent tc = new DashboardTopComponent(component, node.getDashboard().getName());
!             SwingUtilities.invokeLater(new Runnable() {
!                 public void run() {
!                     tc.setActivatedNodes(new Node[] { node });
!                     tc.setDisplayName(node.getDashboard().getName());
!                     tc.open();
!                     tc.requestActive();
!                 }
!             });
!             node.getConnectionNode().registerDashboard(tc);
!         } catch (Exception e) {
!             ErrorManager.getDefault().notify(e);
!         }
      }
  
--- 35,58 ----
          final GlobalDashboardNode node = (GlobalDashboardNode) nodes[0];
  
+         Dashboard dashboard = node.getDashboard();
  
+         final DashboardTopComponent tc = new DashboardTopComponent(dashboard, dashboard.getName());
+         tc.launch();
  
!         // TODO: Need to figure out where we want to track open dashboards now...
!         // probably against the EmsConnection
!         node.getConnectionNode().getEmsConnection().getConnectionProvider().addConnectionListener(new ConnectionListener() {
!             public void connect() {
!             }
  
!             public void disconnect() {
!                 tc.close();
!             }
  
!             public void connectionFailure() {
!                 // TODO: Some sort of glasspane level info?
!             }
!         });
!         node.getConnectionNode().registerDashboard(tc);
      }
  
***************
*** 83,88 ****
  
  
- 
- 
      public String getName() {
          return "Open..."; // NOI18N
--- 72,75 ----

Index: GlobalDashboardNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/dashboard/global/GlobalDashboardNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GlobalDashboardNode.java	5 Oct 2004 05:16:00 -0000	1.6
--- GlobalDashboardNode.java	12 Apr 2006 19:14:11 -0000	1.7
***************
*** 17,24 ****
  package org.mc4j.console.dashboard.global;
  
! import java.util.List;
! 
! import javax.swing.Action;
! 
  import org.openide.cookies.PrintCookie;
  import org.openide.nodes.AbstractNode;
--- 17,23 ----
  package org.mc4j.console.dashboard.global;
  
! import org.mc4j.console.bean.MBeanNode;
! import org.mc4j.console.connection.ConnectionNode;
! import org.mc4j.console.dashboard.Dashboard;
  import org.openide.cookies.PrintCookie;
  import org.openide.nodes.AbstractNode;
***************
*** 29,35 ****
  import org.openide.windows.IOProvider;
  
! import org.mc4j.console.bean.MBeanNode;
! import org.mc4j.console.connection.ConnectionNode;
! import org.mc4j.console.dashboard.Dashboard;
  
  
--- 28,33 ----
  import org.openide.windows.IOProvider;
  
! import javax.swing.*;
! import java.util.List;
  
  
***************
*** 63,68 ****
  
          setShortDescription(dashboard.getDescription());
- 
-  
      }
  
--- 61,64 ----
***************
*** 80,84 ****
          setDisplayName(dashboard.getName());
  
!         setShortDescription("Dashboard on " + mbeanNode.getObjectName().getCanonicalName());
  
          getCookieSet().add(new PrintCookie() {
--- 76,80 ----
          setDisplayName(dashboard.getName());
  
!         setShortDescription("Dashboard on " + mbeanNode.getEmsBean().getBeanName().getCanonicalName());
  
          getCookieSet().add(new PrintCookie() {