Mercurial > hg > release > icedtea7-forest-2.5 > corba
changeset 156:cf550ad4491d
Merge
author | andrew |
---|---|
date | Mon, 25 Jan 2010 14:40:45 +0000 |
parents | 754872e3368f (current diff) 0336e70ca0ae (diff) |
children | 0d42fe8a066c |
files | .hgtags |
diffstat | 9 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jan 15 17:36:27 2010 +0000 +++ b/.hgtags Mon Jan 25 14:40:45 2010 +0000 @@ -54,3 +54,4 @@ 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 +ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79
--- a/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java Mon Jan 25 14:40:45 2010 +0000 @@ -123,7 +123,7 @@ /** * Coerces a number to the target type of this expression. - * @parm number The number to coerce. + * @param obj The number to coerce. * @return the value of number coerced to the (target) type of * this expression. **/ @@ -142,7 +142,7 @@ /** * Coerces an integral value (BigInteger) to its corresponding unsigned * representation, if the target type of this expression is unsigned. - * @parm b The BigInteger to be coerced. + * @param b The BigInteger to be coerced. * @return the value of an integral type coerced to its corresponding * unsigned integral type, if the target type of this expression is * unsigned. @@ -170,7 +170,7 @@ /** * Coerces an integral value (BigInteger) to its corresponding signed * representation, if the target type of this expression is signed. - * @parm b The BigInteger to be coerced. + * @param b The BigInteger to be coerced. * @return the value of an integral type coerced to its corresponding * signed integral type, if the target type of this expression is * signed.
--- a/src/share/classes/javax/rmi/PortableRemoteObject.java Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/javax/rmi/PortableRemoteObject.java Mon Jan 25 14:40:45 2010 +0000 @@ -161,7 +161,7 @@ * happens implicitly when the object is sent or received as an argument * on a remote method call, but in some circumstances it is useful to * perform this action by making an explicit call. See the - * {@link Stub#connect} method for more information. + * {@link javax.rmi.CORBA.Stub#connect} method for more information. * @param target the object to connect. * @param source a previously connected object. * @throws RemoteException if <code>source</code> is not connected
--- a/src/share/classes/org/omg/CORBA/SetOverrideType.java Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/org/omg/CORBA/SetOverrideType.java Mon Jan 25 14:40:45 2010 +0000 @@ -31,7 +31,7 @@ * indicate whether policies should replace the * existing policies of an <code>Object</code> or be added to them. * <P> - * The method {@link omg.org.CORBA.Object._set_policy_override} takes + * The method {@link org.omg.CORBA.Object#_set_policy_override} takes * either <code>SetOverrideType.SET_OVERRIDE</code> or * <code>SetOverrideType.ADD_OVERRIDE</code> as its second argument. * The method <code>_set_policy_override</code>
--- a/src/share/classes/org/omg/CORBA/TCKind.java Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/org/omg/CORBA/TCKind.java Mon Jan 25 14:40:45 2010 +0000 @@ -545,8 +545,6 @@ * @param _value the <code>int</code> to convert. It must be one of * the <code>int</code> constants in the class * <code>TCKind</code>. - * @return a new <code>TCKind</code> instance whose <code>value</code> - * field matches the given <code>int</code> */ @Deprecated protected TCKind(int _value){
--- a/src/share/classes/org/omg/CORBA/UnknownUserException.java Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/org/omg/CORBA/UnknownUserException.java Mon Jan 25 14:40:45 2010 +0000 @@ -56,7 +56,7 @@ * Constructs an <code>UnknownUserException</code> object that contains the given * <code>Any</code> object. * - * @ param a an <code>Any</code> object that contains a user exception returned + * @param a an <code>Any</code> object that contains a user exception returned * by the server */ public UnknownUserException(Any a) {
--- a/src/share/classes/org/omg/CORBA/portable/ServantObject.java Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/org/omg/CORBA/portable/ServantObject.java Mon Jan 25 14:40:45 2010 +0000 @@ -43,7 +43,6 @@ /** The real servant. The local stub may cast this field to the expected type, and then * invoke the operation directly. Note, the object may or may not be the actual servant * instance. - * @return The real servant */ public java.lang.Object servant; }
--- a/src/share/classes/org/omg/CosNaming/nameservice.idl Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/org/omg/CosNaming/nameservice.idl Mon Jan 25 14:40:45 2010 +0000 @@ -256,7 +256,7 @@ * * @param n Name of the object <p> * - * @parm obj The Object to rebind with the given name <p> + * @param obj The Object to rebind with the given name <p> * * @exception org.omg.CosNaming.NamingContextPackage.NotFound Indicates the name does not identify a binding.<p> *
--- a/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl Fri Jan 15 17:36:27 2010 +0000 +++ b/src/share/classes/org/omg/PortableInterceptor/Interceptors.idl Mon Jan 25 14:40:45 2010 +0000 @@ -1730,7 +1730,7 @@ * <p> * Any number of components may exist with the same component ID. * - * @param a_component The IOP.TaggedComponent to add. + * @param tagged_component The IOP.TaggedComponent to add. */ void add_ior_component (in IOP::TaggedComponent tagged_component); @@ -1744,7 +1744,7 @@ * <p> * Any number of components may exist with the same component ID. * - * @param a_component The <code>IOP.TaggedComponent</code> to add. + * @param tagged_component The <code>IOP.TaggedComponent</code> to add. * @param profile_id The profile id of the profile to * which this component will be added. * @exception BAD_PARAM thrown, with a standard minor code of 29, if the