changeset 2021:623c22f00e49

Merge
author ohair
date Fri, 11 Dec 2009 15:29:46 -0800
parents c84d8b9be5c6 3267ca7afe95
children 15568b6998f4
files
diffstat 8 files changed, 12 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/management/PlatformManagedObject.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/java/lang/management/PlatformManagedObject.java	Fri Dec 11 15:29:46 2009 -0800
@@ -32,7 +32,7 @@
  * for monitoring and managing a component in the Java platform.
  * Each platform managed object has a unique
  * <a href="ManagementFactory.html#MXBean">object name</a>
- * for the {@linkplain ManagementFactory.getPlatformMBeanServer
+ * for the {@linkplain ManagementFactory#getPlatformMBeanServer
  * platform MBeanServer} access.
  * All platform MXBeans will implement this interface.
  *
--- a/src/share/classes/java/rmi/activation/Activatable.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/java/rmi/activation/Activatable.java	Fri Dec 11 15:29:46 2009 -0800
@@ -73,7 +73,7 @@
      * can be handled properly.
      *
      * <p>This method invokes the {@link
-     * exportObject(Remote,String,MarshalledObject,boolean,port)
+     * #exportObject(Remote,String,MarshalledObject,boolean,int)
      * exportObject} method with this object, and the specified location,
      * data, restart mode, and port.  Subsequent calls to {@link #getID}
      * will return the activation identifier returned from the call to
@@ -120,7 +120,7 @@
      * can be handled properly.
      *
      * <p>This method invokes the {@link
-     * exportObject(Remote,String,MarshalledObject,boolean,port,RMIClientSocketFactory,RMIServerSocketFactory)
+     * #exportObject(Remote,String,MarshalledObject,boolean,int,RMIClientSocketFactory,RMIServerSocketFactory)
      * exportObject} method with this object, and the specified location,
      * data, restart mode, port, and client and server socket factories.
      * Subsequent calls to {@link #getID} will return the activation
@@ -312,7 +312,7 @@
      * separately, so that exceptions can be handled properly.
      *
      * <p>This method invokes the {@link
-     * exportObject(Remote,String,MarshalledObject,boolean,port,RMIClientSocketFactory,RMIServerSocketFactory)
+     * #exportObject(Remote,String,MarshalledObject,boolean,int,RMIClientSocketFactory,RMIServerSocketFactory)
      * exportObject} method with the specified object, location, data,
      * restart mode, and port, and <code>null</code> for both client and
      * server socket factories, and then returns the resulting activation
--- a/src/share/classes/java/rmi/registry/LocateRegistry.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/java/rmi/registry/LocateRegistry.java	Fri Dec 11 15:29:46 2009 -0800
@@ -187,7 +187,7 @@
      * host that accepts requests on the specified <code>port</code>.
      *
      * <p>The <code>Registry</code> instance is exported as if the static
-     * {@link UnicastRemoteObject.exportObject(Remote,int)
+     * {@link UnicastRemoteObject#exportObject(Remote,int)
      * UnicastRemoteObject.exportObject} method is invoked, passing the
      * <code>Registry</code> instance and the specified <code>port</code> as
      * arguments, except that the <code>Registry</code> instance is
@@ -213,7 +213,7 @@
      *
      * <p>The <code>Registry</code> instance is exported as if
      * the static {@link
-     * UnicastRemoteObject.exportObject(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory)
+     * UnicastRemoteObject#exportObject(Remote,int,RMIClientSocketFactory,RMIServerSocketFactory)
      * UnicastRemoteObject.exportObject} method is invoked, passing the
      * <code>Registry</code> instance, the specified <code>port</code>, the
      * specified <code>RMIClientSocketFactory</code>, and the specified
--- a/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java	Fri Dec 11 15:29:46 2009 -0800
@@ -138,7 +138,6 @@
      * instance
      * @throws  Throwable the exception to throw from the method invocation
      * on the proxy instance
-     * @see
      **/
     public Object invoke(Object proxy, Method method, Object[] args)
         throws Throwable
--- a/src/share/classes/java/security/cert/CertPathValidatorException.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/java/security/cert/CertPathValidatorException.java	Fri Dec 11 15:29:46 2009 -0800
@@ -216,7 +216,7 @@
     /**
      * Returns the reason that the validation failed. The reason is
      * associated with the index of the certificate returned by
-     * {@link getIndex}.
+     * {@link #getIndex}.
      *
      * @return the reason that the validation failed, or
      *    <code>BasicReason.UNSPECIFIED</code> if a reason has not been
--- a/src/share/classes/javax/accessibility/AccessibleContext.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/javax/accessibility/AccessibleContext.java	Fri Dec 11 15:29:46 2009 -0800
@@ -296,7 +296,7 @@
      *
      * @see #getAccessibleText
      * @see #addPropertyChangeListener
-     * @see #AccessibleText.AccessibleTextSequence
+     * @see AccessibleTextSequence
      */
     public static final String ACCESSIBLE_TEXT_PROPERTY
         = "AccessibleText";
@@ -311,7 +311,7 @@
      *
      * @see #getAccessibleText
      * @see #addPropertyChangeListener
-     * @see #AccessibleText.AccessibleTextSequence
+     * @see AccessibleTextSequence
      *
      * @since 1.5
      */
@@ -334,7 +334,7 @@
      *
      * @see #getAccessibleText
      * @see #addPropertyChangeListener
-     * @see #AccessibleText.AccessibleAttributeSequence
+     * @see AccessibleAttributeSequence
      *
      * @since 1.5
      */
--- a/src/share/classes/javax/accessibility/AccessibleExtendedText.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/javax/accessibility/AccessibleExtendedText.java	Fri Dec 11 15:29:46 2009 -0800
@@ -45,7 +45,6 @@
  * @see Accessible#getAccessibleContext
  * @see AccessibleContext
  * @see AccessibleContext#getAccessibleText
- * @see AccessibleText.AccessibleTextChunk
  *
  * @author       Peter Korn
  * @author       Lynn Monsanto
--- a/src/share/classes/javax/accessibility/AccessibleKeyBinding.java	Fri Dec 11 15:29:22 2009 -0800
+++ b/src/share/classes/javax/accessibility/AccessibleKeyBinding.java	Fri Dec 11 15:29:46 2009 -0800
@@ -32,16 +32,11 @@
  * the standard mechanism for an assistive technology to determine the
  * key bindings which exist for this object.
  * Any object that has such key bindings should support this
- * interface.  Applications can determine if an object supports the
- * AccessibleKeyBinding interface by first obtaining its AccessibleContext
- * (see @link Accessible} and then calling the
- * {@link AccessibleContext#getAccessibleKeyBinding} method.  If the return
- * value is not null, the object supports this interface.
+ * interface.
  *
  * @see Accessible
  * @see Accessible#getAccessibleContext
  * @see AccessibleContext
- * @see AccessibleContext#getAccessibleKeyBinding
  *
  * @author      Lynn Monsanto
  * @since 1.4
@@ -58,21 +53,7 @@
     /**
      * Returns a key binding for this object.  The value returned is an
      * java.lang.Object which must be cast to appropriate type depending
-     * on the underlying implementation of the key.  For example, if the
-     * Object returned is a javax.swing.KeyStroke, the user of this
-     * method should do the following:
-     * <nf><code>
-     * Component c = <get the component that has the key bindings>
-     * AccessibleContext ac = c.getAccessibleContext();
-     * AccessibleKeyBinding akb = ac.getAccessibleKeyBinding();
-     * for (int i = 0; i < akb.getAccessibleKeyBindingCount(); i++) {
-     *     Object o = akb.getAccessibleKeyBinding(i);
-     *     if (o instanceof javax.swing.KeyStroke) {
-     *         javax.swing.KeyStroke keyStroke = (javax.swing.KeyStroke)o;
-     *         <do something with the key binding>
-     *     }
-     * }
-     * </code></nf>
+     * on the underlying implementation of the key.
      *
      * @param i zero-based index of the key bindings
      * @return a javax.lang.Object which specifies the key binding