From 24d8ce15e2daacbc37d9d727f7a6ded79aad5e92 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Fri, 16 Feb 2007 13:51:04 +0000 Subject: [multiple changes] 2007-02-15 Andrew Haley * Makefile.am (nat_source_files): Remove java/lang/management/natVMManagementFactory.cc. * java/lang/Thread.java (getStackTrace): Use reflection to call the ManagementFactory. * java/lang/management/VMManagementFactory.java: Remove native methods. * java/lang/management/natVMManagementFactory.cc: Deleted. * sources.am: Regnerate. * scripts/makemake.tcl: Add new "bcheaders" type. Move java/lang/management and gnu/classpath/management to "bc". Move gnu/java/lang/management to "bcheaders". 2007-02-16 Andrew Haley * gnu/java/lang/management/MemoryMXBeanImpl.java, javax/management/MBeanServerDelegate.java: Use gnu.javax.management.ListenerData rather than gnu.classpath.ListenerData. * gnu/javax/management/ListenerData.java: Move here from gnu/classpath/ListenerData.java. From-SVN: r122041 --- libjava/classpath/ChangeLog | 9 ++ libjava/classpath/gnu/classpath/ListenerData.java | 136 --------------------- .../gnu/java/lang/management/MemoryMXBeanImpl.java | 2 +- .../gnu/javax/management/ListenerData.java | 136 +++++++++++++++++++++ .../javax/management/MBeanServerDelegate.java | 2 +- .../classpath/lib/gnu/classpath/ListenerData.class | Bin 1197 -> 0 bytes .../java/lang/management/MemoryMXBeanImpl.class | Bin 7173 -> 7187 bytes .../lib/gnu/javax/management/ListenerData.class | Bin 0 -> 1211 bytes libjava/classpath/lib/java/lang/Thread$State.class | Bin 1242 -> 1242 bytes libjava/classpath/lib/java/lang/Thread.class | Bin 9343 -> 10110 bytes .../java/lang/management/VMManagementFactory.class | Bin 444 -> 707 bytes .../lib/javax/management/MBeanServerDelegate.class | Bin 4928 -> 4942 bytes 12 files changed, 147 insertions(+), 138 deletions(-) delete mode 100644 libjava/classpath/gnu/classpath/ListenerData.java create mode 100644 libjava/classpath/gnu/javax/management/ListenerData.java delete mode 100644 libjava/classpath/lib/gnu/classpath/ListenerData.class create mode 100644 libjava/classpath/lib/gnu/javax/management/ListenerData.class (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 85fa74c..577fa67 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,12 @@ +2007-02-16 Andrew Haley + + * gnu/java/lang/management/MemoryMXBeanImpl.java, + javax/management/MBeanServerDelegate.java: Use + gnu.javax.management.ListenerData rather than + gnu.classpath.ListenerData. + * gnu/javax/management/ListenerData.java: Move here from + gnu/classpath/ListenerData.java. + 2007-02-14 Jakub Jelinek Andrew Haley diff --git a/libjava/classpath/gnu/classpath/ListenerData.java b/libjava/classpath/gnu/classpath/ListenerData.java deleted file mode 100644 index 284fa02..0000000 --- a/libjava/classpath/gnu/classpath/ListenerData.java +++ /dev/null @@ -1,136 +0,0 @@ -/* ListenerData.java - Class to contain data about management bean listeners - Copyright (C) 2006 Free Software Foundation - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package gnu.classpath; - -import javax.management.NotificationFilter; -import javax.management.NotificationListener; - -/** - * Container for data on management listeners. Wraps - * a {@link javax.management.NotificationListener}, - * {@link javax.management.NotificationFilter} and - * passback object in one class. - * - * @author Andrew John Hughes (gnu_andrew@member.fsf.org) - * @since 1.5 - */ -public class ListenerData -{ - /** - * The listener itself. - */ - private NotificationListener listener; - - /** - * A filter to apply to incoming events. - */ - private NotificationFilter filter; - - /** - * An object to pass back to the listener on an - * event occurring. - */ - private Object passback; - - /** - * Constructs a new {@link ListenerData} with the specified - * listener, filter and passback object. - * - * @param listener the listener itself. - * @param filter the filter for incoming events. - * @param passback the object to passback on an incoming event. - */ - public ListenerData(NotificationListener listener, - NotificationFilter filter, Object passback) - { - this.listener = listener; - this.filter = filter; - this.passback = passback; - } - - /** - * Returns the listener. - * - * @return the listener. - */ - public NotificationListener getListener() - { - return listener; - } - - /** - * Returns the filter. - * - * @return the filter. - */ - public NotificationFilter getFilter() - { - return filter; - } - - /** - * Returns the passback object. - * - * @return the passback object. - */ - public Object getPassback() - { - return passback; - } - - /** - * Returns true if the supplied object is an instance of - * {@link ListenerData} and has the same listener, filter - * and passback object. - * - * @param obj the object to check. - * @return true if obj is equal to this. - */ - public boolean equals(Object obj) - { - if (obj instanceof ListenerData) - { - ListenerData data = (ListenerData) obj; - return (data.getListener() == listener && - data.getFilter() == filter && - data.getPassback() == passback); - } - return false; - } - -} diff --git a/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java index 8cb1042..1e6c63a 100644 --- a/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java @@ -37,7 +37,7 @@ exception statement from your version. */ package gnu.java.lang.management; -import gnu.classpath.ListenerData; +import gnu.javax.management.ListenerData; import java.lang.management.MemoryMXBean; import java.lang.management.MemoryNotificationInfo; diff --git a/libjava/classpath/gnu/javax/management/ListenerData.java b/libjava/classpath/gnu/javax/management/ListenerData.java new file mode 100644 index 0000000..719daa0 --- /dev/null +++ b/libjava/classpath/gnu/javax/management/ListenerData.java @@ -0,0 +1,136 @@ +/* ListenerData.java - Class to contain data about management bean listeners + Copyright (C) 2006 Free Software Foundation + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.javax.management; + +import javax.management.NotificationFilter; +import javax.management.NotificationListener; + +/** + * Container for data on management listeners. Wraps + * a {@link javax.management.NotificationListener}, + * {@link javax.management.NotificationFilter} and + * passback object in one class. + * + * @author Andrew John Hughes (gnu_andrew@member.fsf.org) + * @since 1.5 + */ +public class ListenerData +{ + /** + * The listener itself. + */ + private NotificationListener listener; + + /** + * A filter to apply to incoming events. + */ + private NotificationFilter filter; + + /** + * An object to pass back to the listener on an + * event occurring. + */ + private Object passback; + + /** + * Constructs a new {@link ListenerData} with the specified + * listener, filter and passback object. + * + * @param listener the listener itself. + * @param filter the filter for incoming events. + * @param passback the object to passback on an incoming event. + */ + public ListenerData(NotificationListener listener, + NotificationFilter filter, Object passback) + { + this.listener = listener; + this.filter = filter; + this.passback = passback; + } + + /** + * Returns the listener. + * + * @return the listener. + */ + public NotificationListener getListener() + { + return listener; + } + + /** + * Returns the filter. + * + * @return the filter. + */ + public NotificationFilter getFilter() + { + return filter; + } + + /** + * Returns the passback object. + * + * @return the passback object. + */ + public Object getPassback() + { + return passback; + } + + /** + * Returns true if the supplied object is an instance of + * {@link ListenerData} and has the same listener, filter + * and passback object. + * + * @param obj the object to check. + * @return true if obj is equal to this. + */ + public boolean equals(Object obj) + { + if (obj instanceof ListenerData) + { + ListenerData data = (ListenerData) obj; + return (data.getListener() == listener && + data.getFilter() == filter && + data.getPassback() == passback); + } + return false; + } + +} diff --git a/libjava/classpath/javax/management/MBeanServerDelegate.java b/libjava/classpath/javax/management/MBeanServerDelegate.java index 347e51f..9e9d191 100644 --- a/libjava/classpath/javax/management/MBeanServerDelegate.java +++ b/libjava/classpath/javax/management/MBeanServerDelegate.java @@ -37,7 +37,7 @@ exception statement from your version. */ package javax.management; -import gnu.classpath.ListenerData; +import gnu.javax.management.ListenerData; import gnu.classpath.SystemProperties; import java.net.InetAddress; diff --git a/libjava/classpath/lib/gnu/classpath/ListenerData.class b/libjava/classpath/lib/gnu/classpath/ListenerData.class deleted file mode 100644 index 2ab92ad..0000000 Binary files a/libjava/classpath/lib/gnu/classpath/ListenerData.class and /dev/null differ diff --git a/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class index 714075e..9347297 100644 Binary files a/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class and b/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class differ diff --git a/libjava/classpath/lib/gnu/javax/management/ListenerData.class b/libjava/classpath/lib/gnu/javax/management/ListenerData.class new file mode 100644 index 0000000..aaebddd Binary files /dev/null and b/libjava/classpath/lib/gnu/javax/management/ListenerData.class differ diff --git a/libjava/classpath/lib/java/lang/Thread$State.class b/libjava/classpath/lib/java/lang/Thread$State.class index 3ce018e..e5ddca2 100644 Binary files a/libjava/classpath/lib/java/lang/Thread$State.class and b/libjava/classpath/lib/java/lang/Thread$State.class differ diff --git a/libjava/classpath/lib/java/lang/Thread.class b/libjava/classpath/lib/java/lang/Thread.class index 8329bc1..0931579 100644 Binary files a/libjava/classpath/lib/java/lang/Thread.class and b/libjava/classpath/lib/java/lang/Thread.class differ diff --git a/libjava/classpath/lib/java/lang/management/VMManagementFactory.class b/libjava/classpath/lib/java/lang/management/VMManagementFactory.class index 98185d2..7602cf7 100644 Binary files a/libjava/classpath/lib/java/lang/management/VMManagementFactory.class and b/libjava/classpath/lib/java/lang/management/VMManagementFactory.class differ diff --git a/libjava/classpath/lib/javax/management/MBeanServerDelegate.class b/libjava/classpath/lib/javax/management/MBeanServerDelegate.class index 9013098..c0c7619 100644 Binary files a/libjava/classpath/lib/javax/management/MBeanServerDelegate.class and b/libjava/classpath/lib/javax/management/MBeanServerDelegate.class differ -- cgit v1.1