From 02e5c4a10784d94eebea832bf4ff4f56d4f51308 Mon Sep 17 00:00:00 2001 From: Alexander Stepanov Date: Mon, 12 May 2014 14:33:13 +0400 Subject: [PATCH] 8038795: Tidy warnings cleanup for javax.management Reviewed-by: dfuchs --- .../javax/management/MBeanPermission.java | 6 +++--- .../management/MBeanServerPermission.java | 4 ++-- .../ModelMBeanNotificationBroadcaster.java | 4 ++-- .../management/openmbean/CompositeType.java | 18 +++++++++--------- .../openmbean/OpenMBeanAttributeInfo.java | 3 +-- .../openmbean/OpenMBeanConstructorInfo.java | 3 +-- .../management/openmbean/OpenMBeanInfo.java | 3 +-- .../openmbean/OpenMBeanOperationInfo.java | 4 ++-- .../openmbean/OpenMBeanParameterInfo.java | 3 +-- .../management/openmbean/TabularType.java | 4 ++-- .../management/remote/JMXConnectorFactory.java | 4 ++-- .../remote/JMXConnectorServerFactory.java | 4 ++-- .../javax/management/remote/JMXPrincipal.java | 12 ++---------- .../javax/management/remote/package.html | 4 ++-- .../javax/management/remote/rmi/package.html | 10 +++++----- 15 files changed, 37 insertions(+), 49 deletions(-) diff --git a/jdk/src/share/classes/javax/management/MBeanPermission.java b/jdk/src/share/classes/javax/management/MBeanPermission.java index 79e24c4e440..3c998e4ea01 100644 --- a/jdk/src/share/classes/javax/management/MBeanPermission.java +++ b/jdk/src/share/classes/javax/management/MBeanPermission.java @@ -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 @@ import java.security.Permission; * * *

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 @@ public class MBeanPermission extends Permission { * 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 --git a/jdk/src/share/classes/javax/management/MBeanServerPermission.java b/jdk/src/share/classes/javax/management/MBeanServerPermission.java index 14784cfb495..6005f83654b 100644 --- a/jdk/src/share/classes/javax/management/MBeanServerPermission.java +++ b/jdk/src/share/classes/javax/management/MBeanServerPermission.java @@ -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 @@ public class MBeanServerPermission extends BasicPermission { * 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 --git a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java index 49445b071a4..7be9bc7037a 100644 --- a/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java +++ b/jdk/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java @@ -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 @@ public interface ModelMBeanNotificationBroadcaster extends NotificationBroadcast /** * 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 --git a/jdk/src/share/classes/javax/management/openmbean/CompositeType.java b/jdk/src/share/classes/javax/management/openmbean/CompositeType.java
index 0eddb799ec0..8c802f2c8ad 100644
--- a/jdk/src/share/classes/javax/management/openmbean/CompositeType.java
+++ b/jdk/src/share/classes/javax/management/openmbean/CompositeType.java
@@ -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 @@ public class CompositeType extends OpenType {
      * 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 @@ public class CompositeType extends OpenType {
      *                                   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 @@ public class CompositeType extends OpenType {
      * 
  • 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 --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java
index afb10386331..0324efc8bf8 100644
--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfo.java
@@ -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 @@ public interface OpenMBeanAttributeInfo extends OpenMBeanParameterInfo {
      * 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 --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java
index e72040b16a9..54be69f6622 100644
--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java
@@ -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 @@ public interface OpenMBeanConstructorInfo {
      * 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 --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java
index 8e233daecf7..f63c20757d0 100644
--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java
@@ -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 @@ public interface OpenMBeanInfo {
      * 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 --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java
index 908efb28a34..bafd82c1610 100644
--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java
@@ -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 @@ public interface OpenMBeanOperationInfo  {
      * 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 --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java
index 8d4bcb781bb..f7e0b4bf9a4 100644
--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java
@@ -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 @@ public interface OpenMBeanParameterInfo {
      * 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 --git a/jdk/src/share/classes/javax/management/openmbean/TabularType.java b/jdk/src/share/classes/javax/management/openmbean/TabularType.java
index af8cb5686b5..17710478f67 100644
--- a/jdk/src/share/classes/javax/management/openmbean/TabularType.java
+++ b/jdk/src/share/classes/javax/management/openmbean/TabularType.java
@@ -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 @@ public class TabularType extends OpenType {
      * 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 --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java b/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java
index 55c4d9dcb00..2eb99d2b870 100644
--- a/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java
+++ b/jdk/src/share/classes/javax/management/remote/JMXConnectorFactory.java
@@ -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 @@ import sun.reflect.misc.ReflectUtil;
  * 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 --git a/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java b/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java
index 0d58b7303b3..bdaa4e7f1fd 100644
--- a/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java
+++ b/jdk/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java
@@ -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 @@ import javax.management.MBeanServer;
  * 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 --git a/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java b/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
index aaa242f6405..f1529adcbc9 100644
--- a/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
+++ b/jdk/src/share/classes/javax/management/remote/JMXPrincipal.java
@@ -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 @@ public class JMXPrincipal implements Principal, Serializable {
     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 @@ public class JMXPrincipal implements Principal, Serializable {
     /**
      * Returns the name of this principal.
      *
-     * 
    
-     *
      * @return the name of this JMXPrincipal.
      */
     public String getName() {
@@ -85,8 +83,6 @@ public class JMXPrincipal implements Principal, Serializable {
     /**
      * Returns a string representation of this JMXPrincipal.
      *
-     * 
    
-     *
      * @return a string representation of this JMXPrincipal.
      */
     public String toString() {
@@ -99,8 +95,6 @@ public class JMXPrincipal implements Principal, Serializable {
      * JMXPrincipal and the two JMXPrincipals
      * have the same name.
      *
-     * 
    
-     *
      * @param o Object to be compared for equality with this
      * JMXPrincipal.
      *
@@ -124,8 +118,6 @@ public class JMXPrincipal implements Principal, Serializable {
     /**
      * Returns a hash code for this JMXPrincipal.
      *
-     * 
    
-     *
      * @return a hash code for this JMXPrincipal.
      */
     public int hashCode() {
diff --git a/jdk/src/share/classes/javax/management/remote/package.html b/jdk/src/share/classes/javax/management/remote/package.html
index 561ed57526c..a545d36fcbf 100644
--- a/jdk/src/share/classes/javax/management/remote/package.html
+++ b/jdk/src/share/classes/javax/management/remote/package.html
@@ -2,7 +2,7 @@
 
     JMX<sup><font size="-2">TM</font></sup> Remote API.