Merge jdk7-b80

Wed, 20 Jan 2010 17:09:11 -0800

author
mikejwre
date
Wed, 20 Jan 2010 17:09:11 -0800
changeset 136
0336e70ca0ae
parent 134
fdbc85b2d15c
parent 135
d4c077d44a64
child 137
e08a42a2a94d

Merge

     1.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java	Thu Jan 14 15:48:23 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java	Wed Jan 20 17:09:11 2010 -0800
     1.3 @@ -123,7 +123,7 @@
     1.4  
     1.5    /**
     1.6     * Coerces a number to the target type of this expression.
     1.7 -   * @parm  number  The number to coerce.
     1.8 +   * @param  obj  The number to coerce.
     1.9     * @return  the value of number coerced to the (target) type of
    1.10     *  this expression.
    1.11     **/
    1.12 @@ -142,7 +142,7 @@
    1.13    /**
    1.14     * Coerces an integral value (BigInteger) to its corresponding unsigned
    1.15     * representation, if the target type of this expression is unsigned.
    1.16 -   * @parm b The BigInteger to be coerced.
    1.17 +   * @param b The BigInteger to be coerced.
    1.18     * @return the value of an integral type coerced to its corresponding
    1.19     *  unsigned integral type, if the target type of this expression is
    1.20     *  unsigned.
    1.21 @@ -170,7 +170,7 @@
    1.22    /**
    1.23     * Coerces an integral value (BigInteger) to its corresponding signed
    1.24     * representation, if the target type of this expression is signed.
    1.25 -   * @parm  b  The BigInteger to be coerced.
    1.26 +   * @param  b  The BigInteger to be coerced.
    1.27     * @return  the value of an integral type coerced to its corresponding
    1.28     *  signed integral type, if the target type of this expression is
    1.29     *  signed.
     2.1 --- a/src/share/classes/javax/rmi/PortableRemoteObject.java	Thu Jan 14 15:48:23 2010 -0800
     2.2 +++ b/src/share/classes/javax/rmi/PortableRemoteObject.java	Wed Jan 20 17:09:11 2010 -0800
     2.3 @@ -161,7 +161,7 @@
     2.4       * happens implicitly when the object is sent or received as an argument
     2.5       * on a remote method call, but in some circumstances it is useful to
     2.6       * perform this action by making an explicit call.  See the
     2.7 -     * {@link Stub#connect} method for more information.
     2.8 +     * {@link javax.rmi.CORBA.Stub#connect} method for more information.
     2.9       * @param target the object to connect.
    2.10       * @param source a previously connected object.
    2.11       * @throws RemoteException if <code>source</code> is not connected
     3.1 --- a/src/share/classes/org/omg/CORBA/SetOverrideType.java	Thu Jan 14 15:48:23 2010 -0800
     3.2 +++ b/src/share/classes/org/omg/CORBA/SetOverrideType.java	Wed Jan 20 17:09:11 2010 -0800
     3.3 @@ -31,7 +31,7 @@
     3.4   * indicate whether policies should replace the
     3.5   * existing policies of an <code>Object</code> or be added to them.
     3.6   * <P>
     3.7 - * The method {@link omg.org.CORBA.Object._set_policy_override} takes
     3.8 + * The method {@link org.omg.CORBA.Object#_set_policy_override} takes
     3.9   * either <code>SetOverrideType.SET_OVERRIDE</code> or
    3.10   * <code>SetOverrideType.ADD_OVERRIDE</code> as its second argument.
    3.11   * The method <code>_set_policy_override</code>
     4.1 --- a/src/share/classes/org/omg/CORBA/TCKind.java	Thu Jan 14 15:48:23 2010 -0800
     4.2 +++ b/src/share/classes/org/omg/CORBA/TCKind.java	Wed Jan 20 17:09:11 2010 -0800
     4.3 @@ -545,8 +545,6 @@
     4.4      * @param  _value the <code>int</code> to convert.  It must be one of
     4.5      *         the <code>int</code> constants in the class
     4.6      *         <code>TCKind</code>.
     4.7 -    * @return  a new <code>TCKind</code> instance whose <code>value</code>
     4.8 -    * field matches the given <code>int</code>
     4.9      */
    4.10      @Deprecated
    4.11      protected TCKind(int _value){
     5.1 --- a/src/share/classes/org/omg/CORBA/UnknownUserException.java	Thu Jan 14 15:48:23 2010 -0800
     5.2 +++ b/src/share/classes/org/omg/CORBA/UnknownUserException.java	Wed Jan 20 17:09:11 2010 -0800
     5.3 @@ -56,7 +56,7 @@
     5.4       * Constructs an <code>UnknownUserException</code> object that contains the given
     5.5       * <code>Any</code> object.
     5.6       *
     5.7 -     * @ param a an <code>Any</code> object that contains a user exception returned
     5.8 +     * @param a an <code>Any</code> object that contains a user exception returned
     5.9       *         by the server
    5.10       */
    5.11      public UnknownUserException(Any a) {
     6.1 --- a/src/share/classes/org/omg/CORBA/portable/ServantObject.java	Thu Jan 14 15:48:23 2010 -0800
     6.2 +++ b/src/share/classes/org/omg/CORBA/portable/ServantObject.java	Wed Jan 20 17:09:11 2010 -0800
     6.3 @@ -43,7 +43,6 @@
     6.4      /** The real servant. The local stub may cast this field to the expected type, and then
     6.5       * invoke the operation directly. Note, the object may or may not be the actual servant
     6.6       * instance.
     6.7 -     * @return The real servant
     6.8       */
     6.9      public java.lang.Object servant;
    6.10  }
     7.1 --- a/src/share/classes/org/omg/CosNaming/nameservice.idl	Thu Jan 14 15:48:23 2010 -0800
     7.2 +++ b/src/share/classes/org/omg/CosNaming/nameservice.idl	Wed Jan 20 17:09:11 2010 -0800
     7.3 @@ -256,7 +256,7 @@
     7.4   * 
     7.5   * @param  n Name of the object <p>
     7.6   * 
     7.7 - * @parm obj The Object to rebind with the given name <p>
     7.8 + * @param obj The Object to rebind with the given name <p>
     7.9   * 
    7.10   * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p>
    7.11   * 
     8.1 --- a/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl	Thu Jan 14 15:48:23 2010 -0800
     8.2 +++ b/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl	Wed Jan 20 17:09:11 2010 -0800
     8.3 @@ -1730,7 +1730,7 @@
     8.4       * <p>
     8.5       * Any number of components may exist with the same component ID. 
     8.6       * 
     8.7 -     * @param a_component The IOP.TaggedComponent to add.
     8.8 +     * @param tagged_component The IOP.TaggedComponent to add.
     8.9       */
    8.10      void add_ior_component 
    8.11        (in IOP::TaggedComponent tagged_component);
    8.12 @@ -1744,7 +1744,7 @@
    8.13       * <p>
    8.14       * Any number of components may exist with the same component ID. 
    8.15       * 
    8.16 -     * @param a_component The <code>IOP.TaggedComponent</code> to add. 
    8.17 +     * @param tagged_component The <code>IOP.TaggedComponent</code> to add. 
    8.18       * @param profile_id The profile id of the profile to 
    8.19       *     which this component will be added.
    8.20       * @exception BAD_PARAM thrown, with a standard minor code of 29, if the 

mercurial