[Mc4j-cvs] mc4j/src/org/mc4j/console/domain DomainNode.java,1.18,1.19

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

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

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

Index: DomainNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/domain/DomainNode.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DomainNode.java	5 Oct 2004 05:16:01 -0000	1.18
--- DomainNode.java	12 Apr 2006 19:14:16 -0000	1.19
***************
*** 19,22 ****
--- 19,23 ----
  import org.mc4j.console.bean.MBeanNode;
  import org.mc4j.console.install.ExplorerUtil;
+ import org.mc4j.ems.connection.bean.EmsBeanName;
  import org.openide.nodes.AbstractNode;
  import org.openide.nodes.Children;
***************
*** 26,44 ****
  import org.openide.util.actions.SystemAction;
  
- import javax.management.ObjectName;
  import java.io.IOException;
! import java.util.ArrayList;
! import java.util.Collections;
! import java.util.Comparator;
! import java.util.Date;
! import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.HashSet;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
! import java.util.TreeMap;
  
  /**
--- 27,32 ----
  import org.openide.util.actions.SystemAction;
  
  import java.io.IOException;
! import java.util.*;
  
  /**
***************
*** 108,114 ****
              MBeanNode beanNode = (MBeanNode) obj;
  
!             ObjectName objectName = beanNode.getObjectName();
  
!             Hashtable props = objectName.getKeyPropertyList();
              for (Iterator propsIterator = props.entrySet().iterator(); propsIterator.hasNext();) {
                  Map.Entry entry = (Map.Entry) propsIterator.next();
--- 96,102 ----
              MBeanNode beanNode = (MBeanNode) obj;
  
!             EmsBeanName objectName = beanNode.getEmsBean().getBeanName();
  
!             Map<String,String> props = objectName.getKeyProperties();
              for (Iterator propsIterator = props.entrySet().iterator(); propsIterator.hasNext();) {
                  Map.Entry entry = (Map.Entry) propsIterator.next();
***************
*** 163,167 ****
                  MBeanNode beanNode = (MBeanNode) listIterator.next();
                  if (!categorized.contains(beanNode)) {
!                     String significantValueMapKey = key + "=" + beanNode.getObjectName().getKeyProperty(key);
                      List list = (List) resultMap.get(significantValueMapKey);
                      if (list == null) {
--- 151,155 ----
                  MBeanNode beanNode = (MBeanNode) listIterator.next();
                  if (!categorized.contains(beanNode)) {
!                     String significantValueMapKey = key + "=" + beanNode.getEmsBean().getBeanName().getKeyProperty(key);
                      List list = (List) resultMap.get(significantValueMapKey);
                      if (list == null) {
***************
*** 310,314 ****
          if (childNode instanceof MBeanNode) {
              MBeanNode beanNode = (MBeanNode) childNode; //node to insert
!             Hashtable props = beanNode.getObjectName().getKeyPropertyList(); //get properties that will be used to extract keys
              Children children = node.getChildren(); //get the nodes that are already part of the domain
  
--- 298,302 ----
          if (childNode instanceof MBeanNode) {
              MBeanNode beanNode = (MBeanNode) childNode; //node to insert
!             Map<String,String> props = beanNode.getEmsBean().getBeanName().getKeyProperties(); //get properties that will be used to extract keys
              Children children = node.getChildren(); //get the nodes that are already part of the domain