[Mc4j-cvs] mc4j/src/org/mc4j/console/bean/attribute/watch/monitor StartMonitoringAction.java,1.2,1.3 MonitorFactory.java,1.2,1.3 BeanMonitorNode.java,1.2,1.3 StopMonitoringAction.java,1.2,1.3

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

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

Modified Files:
	StartMonitoringAction.java MonitorFactory.java 
	BeanMonitorNode.java StopMonitoringAction.java 
Log Message:
Merging EMS into head for the 2.0 release work

Index: StartMonitoringAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/watch/monitor/StartMonitoringAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StartMonitoringAction.java	5 Oct 2004 05:15:55 -0000	1.2
--- StartMonitoringAction.java	12 Apr 2006 19:14:00 -0000	1.3
***************
*** 17,40 ****
  package org.mc4j.console.bean.attribute.watch.monitor;
  
- 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.MonitorTopComponent;
- 
  /**
   * Action sensitive to the node selection that does something useful.
--- 17,24 ----

Index: BeanMonitorNode.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/watch/monitor/BeanMonitorNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BeanMonitorNode.java	5 Oct 2004 05:15:55 -0000	1.2
--- BeanMonitorNode.java	12 Apr 2006 19:14:00 -0000	1.3
***************
*** 18,67 ****
  
  import org.jfree.ui.ExtensionFileFilter;
! 
! import java.io.File;
! import java.io.FileFilter;
! import java.io.IOException;
! 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 java.util.Date;
! import java.util.ArrayList;
! import java.util.Timer;
! import java.util.TimerTask;
! import java.lang.reflect.InvocationTargetException;
! import java.beans.PropertyEditor;
! import java.beans.PropertyEditorSupport;
! 
! import javax.swing.Action;
! import javax.swing.JOptionPane;
! import javax.swing.JFileChooser;
! 
  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.nodes.Sheet;
- import org.openide.nodes.PropertySupport;
  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;
! import org.mc4j.console.bean.MBeanNode;
! import org.mc4j.console.bean.attribute.watch.log.Logger;
! import org.mc4j.console.bean.attribute.watch.log.AttributeLogger;
! import org.mc4j.console.bean.attribute.watch.monitor.StartMonitoringAction;
! import org.mc4j.console.bean.attribute.watch.monitor.StopMonitoringAction;
! import org.mc4j.console.bean.attribute.watch.monitor.AbstractMonitorNode;
! import org.mc4j.console.bean.attribute.AttributeNode;
  
  /**
--- 18,33 ----
  
  import org.jfree.ui.ExtensionFileFilter;
! import org.mc4j.console.bean.MBeanNode;
! import org.mc4j.console.bean.attribute.AttributeNode;
! import org.mc4j.console.bean.attribute.watch.log.AttributeLogger;
! import org.mc4j.console.bean.attribute.watch.log.Logger;
  import org.openide.ErrorManager;
  import org.openide.nodes.Children;
  import org.openide.nodes.Node;
  import org.openide.util.HelpCtx;
  
! import javax.swing.*;
! import java.io.File;
! import java.io.IOException;
  
  /**

Index: MonitorFactory.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/watch/monitor/MonitorFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MonitorFactory.java	5 Oct 2004 05:15:55 -0000	1.2
--- MonitorFactory.java	12 Apr 2006 19:14:00 -0000	1.3
***************
*** 17,29 ****
  package org.mc4j.console.bean.attribute.watch.monitor;
  
- import org.openide.ErrorManager;
- 
  import org.mc4j.console.bean.attribute.AttributeNode;
  
- import javax.management.monitor.CounterMonitor;
  import javax.management.monitor.CounterMonitorMBean;
- import javax.management.ObjectName;
- import javax.management.ObjectInstance;
- import javax.management.MBeanServerInvocationHandler;
  
  
--- 17,24 ----
  package org.mc4j.console.bean.attribute.watch.monitor;
  
  import org.mc4j.console.bean.attribute.AttributeNode;
+ import org.openide.ErrorManager;
  
  import javax.management.monitor.CounterMonitorMBean;
  
  
***************
*** 40,49 ****
  
          try {
!             String domain = node.getServer().getDefaultDomain();
!             ObjectName counterMonitorName = new ObjectName(domain + ":name=CounterMonitor" + monitorIndex++);
  
  
!             ObjectInstance instance =
!                 node.getServer().createMBean("javax.management.monitor.CounterMonitor", counterMonitorName);
  
  
--- 35,44 ----
  
          try {
! //            String domain = node.getServer().getDefaultDomain();
! //            ObjectName counterMonitorName = new ObjectName(domain + ":name=CounterMonitor" + monitorIndex++);
  
  
! //            ObjectInstance instance =
! //                node.getServer().createMBean("javax.management.monitor.CounterMonitor", counterMonitorName);
  
  
***************
*** 60,65 ****
              //monitor.addObservedObject(node.getObjectName());
  
!             node.getServer().addNotificationListener(
!                 instance.getObjectName(), new MonitorListener(), null, null);
  
              monitor.start();
--- 55,60 ----
              //monitor.addObservedObject(node.getObjectName());
  
! //            node.getServer().addNotificationListener(
! //                instance.getObjectName(), new MonitorListener(), null, null);
  
              monitor.start();

Index: StopMonitoringAction.java
===================================================================
RCS file: /cvsroot/mc4j/mc4j/src/org/mc4j/console/bean/attribute/watch/monitor/StopMonitoringAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StopMonitoringAction.java	5 Oct 2004 05:15:55 -0000	1.2
--- StopMonitoringAction.java	12 Apr 2006 19:14:00 -0000	1.3
***************
*** 17,40 ****
  package org.mc4j.console.bean.attribute.watch.monitor;
  
- 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.MonitorTopComponent;
- 
  /**
   * Action sensitive to the node selection that does something useful.
--- 17,24 ----