# HG changeset patch # User yan # Date 1399890793 -14400 # Node ID 2b4801b94265746eeebc35afdcba6493d376d7e9 # Parent 705490680527049b3868839d01fb6b3883fd97a7 8038795: Tidy warnings cleanup for javax.management Reviewed-by: dfuchs Contributed-by: Alexander Stepanov diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/MBeanPermission.java --- a/jdk/src/share/classes/javax/management/MBeanPermission.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/MBeanPermission.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -156,7 +156,7 @@ * * *

In a comma-separated list of actions, spaces are allowed before - * and after each action.

+ * and after each action. * * @since 1.5 */ @@ -1129,7 +1129,7 @@ * Checks two MBeanPermission objects for equality. Checks * that obj is an MBeanPermission, and has the same * name and actions as this object. - *

+ * * @param obj the object we are testing for equality with this object. * @return true if obj is an MBeanPermission, and has the * same name and actions as this MBeanPermission object. diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/MBeanServerPermission.java --- a/jdk/src/share/classes/javax/management/MBeanServerPermission.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/MBeanServerPermission.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -285,7 +285,7 @@ * Checks two MBeanServerPermission objects for equality. Checks that * obj is an MBeanServerPermission, and represents the same * list of allowable actions as this object. - *

+ * * @param obj the object we are testing for equality with this object. * @return true if the objects are equal. */ diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java --- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -124,7 +124,7 @@ /** * Sends an attributeChangeNotification which contains the old value and new value for the * attribute to the registered AttributeChangeNotification listeners on the ModelMBean. - *

+ * * @param oldValue The original value for the Attribute * @param newValue The current value for the Attribute *

diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/openmbean/CompositeType.java
--- a/jdk/src/share/classes/javax/management/openmbean/CompositeType.java	Mon May 12 14:12:33 2014 +0400
+++ b/jdk/src/share/classes/javax/management/openmbean/CompositeType.java	Mon May 12 14:33:13 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,29 +81,29 @@
      * The Java class name of composite data values this composite type represents
      * (ie the class name returned by the {@link OpenType#getClassName() getClassName} method)
      * is set to the string value returned by CompositeData.class.getName().
-     * 

+ * * @param typeName The name given to the composite type this instance represents; cannot be a null or empty string. - *
  + * * @param description The human readable description of the composite type this instance represents; * cannot be a null or empty string. - *
  + * * @param itemNames The names of the items contained in the * composite data values described by this CompositeType instance; * cannot be null and should contain at least one element; no element can be a null or empty string. * Note that the order in which the item names are given is not important to differentiate a * CompositeType instance from another; * the item names are internally stored sorted in ascending alphanumeric order. - *
  + * * @param itemDescriptions The descriptions, in the same order as itemNames, of the items contained in the * composite data values described by this CompositeType instance; * should be of the same size as itemNames; * no element can be null or an empty string. - *
  + * * @param itemTypes The open type instances, in the same order as itemNames, describing the items contained * in the composite data values described by this CompositeType instance; * should be of the same size as itemNames; * no element can be null. - *
  + * * @throws IllegalArgumentException If typeName or description is a null or empty string, * or itemNames or itemDescriptions or itemTypes is null, * or any element of itemNames or itemDescriptions @@ -111,7 +111,7 @@ * or any element of itemTypes is null, * or itemNames or itemDescriptions or itemTypes * are not of the same size. - *
  + * * @throws OpenDataException If itemNames contains duplicate item names * (case sensitive, but leading and trailing whitespaces removed). */ @@ -356,7 +356,7 @@ *

  • their type names are equal
  • *
  • their items' names and types are equal
  • * - *
      + * * @param obj the object to be compared for equality with this CompositeType instance; * if obj is null, equals returns false. * diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java --- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -113,7 +113,6 @@ * for any two OpenMBeanAttributeInfo instances t1 and t2, * as required by the general contract of the method * {@link Object#hashCode() Object.hashCode()}. - *

    * * @return the hash code value for this OpenMBeanAttributeInfo instance */ diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java --- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -118,7 +118,6 @@ * for any two OpenMBeanConstructorInfo instances t1 and t2, * as required by the general contract of the method * {@link Object#hashCode() Object.hashCode()}. - *

    * * @return the hash code value for this OpenMBeanConstructorInfo instance */ diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java --- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -168,7 +168,6 @@ * for any two OpenMBeanInfo instances t1 and t2, * as required by the general contract of the method * {@link Object#hashCode() Object.hashCode()}. - *

    * * @return the hash code value for this OpenMBeanInfo instance */ diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java --- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -161,7 +161,7 @@ * for any two OpenMBeanOperationInfo instances t1 and t2, * as required by the general contract of the method * {@link Object#hashCode() Object.hashCode()}. - *

    + * * * @return the hash code value for this OpenMBeanOperationInfo instance */ diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java --- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -192,7 +192,6 @@ * for any two OpenMBeanParameterInfo instances t1 and t2, * as required by the general contract of the method * {@link Object#hashCode() Object.hashCode()}. - *

    * * @return the hash code value for this OpenMBeanParameterInfo instance */ diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/openmbean/TabularType.java --- a/jdk/src/share/classes/javax/management/openmbean/TabularType.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/openmbean/TabularType.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -75,7 +75,7 @@ * The Java class name of tabular data values this tabular type represents * (ie the class name returned by the {@link OpenType#getClassName() getClassName} method) * is set to the string value returned by TabularData.class.getName(). - *

    + * * @param typeName The name given to the tabular type this instance represents; cannot be a null or empty string. *
      * @param description The human readable description of the tabular type this instance represents; diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java --- a/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -134,7 +134,7 @@ * MalformedURLException if there is none. An * implementation may choose to find providers by other means. For * example, it may support the + * href="{@docRoot}/../technotes/guides/jar/jar.html#Service%20Provider"> * JAR conventions for service providers, where the service * interface is JMXConnectorProvider.

    * diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java --- a/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -125,7 +125,7 @@ * MalformedURLException if there is none. An * implementation may choose to find providers by other means. For * example, it may support the + * href="{@docRoot}/../technotes/guides/jar/jar.html#Service%20Provider"> * JAR conventions for service providers, where the service * interface is JMXConnectorServerProvider.

    * diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/remote/JMXPrincipal.java --- a/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java Mon May 12 14:33:13 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,7 +59,7 @@ private String name; /** - *

    Creates a JMXPrincipal for a given identity.

    + * Creates a JMXPrincipal for a given identity. * * @param name the JMX Remote API name for this identity. * @@ -74,8 +74,6 @@ /** * Returns the name of this principal. * - *

    - * * @return the name of this JMXPrincipal. */ public String getName() { @@ -85,8 +83,6 @@ /** * Returns a string representation of this JMXPrincipal. * - *

    - * * @return a string representation of this JMXPrincipal. */ public String toString() { @@ -99,8 +95,6 @@ * JMXPrincipal and the two JMXPrincipals * have the same name. * - *

    - * * @param o Object to be compared for equality with this * JMXPrincipal. * @@ -124,8 +118,6 @@ /** * Returns a hash code for this JMXPrincipal. * - *

    - * * @return a hash code for this JMXPrincipal. */ public int hashCode() { diff -r 705490680527 -r 2b4801b94265 jdk/src/share/classes/javax/management/remote/package.html --- a/jdk/src/share/classes/javax/management/remote/package.html Mon May 12 14:12:33 2014 +0400 +++ b/jdk/src/share/classes/javax/management/remote/package.html Mon May 12 14:33:13 2014 +0400 @@ -2,7 +2,7 @@ JMX<sup><font size="-2">TM</font></sup> Remote API.