[Mc4j-cvs] mc4j/src/org/mc4j/console/query QueryNode.java,1.11,1.12

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

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

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

Index: QueryNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/query/QueryNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** QueryNode.java	7 Jan 2005 05:08:49 -0000	1.11
--- QueryNode.java	12 Apr 2006 19:14:15 -0000	1.12
***************
*** 19,47 ****
  import org.mc4j.console.bean.MBeanNode;
  import org.mc4j.console.connection.ConnectionNode;
- import org.mc4j.console.mejb.MBeanFilterNode;
  import org.openide.ErrorManager;
- import org.openide.awt.StatusDisplayer;
  import org.openide.actions.OpenLocalExplorerAction;
  import org.openide.actions.PropertiesAction;
  import org.openide.actions.ToolsAction;
! import org.openide.nodes.AbstractNode;
! import org.openide.nodes.Children;
! import org.openide.nodes.Node;
! import org.openide.nodes.PropertySupport;
! import org.openide.nodes.Sheet;
! import org.openide.nodes.FilterNode;
  import org.openide.util.HelpCtx;
  import org.openide.util.NbBundle;
  import org.openide.util.actions.SystemAction;
  
! import javax.management.MBeanServer;
! import javax.management.MalformedObjectNameException;
! import javax.management.ObjectInstance;
! import javax.management.ObjectName;
! import java.lang.reflect.InvocationTargetException;
  import java.util.Iterator;
- import java.util.Set;
  import java.util.List;
! import java.util.ArrayList;
  import java.util.regex.Pattern;
  
--- 19,36 ----
  import org.mc4j.console.bean.MBeanNode;
  import org.mc4j.console.connection.ConnectionNode;
  import org.openide.ErrorManager;
  import org.openide.actions.OpenLocalExplorerAction;
  import org.openide.actions.PropertiesAction;
  import org.openide.actions.ToolsAction;
! import org.openide.awt.StatusDisplayer;
! import org.openide.nodes.*;
  import org.openide.util.HelpCtx;
  import org.openide.util.NbBundle;
  import org.openide.util.actions.SystemAction;
  
! import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.List;
! import java.util.Set;
  import java.util.regex.Pattern;
  
***************
*** 102,106 ****
                          Object obj = iter.next();
                          MBeanNode mBeanNode = (MBeanNode) obj;
!                         String canonicalName = mBeanNode.getObjectName().getCanonicalName();
  
                          StatusDisplayer.getDefault().setStatusText("Searching MBean [" + i++ + " of " + list.size() + "]");
--- 91,95 ----
                          Object obj = iter.next();
                          MBeanNode mBeanNode = (MBeanNode) obj;
!                         String canonicalName = mBeanNode.getEmsBean().getBeanName().getCanonicalName();
  
                          StatusDisplayer.getDefault().setStatusText("Searching MBean [" + i++ + " of " + list.size() + "]");