[Mc4j-cvs] mc4j/src/org/mc4j/console/bean DashboardsAction.java,1.11,1.12

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

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

Modified Files:
	DashboardsAction.java 
Log Message:
no message

Index: DashboardsAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/DashboardsAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DashboardsAction.java	19 Feb 2004 19:31:42 -0000	1.11
--- DashboardsAction.java	7 Apr 2004 03:08:24 -0000	1.12
***************
*** 22,26 ****
  import java.awt.event.ActionEvent;
  import java.util.ArrayList;
- import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Iterator;
--- 22,25 ----
***************
*** 45,48 ****
--- 44,48 ----
  import org.mc4j.console.dashboard.Dashboard;
  import org.mc4j.console.dashboard.DashboardFactory;
+ import org.mc4j.console.dashboard.DashboardManager;
  import org.mc4j.console.dashboard.DashboardTopComponent;
  
***************
*** 111,115 ****
          // if false, whole item will just disappear
  
!         return !DashboardManager.getInstance().getDashboards(this.node.getObjectName()).isEmpty();
      }
  
--- 111,115 ----
          // if false, whole item will just disappear
  
!         return !DashboardManager.getInstance().getDashboards(node).isEmpty();
      }
  
***************
*** 169,175 ****
  
              if (dashboard == null) {
!                 DashboardManager.getInstance().initialize();
              } else {
!                 Map context = new HashMap();
                  context.put(Dashboard.CONTEXT_MBEAN_SERVER, this.node.getMBeanServer());
                  context.put(Dashboard.CONTEXT_OBJECT_NAME, this.node.getObjectName());
--- 169,175 ----
  
              if (dashboard == null) {
!                 org.mc4j.console.dashboard.DashboardManager.getInstance().initialize();
              } else {
!                 Map context = dashboard.getContextStarter();
                  context.put(Dashboard.CONTEXT_MBEAN_SERVER, this.node.getMBeanServer());
                  context.put(Dashboard.CONTEXT_OBJECT_NAME, this.node.getObjectName());
***************
*** 220,224 ****
  
              // create displayNames and associatedInfo somehow
!             Set dboards = DashboardManager.getInstance().getDashboards(this.node.getObjectName());
  
              Iterator dbIter = dboards.iterator();
--- 220,224 ----
  
              // create displayNames and associatedInfo somehow
!             Set dboards = DashboardManager.getInstance().getDashboards(this.node);
  
              Iterator dbIter = dboards.iterator();