[Mc4j-cvs] mc4j/src/org/mc4j/console/bean/attribute/watch CreateMonitorAction.java,1.2,1.3 MonitorRootNode.java,1.2,1.3

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

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

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

Index: MonitorRootNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/watch/MonitorRootNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MonitorRootNode.java	5 Oct 2004 05:15:55 -0000	1.2
--- MonitorRootNode.java	12 Apr 2006 19:14:02 -0000	1.3
***************
*** 17,47 ****
  package org.mc4j.console.bean.attribute.watch;
  
! import java.io.File;
! import java.io.FileFilter;
! import java.net.MalformedURLException;
! import java.net.URL;
! import java.net.URLClassLoader;
! import java.util.HashMap;
! import java.util.Iterator;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
! 
! import javax.swing.Action;
! import javax.swing.JOptionPane;
! 
! import org.openide.ErrorManager;
! import org.openide.modules.InstalledFileLocator;
  import org.openide.nodes.AbstractNode;
  import org.openide.nodes.Children;
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
- import org.openide.util.NbBundle;
  import org.openide.util.actions.NodeAction;
  
! import org.mc4j.console.connection.persistence.ConnectionSetDatabase;
! import org.mc4j.console.connection.persistence.ConnectionSettings;
! import org.mc4j.console.ConnectAction;
! import org.mc4j.console.IConnectionNode;
  
  /**
--- 17,28 ----
  package org.mc4j.console.bean.attribute.watch;
  
! import org.mc4j.console.ConnectAction;
  import org.openide.nodes.AbstractNode;
  import org.openide.nodes.Children;
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
  import org.openide.util.actions.NodeAction;
  
! import javax.swing.*;
  
  /**

Index: CreateMonitorAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/watch/CreateMonitorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreateMonitorAction.java	5 Oct 2004 05:15:55 -0000	1.2
--- CreateMonitorAction.java	12 Apr 2006 19:14:02 -0000	1.3
***************
*** 17,40 ****
  package org.mc4j.console.bean.attribute.watch;
  
! import java.awt.Color;
! import java.math.BigDecimal;
! import java.math.BigInteger;
! import java.util.HashSet;
! import java.util.Set;
! 
! import javax.management.MBeanAttributeInfo;
! import javax.management.ObjectName;
! import javax.swing.SwingUtilities;
! 
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
  import org.openide.util.actions.NodeAction;
  
- import org.mc4j.console.bean.MBeanNode;
- import org.mc4j.console.bean.attribute.AttributeNode;
- import org.mc4j.console.bean.attribute.AttributeGraphPanel;
- import org.mc4j.console.bean.attribute.watch.monitor.MonitorFactory;
- import org.mc4j.console.bean.attribute.watch.monitor.BeanMonitorNode;
- 
  /**
   * Action sensitive to the node selection that does something useful.
--- 17,26 ----
  package org.mc4j.console.bean.attribute.watch;
  
! import org.mc4j.console.bean.attribute.AttributeNode;
! import org.mc4j.console.bean.attribute.watch.monitor.BeanMonitorNode;
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
  import org.openide.util.actions.NodeAction;
  
  /**
   * Action sensitive to the node selection that does something useful.
***************
*** 49,53 ****
      protected void performAction(Node[] nodes) {
          // do work based on the current node selection, e.g.:
!         AttributeNode node = (AttributeNode)nodes[0];
          // ...
          // Note that casting to a type of node is often not the right
--- 35,39 ----
      protected void performAction(Node[] nodes) {
          // do work based on the current node selection, e.g.:
!         AttributeNode node = (AttributeNode) nodes[0];
          // ...
          // Note that casting to a type of node is often not the right
***************
*** 63,67 ****
  
          AttributeNode[] attributeNodes = new AttributeNode[nodes.length];
!         System.arraycopy(nodes,0,attributeNodes, 0, nodes.length);
          beanMonitorNode.setAttributeNodes(attributeNodes);
  
--- 49,53 ----
  
          AttributeNode[] attributeNodes = new AttributeNode[nodes.length];
!         System.arraycopy(nodes, 0, attributeNodes, 0, nodes.length);
          beanMonitorNode.setAttributeNodes(attributeNodes);
  
***************
*** 71,75 ****
  
      protected boolean enable(Node[] nodes) {
!        for (int i = 0; i < nodes.length; i++) {
              if (!(nodes[i] instanceof AttributeNode)) {
                  return false;
--- 57,61 ----
  
      protected boolean enable(Node[] nodes) {
!         for (int i = 0; i < nodes.length; i++) {
              if (!(nodes[i] instanceof AttributeNode)) {
                  return false;
***************
*** 81,85 ****
  
  
- 
      public String getName() {
          return "Create watch...";
--- 67,70 ----