# HG changeset patch # User ohair # Date 1260574186 28800 # Node ID b4c14bd35bd7f42a7b9199c3dd26cee9d7968d68 # Parent 48e5b69c7e2717c1762e67e69f21d43feda79816# Parent b3ed7ecf8f55820fb34b1fcc54ecfc60a94b9589 Merge diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/java/lang/management/PlatformManagedObject.java --- a/jdk/src/share/classes/java/lang/management/PlatformManagedObject.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/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 * object name - * for the {@linkplain ManagementFactory.getPlatformMBeanServer + * for the {@linkplain ManagementFactory#getPlatformMBeanServer * platform MBeanServer} access. * All platform MXBeans will implement this interface. * diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/java/rmi/activation/Activatable.java --- a/jdk/src/share/classes/java/rmi/activation/Activatable.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/src/share/classes/java/rmi/activation/Activatable.java Fri Dec 11 15:29:46 2009 -0800 @@ -73,7 +73,7 @@ * can be handled properly. * *

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. * *

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. * *

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 null for both client and * server socket factories, and then returns the resulting activation diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/java/rmi/registry/LocateRegistry.java --- a/jdk/src/share/classes/java/rmi/registry/LocateRegistry.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/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 port. * *

The Registry instance is exported as if the static - * {@link UnicastRemoteObject.exportObject(Remote,int) + * {@link UnicastRemoteObject#exportObject(Remote,int) * UnicastRemoteObject.exportObject} method is invoked, passing the * Registry instance and the specified port as * arguments, except that the Registry instance is @@ -213,7 +213,7 @@ * *

The Registry 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 * Registry instance, the specified port, the * specified RMIClientSocketFactory, and the specified diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java --- a/jdk/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/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 diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/java/security/cert/CertPathValidatorException.java --- a/jdk/src/share/classes/java/security/cert/CertPathValidatorException.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/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 * BasicReason.UNSPECIFIED if a reason has not been diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/javax/accessibility/AccessibleContext.java --- a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/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 */ diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/javax/accessibility/AccessibleExtendedText.java --- a/jdk/src/share/classes/javax/accessibility/AccessibleExtendedText.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/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 diff -r 48e5b69c7e27 -r b4c14bd35bd7 jdk/src/share/classes/javax/accessibility/AccessibleKeyBinding.java --- a/jdk/src/share/classes/javax/accessibility/AccessibleKeyBinding.java Fri Dec 11 15:29:22 2009 -0800 +++ b/jdk/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: - * - * Component c = - * 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; - * - * } - * } - * + * 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