This adds two of the remaining MBeanXXXInfo classes. The last one, MBeanOperationInfo, should be committed tomorrow, along with the completion of the MBeanInfo implementation (at last).
Changelog:
2006-07-25 Andrew John Hughes <[EMAIL PROTECTED]>
* javax/management/MBeanConstructorInfo.java:
New file.
* javax/management/MBeanNotificationInfo.java:
Documentation fix.
* javax/management/MBeanParameterInfo.java:
New file.
--
Andrew :-)
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: javax/management/MBeanConstructorInfo.java
===================================================================
RCS file: javax/management/MBeanConstructorInfo.java
diff -N javax/management/MBeanConstructorInfo.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/management/MBeanConstructorInfo.java 25 Jul 2006 21:24:21 -0000
@@ -0,0 +1,199 @@
+/* MBeanConstructorInfo.java -- Information about a bean's constructor.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+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 javax.management;
+
+import java.lang.reflect.Constructor;
+
+import java.util.Arrays;
+
+/**
+ * Describes the constructors of a management bean.
+ * The information in this class is immutable as standard.
+ * Of course, subclasses may change this, but this
+ * behaviour is not recommended.
+ *
+ * @author Andrew John Hughes ([EMAIL PROTECTED])
+ * @since 1.5
+ */
+public class MBeanConstructorInfo
+ extends MBeanFeatureInfo
+ implements Cloneable
+{
+
+ /**
+ * Compatible with JDK 1.5
+ */
+ private static final long serialVersionUID = 4433990064191844427L;
+
+ /**
+ * The signature of the constructor i.e. the argument types.
+ */
+ private MBeanParameterInfo[] signature;
+
+ /**
+ * Constructs a @link{MBeanConstructorInfo} with the specified
+ * description using the given constructor. Each parameter is
+ * described merely by its type; the name and description are
+ * <code>null</code>.
+ *
+ * @param desc a description of the attribute.
+ * @param cons the constructor.
+ */
+ public MBeanConstructorInfo(String desc, Constructor cons)
+ {
+ super(cons.getName(), desc);
+ Class[] paramTypes = cons.getParameterTypes();
+ signature = new MBeanParameterInfo[paramTypes.length];
+ for (int a = 0; a < paramTypes.length; ++a)
+ signature[a] = new MBeanParameterInfo(null,
+ paramTypes[a].getName(),
+ null);
+ }
+
+ /**
+ * Constructs a @link{MBeanConstructorInfo} with the specified
+ * name, description and parameter information. A <code>null</code>
+ * value for the parameter information is the same as passing in
+ * an empty array.
+ *
+ * @param name the name of the constructor.
+ * @param desc a description of the attribute.
+ * @param sig the signature of the constructor, as a series
+ * of [EMAIL PROTECTED] MBeanParameterInfo} objects, one for
+ * each parameter.
+ */
+ public MBeanConstructorInfo(String name, String desc,
+ MBeanParameterInfo[] sig)
+ {
+ super(name, desc);
+ if (sig == null)
+ signature = new MBeanParameterInfo[0];
+ else
+ signature = sig;
+ }
+
+ /**
+ * Returns a clone of this instance. The clone is created
+ * using just the method provided by [EMAIL PROTECTED] java.lang.Object}.
+ * Thus, the clone is just a shallow clone as returned by
+ * that method, and does not contain any deeper cloning based
+ * on the subject of this class.
+ *
+ * @return a clone of this instance.
+ * @see java.lang.Cloneable
+ */
+ public Object clone()
+ {
+ try
+ {
+ return super.clone();
+ }
+ catch (CloneNotSupportedException e)
+ {
+ /* This shouldn't happen; we implement Cloneable */
+ throw new IllegalStateException("clone() called on " +
+ "non-cloneable object.");
+ }
+ }
+
+ /**
+ * Compares this feature with the supplied object. This returns
+ * true iff the object is an instance of [EMAIL PROTECTED]
+ * MBeanConstructorInfo}, [EMAIL PROTECTED] Object#equals()} returns true
for a
+ * comparison of both the name and description of this notification
+ * with that of the specified object (performed by the superclass),
+ * and the two signature arrays contain the same elements in the
+ * same order (but one may be longer than the other).
+ *
+ * @param obj the object to compare.
+ * @return true if the object is a [EMAIL PROTECTED] MBeanNotificationInfo}
+ * instance,
+ * <code>name.equals(object.getName())</code>,
+ * <code>description.equals(object.getDescription())</code>
+ * and the corresponding elements of the signature arrays are
+ * equal.
+ */
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof MBeanConstructorInfo))
+ return false;
+ if (!(super.equals(obj)))
+ return false;
+ MBeanConstructorInfo o = (MBeanConstructorInfo) obj;
+ MBeanParameterInfo[] sig = o.getSignature();
+ for (int a = 0; a < signature.length; ++a)
+ {
+ if (a == sig.length)
+ return true;
+ if (!(signature[a].equals(sig[a])))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns the constructor's signature, in the form of
+ * information on each parameter. Each parameter is
+ * described by an instance of [EMAIL PROTECTED] MBeanParameterInfo}.
+ * The returned array is a shallow copy of the array used
+ * by this instance, so changing which elements are stored
+ * in the array won't affect the array used by this, but
+ * changing the actual elements will affect the ones used
+ * here.
+ *
+ * @return an array of [EMAIL PROTECTED] MBeanParameterInfo} objects,
+ * describing the constructor parameters.
+ */
+ public MBeanParameterInfo[] getSignature()
+ {
+ return (MBeanParameterInfo[]) signature.clone();
+ }
+
+ /**
+ * Returns the hashcode of the constructor information as the sum
+ * of the hashcode of the superclass and the hashcode of the parameter
+ * array.
+ *
+ * @return the hashcode of the constructor information.
+ */
+ public int hashCode()
+ {
+ return super.hashCode() + Arrays.hashCode(signature);
+ }
+
+}
Index: javax/management/MBeanNotificationInfo.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/javax/management/MBeanNotificationInfo.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 MBeanNotificationInfo.java
--- javax/management/MBeanNotificationInfo.java 24 Jul 2006 20:34:33 -0000
1.2
+++ javax/management/MBeanNotificationInfo.java 25 Jul 2006 21:24:21 -0000
@@ -188,8 +188,7 @@ public class MBeanNotificationInfo
* of the hashcode of the superclass and the hashcode of the types
* array.
*
- * @return the hashcode of the notification
- * information.
+ * @return the hashcode of the notification information.
*/
public int hashCode()
{
Index: javax/management/MBeanParameterInfo.java
===================================================================
RCS file: javax/management/MBeanParameterInfo.java
diff -N javax/management/MBeanParameterInfo.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/management/MBeanParameterInfo.java 25 Jul 2006 21:24:21 -0000
@@ -0,0 +1,148 @@
+/* MBeanParameterInfo.java -- Information about an operation's parameters.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+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 javax.management;
+
+/**
+ * Describes the parameters of a constructor or operation associated
+ * with a management bean. The information in this class is immutable
+ * as standard. Of course, subclasses may change this, but this
+ * behaviour is not recommended.
+ *
+ * @author Andrew John Hughes ([EMAIL PROTECTED])
+ * @since 1.5
+ */
+public class MBeanParameterInfo
+ extends MBeanFeatureInfo
+ implements Cloneable
+{
+
+ /**
+ * Compatible with JDK 1.5
+ */
+ private static final long serialVersionUID = 7432616882776782338L;
+
+ /**
+ * The type of the parameter, represented by the class name.
+ */
+ private String type;
+
+ /**
+ * Constructs a new [EMAIL PROTECTED] MBeanParameterInfo} using the specified
+ * name, description and type.
+ *
+ * @param name the name of the attribute.
+ * @param type the type of the attribute, in the form of its class name.
+ * @param desc a description of the attribute.
+ */
+ public MBeanParameterInfo(String name, String type, String desc)
+ {
+ super(name, desc);
+ this.type = type;
+ }
+
+ /**
+ * Returns a clone of this instance. The clone is created
+ * using just the method provided by [EMAIL PROTECTED] java.lang.Object}.
+ * Thus, the clone is just a shallow clone as returned by
+ * that method, and does not contain any deeper cloning based
+ * on the subject of this class.
+ *
+ * @return a clone of this instance.
+ * @see java.lang.Cloneable
+ */
+ public Object clone()
+ {
+ try
+ {
+ return super.clone();
+ }
+ catch (CloneNotSupportedException e)
+ {
+ /* This shouldn't happen; we implement Cloneable */
+ throw new IllegalStateException("clone() called on " +
+ "non-cloneable object.");
+ }
+ }
+
+ /**
+ * Compares this feature with the supplied object. This returns
+ * true iff the object is an instance of [EMAIL PROTECTED]
MBeanParameterInfo},
+ * [EMAIL PROTECTED] Object#equals()} returns true for a comparison of both
the
+ * name and description of this parameter with that of the specified
+ * object (performed by the superclass), and the type of the two
+ * instances is equal.
+ *
+ * @param obj the object to compare.
+ * @return true if the object is a [EMAIL PROTECTED] MBeanParameterInfo}
+ * instance,
+ * <code>name.equals(object.getName())</code>,
+ * <code>description.equals(object.getDescription())</code>,
+ * and <code>type.equals(object.getType())</code>.
+ */
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof MBeanParameterInfo))
+ return false;
+ if (!(super.equals(obj)))
+ return false;
+ MBeanParameterInfo o = (MBeanParameterInfo) obj;
+ return type.equals(o.getType());
+ }
+
+ /**
+ * Returns the type of this attribute, in the form of its class name.
+ *
+ * @return the type of this attribute.
+ */
+ public String getType()
+ {
+ return type;
+ }
+
+ /**
+ * Returns the hashcode of the parameter information as the sum of
+ * the hashcode of the superclass and the hashcode of the type.
+ *
+ * @return the hashcode of the parameter information.
+ */
+ public int hashCode()
+ {
+ return super.hashCode() + type.hashCode();
+ }
+
+}
signature.asc
Description: Digital signature
