src/share/classes/sun/tools/jconsole/ProxyClient.java

*** 25,35 ****
  
  package sun.tools.jconsole;
  
  import com.sun.management.HotSpotDiagnosticMXBean;
  import com.sun.tools.jconsole.JConsoleContext;
- import com.sun.tools.jconsole.JConsoleContext.ConnectionState;
  import java.beans.PropertyChangeListener;
  import java.beans.PropertyChangeEvent;
  import java.io.IOException;
  import java.lang.management.*;
  import static java.lang.management.ManagementFactory.*;
--- 25,34 ----
*** 44,53 ****
--- 43,53 ----
  import javax.management.remote.rmi.*;
  import javax.rmi.ssl.SslRMIClientSocketFactory;
  import javax.swing.event.SwingPropertyChangeSupport;
  import sun.rmi.server.UnicastRef2;
  import sun.rmi.transport.LiveRef;
+ import sun.tools.jconsole.resources.Messages;
  
  public class ProxyClient implements JConsoleContext {
  
      private ConnectionState connectionState = ConnectionState.DISCONNECTED;
  
*** 502,512 ****
          return displayName;
      }
  
      public String toString() {
          if (!isConnected()) {
!             return Resources.getText("ConnectionName (disconnected)", displayName);
          } else {
              return displayName;
          }
      }
  
--- 502,512 ----
          return displayName;
      }
  
      public String toString() {
          if (!isConnected()) {
!             return Resources.format(Messages.CONNECTION_NAME__DISCONNECTED_, displayName);
          } else {
              return displayName;
          }
      }
  
*** 593,606 ****
              } catch (MalformedObjectNameException e) {
                  // should not reach here
                  assert(false);
              }
          }
!         Set mbeans = server.queryNames(name, null);
          Map<ObjectName,MBeanInfo> result =
              new HashMap<ObjectName,MBeanInfo>(mbeans.size());
!         Iterator iterator = mbeans.iterator();
          while (iterator.hasNext()) {
              Object object = iterator.next();
              if (object instanceof ObjectName) {
                  ObjectName o = (ObjectName)object;
                  try {
--- 593,606 ----
              } catch (MalformedObjectNameException e) {
                  // should not reach here
                  assert(false);
              }
          }
!         Set<ObjectName> mbeans = server.queryNames(name, null);
          Map<ObjectName,MBeanInfo> result =
              new HashMap<ObjectName,MBeanInfo>(mbeans.size());
!         Iterator<ObjectName> iterator = mbeans.iterator();
          while (iterator.hasNext()) {
              Object object = iterator.next();
              if (object instanceof ObjectName) {
                  ObjectName o = (ObjectName)object;
                  try {
*** 702,715 ****
                  poolName = new ObjectName(MEMORY_POOL_MXBEAN_DOMAIN_TYPE + ",*");
              } catch (MalformedObjectNameException e) {
                  // should not reach here
                  assert(false);
              }
!             Set mbeans = server.queryNames(poolName, null);
              if (mbeans != null) {
                  memoryPoolProxies = new ArrayList<MemoryPoolProxy>();
!                 Iterator iterator = mbeans.iterator();
                  while (iterator.hasNext()) {
                      ObjectName objName = (ObjectName) iterator.next();
                      MemoryPoolProxy p = new MemoryPoolProxy(this, objName);
                      memoryPoolProxies.add(p);
                  }
--- 702,715 ----
                  poolName = new ObjectName(MEMORY_POOL_MXBEAN_DOMAIN_TYPE + ",*");
              } catch (MalformedObjectNameException e) {
                  // should not reach here
                  assert(false);
              }
!             Set<ObjectName> mbeans = server.queryNames(poolName, null);
              if (mbeans != null) {
                  memoryPoolProxies = new ArrayList<MemoryPoolProxy>();
!                 Iterator<ObjectName> iterator = mbeans.iterator();
                  while (iterator.hasNext()) {
                      ObjectName objName = (ObjectName) iterator.next();
                      MemoryPoolProxy p = new MemoryPoolProxy(this, objName);
                      memoryPoolProxies.add(p);
                  }
*** 728,741 ****
                  gcName = new ObjectName(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*");
              } catch (MalformedObjectNameException e) {
                  // should not reach here
                  assert(false);
              }
!             Set mbeans = server.queryNames(gcName, null);
              if (mbeans != null) {
                  garbageCollectorMBeans = new ArrayList<GarbageCollectorMXBean>();
!                 Iterator iterator = mbeans.iterator();
                  while (iterator.hasNext()) {
                      ObjectName on = (ObjectName) iterator.next();
                      String name = GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE +
                          ",name=" + on.getKeyProperty("name");
  
--- 728,741 ----
                  gcName = new ObjectName(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*");
              } catch (MalformedObjectNameException e) {
                  // should not reach here
                  assert(false);
              }
!             Set<ObjectName> mbeans = server.queryNames(gcName, null);
              if (mbeans != null) {
                  garbageCollectorMBeans = new ArrayList<GarbageCollectorMXBean>();
!                 Iterator<ObjectName> iterator = mbeans.iterator();
                  while (iterator.hasNext()) {
                      ObjectName on = (ObjectName) iterator.next();
                      String name = GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE +
                          ",name=" + on.getKeyProperty("name");