[Mc4j-cvs] mc4j/src/org/mc4j/console/cluster ClusterAddConnectionAction.java,1.8,1.9 ClusterConnection.java,1.7,1.8

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

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

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

Index: ClusterConnection.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/cluster/ClusterConnection.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ClusterConnection.java	5 Oct 2004 05:15:57 -0000	1.7
--- ClusterConnection.java	12 Apr 2006 19:13:58 -0000	1.8
***************
*** 17,32 ****
  package org.mc4j.console.cluster;
  
! import java.util.ArrayList;
! import java.util.Iterator;
! import java.util.List;
! 
! import javax.management.MBeanServer;
! 
! import org.openide.nodes.Children;
  import org.openide.nodes.Node;
  import org.openide.util.actions.SystemAction;
  
! import org.mc4j.console.connection.ConnectionNode;
! import org.mc4j.console.connection.persistence.ConnectionSettings;
  
  /**
--- 17,28 ----
  package org.mc4j.console.cluster;
  
! import org.mc4j.console.connection.ConnectionNode;
! import org.mc4j.ems.connection.settings.ConnectionSettings;
  import org.openide.nodes.Node;
  import org.openide.util.actions.SystemAction;
  
! import java.util.ArrayList;
! import java.util.Iterator;
! import java.util.List;
  
  /**
***************
*** 43,47 ****
      /** Creates a new instance of ClusterConnection */
      public ClusterConnection() {
!         super(new Children.Array());
  
          setIconBase("org/mc4j/console/connection/DisconnectedConnectionNodeIcon");
--- 39,43 ----
      /** Creates a new instance of ClusterConnection */
      public ClusterConnection() {
!         super(new ConnectionSettings());
  
          setIconBase("org/mc4j/console/connection/DisconnectedConnectionNodeIcon");
***************
*** 69,72 ****
--- 65,69 ----
      public void initialize(ConnectionSettings settings) {
      }
+ 
      
      public Node.PropertySet[] getPropertySets() {
***************
*** 84,91 ****
          }
      }
!     
!     public MBeanServer getMBeanServer() {
!         return null;
!     }
      
  }
--- 81,85 ----
          }
      }
! 
      
  }

Index: ClusterAddConnectionAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/cluster/ClusterAddConnectionAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ClusterAddConnectionAction.java	5 Oct 2004 05:15:57 -0000	1.8
--- ClusterAddConnectionAction.java	12 Apr 2006 19:13:58 -0000	1.9
***************
*** 17,24 ****
  package org.mc4j.console.cluster;
  
! import java.awt.Dialog;
! 
! import javax.swing.SwingUtilities;
! 
  import org.openide.DialogDisplayer;
  import org.openide.ErrorManager;
--- 17,22 ----
  package org.mc4j.console.cluster;
  
! import org.mc4j.console.connection.wizard.ConnectionDescriptor;
! import org.mc4j.ems.connection.settings.ConnectionSettings;
  import org.openide.DialogDisplayer;
  import org.openide.ErrorManager;
***************
*** 28,33 ****
  import org.openide.util.actions.NodeAction;
  
! import org.mc4j.console.connection.persistence.ConnectionSettings;
! import org.mc4j.console.connection.wizard.ConnectionDescriptor;
  
  /**
--- 26,31 ----
  import org.openide.util.actions.NodeAction;
  
! import javax.swing.*;
! import java.awt.*;
  
  /**