--- old/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2015-04-30 20:13:09.759450990 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2015-04-30 20:13:09.679450991 +0400 @@ -222,7 +222,7 @@ /** * returns the type of the element contained in the Any. * - * @result the TypeCode for the element in the Any + * @return the TypeCode for the element in the Any */ public TypeCode type() { return typeCode; @@ -267,7 +267,7 @@ * checks for equality between Anys. * * @param otherAny the Any to be compared with. - * @result true if the Anys are equal, false otherwise. + * @return true if the Anys are equal, false otherwise. */ public boolean equal(Any otherAny) { @@ -508,7 +508,7 @@ /** * returns an output stream that an Any value can be marshaled into. * - * @result the OutputStream to marshal value of Any into + * @return the OutputStream to marshal value of Any into */ public org.omg.CORBA.portable.OutputStream create_output_stream() { @@ -525,7 +525,7 @@ /** * returns an input stream that an Any value can be marshaled out of. * - * @result the InputStream to marshal value of Any out of. + * @return the InputStream to marshal value of Any out of. */ public org.omg.CORBA.portable.InputStream create_input_stream() { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java 2015-04-30 20:13:10.119450990 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CDROutputObject.java 2015-04-30 20:13:10.039450990 +0400 @@ -166,7 +166,7 @@ * Write the contents of the CDROutputStream to the specified * output stream. Has the side-effect of pushing any current * Message onto the Message list. - * @param s The output stream to write to. + * @param connection The output stream to write to. */ public void writeTo(CorbaConnection connection) throws java.io.IOException --- old/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java 2015-04-30 20:13:10.459450990 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java 2015-04-30 20:13:10.379450990 +0400 @@ -54,8 +54,9 @@ * use NIO ByteBuffer and NIO CharBuffer, the interaction * and interface between this class and the CDR streams * should be looked at more closely for optimizations to - * avoid unnecessary copying of data between char[] & - * CharBuffer and byte[] & ByteBuffer, especially + * avoid unnecessary copying of data between + * {@code char[] & CharBuffer} and + * {@code byte[] & ByteBuffer}, especially * DirectByteBuffers. * */ --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java 2015-04-30 20:13:10.807450990 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java 2015-04-30 20:13:10.723450990 +0400 @@ -33,7 +33,6 @@ import com.sun.corba.se.spi.ior.Identifiable ; /** - * @author * This is used for unknown components and profiles. A TAG_MULTICOMPONENT_PROFILE will be represented this way. */ public abstract class GenericIdentifiable implements Identifiable --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java 2015-04-30 20:13:11.147450989 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedComponent.java 2015-04-30 20:13:11.067450989 +0400 @@ -34,9 +34,6 @@ import com.sun.corba.se.spi.ior.TaggedComponent ; -/** - * @author - */ public class GenericTaggedComponent extends GenericIdentifiable implements TaggedComponent { @@ -52,8 +49,6 @@ /** * @return org.omg.IOP.TaggedComponent - * @exception - * @author */ public org.omg.IOP.TaggedComponent getIOPComponent( ORB orb ) { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java 2015-04-30 20:13:11.483450989 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java 2015-04-30 20:13:11.403450989 +0400 @@ -39,9 +39,6 @@ import com.sun.corba.se.impl.encoding.EncapsOutputStream ; -/** - * @author - */ public class GenericTaggedProfile extends GenericIdentifiable implements TaggedProfile { private ORB orb ; --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java 2015-04-30 20:13:11.827450989 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/IORTemplateImpl.java 2015-04-30 20:13:11.743450989 +0400 @@ -47,7 +47,6 @@ /** * This class is a container of TaggedProfileTemplates. - * @author */ public class IORTemplateImpl extends IdentifiableContainerBase implements IORTemplate { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java 2015-04-30 20:13:12.167450988 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java 2015-04-30 20:13:12.087450989 +0400 @@ -31,7 +31,7 @@ /** ObjectAdapterIdNumber is used to represent pre-JDK 1.4 POA adapter * IDs. The POA ID was simply represented as a single integer, which was * mapped to the actual POA instance. Here, we just represent these - * internally as arrays of the form { "OldRootPOA", "" }, + * internally as arrays of the form {@code { "OldRootPOA", "" }}, * and provide an extra method to get the number back. */ public class ObjectAdapterIdNumber extends ObjectAdapterIdArray { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java 2015-04-30 20:13:12.515450988 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java 2015-04-30 20:13:12.431450988 +0400 @@ -29,9 +29,6 @@ import com.sun.corba.se.spi.ior.ObjectId ; import org.omg.CORBA_2_3.portable.OutputStream ; -/** - * @author - */ public final class ObjectIdImpl implements ObjectId { private byte[] id; --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java 2015-04-30 20:13:12.855450988 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java 2015-04-30 20:13:12.775450988 +0400 @@ -47,9 +47,6 @@ import com.sun.corba.se.impl.logging.IORSystemException ; -/** - * @author - */ public abstract class ObjectKeyTemplateBase implements ObjectKeyTemplate { // Fixed constants for Java IDL object key template forms --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java 2015-04-30 20:13:13.199450988 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java 2015-04-30 20:13:13.119450988 +0400 @@ -42,9 +42,6 @@ import com.sun.corba.se.impl.ior.ObjectKeyFactoryImpl ; -/** - * @author - */ public final class POAObjectKeyTemplate extends NewObjectKeyTemplateBase { /** This constructor reads the template ONLY from the stream. --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java 2015-04-30 20:13:13.543450987 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java 2015-04-30 20:13:13.459450987 +0400 @@ -245,7 +245,7 @@ /** * Returns a string representation of this stub. Returns the same string * for all stubs that represent the same remote object. - * "SimpleIORImpl[,[]data, ...]" + * {@code "SimpleIORImpl[,[]data, ...]"} * @return a string representation of this stub. */ public String toString() --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java 2015-04-30 20:13:13.887450987 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java 2015-04-30 20:13:13.803450987 +0400 @@ -33,9 +33,6 @@ import org.omg.CORBA_2_3.portable.InputStream ; -/** - * @author - */ public class TaggedProfileFactoryFinderImpl extends IdentifiableFactoryFinderBase { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java 2015-04-30 20:13:14.227450987 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java 2015-04-30 20:13:14.147450987 +0400 @@ -38,9 +38,6 @@ import com.sun.corba.se.impl.encoding.MarshalOutputStream ; import com.sun.corba.se.impl.encoding.MarshalInputStream ; -/** - * @author - */ public class CodeSetsComponentImpl extends TaggedComponentBase implements CodeSetsComponent { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java 2015-04-30 20:13:14.567450986 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java 2015-04-30 20:13:14.483450987 +0400 @@ -32,9 +32,6 @@ import com.sun.corba.se.spi.ior.iiop.IIOPAddress ; -/** - * @author - */ abstract class IIOPAddressBase implements IIOPAddress { // Ports are marshalled as shorts on the wire. The IDL --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java 2015-04-30 20:13:14.907450986 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java 2015-04-30 20:13:14.823450986 +0400 @@ -32,9 +32,6 @@ import com.sun.corba.se.spi.orbutil.closure.Closure ; -/** - * @author - */ public final class IIOPAddressClosureImpl extends IIOPAddressBase { private Closure host; --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java 2015-04-30 20:13:15.251450986 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java 2015-04-30 20:13:15.167450986 +0400 @@ -36,9 +36,6 @@ import com.sun.corba.se.impl.logging.IORSystemException ; -/** - * @author - */ public final class IIOPAddressImpl extends IIOPAddressBase { private ORB orb ; --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2015-04-30 20:13:15.591450986 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2015-04-30 20:13:15.507450986 +0400 @@ -76,9 +76,6 @@ import com.sun.corba.se.impl.logging.IORSystemException; -/** - * @author - */ public class IIOPProfileImpl extends IdentifiableBase implements IIOPProfile { private ORB orb ; --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java 2015-04-30 20:13:15.935450985 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java 2015-04-30 20:13:15.851450985 +0400 @@ -55,7 +55,6 @@ import com.sun.corba.se.spi.orb.ORB ; /** - * @author * If getMinorVersion==0, this does not contain any tagged components */ public class IIOPProfileTemplateImpl extends TaggedProfileTemplateBase --- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java 2015-04-30 20:13:16.283450985 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java 2015-04-30 20:13:16.199450985 +0400 @@ -33,9 +33,6 @@ import com.sun.corba.se.spi.ior.iiop.JavaCodebaseComponent ; -/** - * @author - */ public class JavaCodebaseComponentImpl extends TaggedComponentBase implements JavaCodebaseComponent { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java 2015-04-30 20:13:16.623450985 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java 2015-04-30 20:13:16.543450985 +0400 @@ -92,7 +92,7 @@ * Return the next n bindings. It also returns true or false, indicating * whether there were more bindings. * @param how_many The number of requested bindings in the BindingList. - * @param bl The BindingList as an out parameter. + * @param blh The BindingList as an out parameter. * @return true if there were more bindings. * @exception org.omg.CORBA.SystemException One of a fixed set of CORBA * system exceptions. --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java 2015-04-30 20:13:16.971450985 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java 2015-04-30 20:13:16.891450985 +0400 @@ -90,7 +90,7 @@ /** * Create a error print stream to the supplied file. - * @param logFile the file to which error messages will go. + * @param errFile the file to which error messages will go. * @exception IOException thrown if the file cannot be opened for output. */ public static void makeErrStream(File errFile) --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java 2015-04-30 20:13:17.331450984 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java 2015-04-30 20:13:17.247450984 +0400 @@ -33,7 +33,7 @@ * will be stored in this object. This object is capable of storing CorbaLoc * profiles as defined in the CorbaName grammer. * - * @Author Hemanth + * @author Hemanth */ public class CorbanameURL extends INSURLBase { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java 2015-04-30 20:13:17.683450984 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java 2015-04-30 20:13:17.603450984 +0400 @@ -32,7 +32,7 @@ * host information used in creating the Service Object reference * from the -ORBInitDef and -ORBDefaultInitDef definitions. * - * @Author Hemanth + * @author Hemanth */ public class IIOPEndpointInfo { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java 2015-04-30 20:13:18.087450984 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURL.java 2015-04-30 20:13:17.967450984 +0400 @@ -29,7 +29,7 @@ * INS URL is a generic interface for two different types of URL's specified * in INS spec. * - * @Author Hemanth + * @author Hemanth */ public interface INSURL { public boolean getRIRFlag( ); --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java 2015-04-30 20:13:18.447450983 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java 2015-04-30 20:13:18.363450983 +0400 @@ -30,7 +30,7 @@ /** * This class is the entry point to parse different types of INS URL's. * - * @Author Hemanth + * @author Hemanth */ public class INSURLHandler { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java 2015-04-30 20:13:18.799450983 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/namingutil/Utility.java 2015-04-30 20:13:18.719450983 +0400 @@ -36,7 +36,7 @@ /** * Utility methods for Naming. * - * @Author Hemanth + * @author Hemanth */ class Utility { private static NamingSystemException wrapper = --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java 2015-04-30 20:13:19.151450983 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NameService.java 2015-04-30 20:13:19.067450983 +0400 @@ -186,7 +186,7 @@ /** * getObjectReferenceFromKey returns the Object reference from the objectkey using POA.create_reference_with_id method * @param Object Key as String - * @returns reference an CORBA.Object. + * @return a CORBA.Object reference. */ org.omg.CORBA.Object getObjectReferenceFromKey( String key ) { @@ -205,7 +205,7 @@ /** * getObjectKey gets the Object Key from the reference using POA.reference_to_id method * @param reference an CORBA.Object. - * @returns Object Key as String + * @return Object Key as String */ String getObjectKey( org.omg.CORBA.Object reference ) { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java 2015-04-30 20:13:19.495450982 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java 2015-04-30 20:13:19.411450983 +0400 @@ -1140,10 +1140,9 @@ /** * This operation creates a stringified name from the array of Name * components. - * @param n Name of the object

+ * @param n Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.

- * + * Indicates the name does not identify a binding. */ public String to_string(org.omg.CosNaming.NameComponent[] n) throws org.omg.CosNaming.NamingContextPackage.InvalidName @@ -1167,10 +1166,9 @@ /** * This operation converts a Stringified Name into an equivalent array * of Name Components. - * @param sn Stringified Name of the object

+ * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.

- * + * Indicates the name does not identify a binding. */ public org.omg.CosNaming.NameComponent[] to_name(String sn) throws org.omg.CosNaming.NamingContextPackage.InvalidName @@ -1204,14 +1202,13 @@ * This operation creates a URL based "iiopname://" format name * from the Stringified Name of the object. * @param addr internet based address of the host machine where - * Name Service is running

- * @param sn Stringified Name of the object

+ * Name Service is running + * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.

+ * Indicates the name does not identify a binding. * @exception org.omg.CosNaming.NamingContextPackage.InvalidAddress * Indicates the internet based address of the host machine is - * incorrect

- * + * incorrect */ public String to_url(String addr, String sn) @@ -1247,14 +1244,13 @@ /** * This operation resolves the Stringified name into the object * reference. - * @param sn Stringified Name of the object

+ * @param sn Stringified Name of the object * @exception org.omg.CosNaming.NamingContextPackage.NotFound - * Indicates there is no object reference for the given name.

+ * Indicates there is no object reference for the given name. * @exception org.omg.CosNaming.NamingContextPackage.CannotProceed - * Indicates that the given compound name is incorrect

+ * Indicates that the given compound name is incorrect * @exception org.omg.CosNaming.NamingContextExtPackage.InvalidName - * Indicates the name does not identify a binding.

- * + * Indicates the name does not identify a binding. */ public org.omg.CORBA.Object resolve_str(String sn) throws org.omg.CosNaming.NamingContextPackage.NotFound, --- old/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-04-30 20:13:19.859450982 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2015-04-30 20:13:19.775450982 +0400 @@ -585,7 +585,7 @@ * Create an NVList * * @param count size of list to create - * @result NVList created + * @return NVList created * * @see NVList */ @@ -599,7 +599,7 @@ * Create an NVList corresponding to an OperationDef * * @param oper operation def to use to create list - * @result NVList created + * @return NVList created * * @see NVList */ @@ -612,7 +612,7 @@ /** * Create a NamedValue * - * @result NamedValue created + * @return NamedValue created */ public synchronized NamedValue create_named_value(String s, Any any, int flags) { @@ -623,7 +623,7 @@ /** * Create an ExceptionList * - * @result ExceptionList created + * @return ExceptionList created */ public synchronized org.omg.CORBA.ExceptionList create_exception_list() { @@ -634,7 +634,7 @@ /** * Create a ContextList * - * @result ContextList created + * @return ContextList created */ public synchronized org.omg.CORBA.ContextList create_context_list() { @@ -645,7 +645,7 @@ /** * Get the default Context object * - * @result the default Context object + * @return the default Context object */ public synchronized org.omg.CORBA.Context get_default_context() { @@ -656,7 +656,7 @@ /** * Create an Environment * - * @result Environment created + * @return Environment created */ public synchronized org.omg.CORBA.Environment create_environment() { @@ -719,7 +719,7 @@ /** * Get the next request that has gotten a response. * - * @result the next request ready with a response. + * @return the next request ready with a response. */ public org.omg.CORBA.Request get_next_response() throws org.omg.CORBA.WrongTransaction --- old/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java 2015-04-30 20:13:20.231450982 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/GetPropertyAction.java 2015-04-30 20:13:20.147450982 +0400 @@ -35,7 +35,7 @@ * AccessController.doPrivileged. * *

The following code retrieves the value of the system - * property named "prop" as a privileged action:

+ * property named "prop" as a privileged action: * * 

  * String s = (String) java.security.AccessController.doPrivileged(
@@ -67,7 +67,7 @@
      * value of that property.
      *
      * @param theProp the name of the system property.
-     * @param defaulVal the default value.
+     * @param defaultVal the default value.
      */
     public GetPropertyAction(String theProp, String defaultVal) {
         this.theProp = theProp;
--- old/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java	2015-04-30 20:13:20.571450982 +0400
+++ new/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java	2015-04-30 20:13:20.491450982 +0400
@@ -126,7 +126,6 @@
  *    // ...  other similar traversal and update methods ...
  * }
  *
- *

* @see Semaphore *

[ Introduction to this package. ] **/ --- old/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java 2015-04-30 20:13:20.915450981 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java 2015-04-30 20:13:20.831450981 +0400 @@ -276,10 +276,9 @@ * For example, you can use an ObservableSync * (perhaps as part of a LayeredSync) in order to obtain callbacks * before and after each method invocation for a given class. - *

- + * *

[ Introduction to this package. ] -**/ + **/ public interface Sync { --- old/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java 2015-04-30 20:13:21.259450981 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/pept/transport/Acceptor.java 2015-04-30 20:13:21.175450981 +0400 @@ -59,7 +59,7 @@ /** * Used to determine if an Acceptor has been initialized. * - * @return trueAcceptor has been + * @return true if the Acceptor has been * initialized. */ public boolean initialized(); @@ -74,7 +74,7 @@ /** * Set the - * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache} + * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache} * to be used by this Acceptor. * * PEPt uses separate caches for each type of Acceptor @@ -88,7 +88,7 @@ /** * Get the - * {@link com.sun.corba.se.pept.transport.Inbound.ConnectionCache InboundConnectionCache} + * {@link com.sun.corba.se.pept.transport.InboundConnectionCache InboundConnectionCache} * used by this Acceptor * * PEPt uses separate caches for each type of Acceptor --- old/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java 2015-04-30 20:13:21.603450981 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/extension/ServantCachingPolicy.java 2015-04-30 20:13:21.519450981 +0400 @@ -44,7 +44,7 @@ *

    *
  1. POA current semantics *
  2. Proper handling of POA destroy. -*
      +*
    * POA current semantics requires maintaining a ThreadLocal stack of * invocation information that is always available for POACurrent operations. * Maintaining this stack is expensive on the timescale of optimized co-located --- old/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java 2015-04-30 20:13:21.943450980 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java 2015-04-30 20:13:21.863450980 +0400 @@ -30,8 +30,7 @@ /** * This interface is implemented by our implementation of * PortableInterceptor.ClientRequestInfo and - * PortableInterceptor.ServerRequestInfo.

    - * + * PortableInterceptor.ServerRequestInfo. */ public interface RequestInfoExt --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java 2015-04-30 20:13:22.283450980 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java 2015-04-30 20:13:22.203450980 +0400 @@ -27,13 +27,9 @@ import java.util.*; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * A Cleaner Abstraction to provide a Monitored Attribute of type 'Long' - *

    */ public abstract class LongMonitoredAttributeBase extends MonitoredAttributeBase { @@ -42,20 +38,14 @@ /** - *

    * Constructs LongMonitoredAttribute, by creating the * MonitoredAttributeInfo with 'Long' as the class type. * Users are expected to extend this class and provide the implementation * for getValue() and if needed clearState() as well. - *

    - *

    * - * @param name of tthe MonitoredAttribute - *

    - *

    + * @param name of the MonitoredAttribute * @param description of the Attribute, Please provid a well thought out * description, so that the admin can make sense of the attribute supplied. - *

    */ public LongMonitoredAttributeBase(String name, String description) { super( name ); --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java 2015-04-30 20:13:22.627450980 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java 2015-04-30 20:13:22.543450980 +0400 @@ -28,15 +28,11 @@ import java.util.*; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * Monitored Attribute is the interface to represent a Monitorable * Attribute. Using this interface, one can get the value of the attribute * and set the value if it is a writeable attribute. - *

    */ public interface MonitoredAttribute { @@ -44,34 +40,25 @@ // operations /** - *

    * Gets the Monitored Attribute Info for the attribute. - *

    - *

    * * @param monitoredAttributeInfo for this Monitored Attribute. - *

    */ public MonitoredAttributeInfo getAttributeInfo(); /** - *

    * Sets the value for the Monitored Attribute if isWritable() is false, the * method will throw ILLEGAL Operation exception. * * Also, the type of 'value' should be same as specified in the * MonitoredAttributeInfo for a particular instance. - *

    - *

    * * @param value should be any one of the Basic Java Type Objects which are * Long, Double, Float, String, Integer, Short, Character, Byte. - *

    */ public void setValue(Object value); /** - *

    * Gets the value of the Monitored Attribute. The value can be obtained * from different parts of the module. User may choose to delegate the call * to getValue() to other variables. @@ -79,34 +66,21 @@ * NOTE: It is important to make sure that the type of Object returned in * getvalue is same as the one specified in MonitoredAttributeInfo for this * attribute. - *

    - *

    - * - *

    - *

    * * @param value is the current value for this MonitoredAttribute - *

    */ public Object getValue(); /** - *

    * Gets the name of the Monitored Attribute. - *

    - *

    * - * @param name of this Attribute - *

    + * @return name of this Attribute */ public String getName(); /** - *

    * If this attribute needs to be cleared, the user needs to implement this * method to reset the state to initial state. If the Monitored Attribute * doesn't change like for example (ConnectionManager High Water Mark), * then clearState() is a No Op. - *

    - * */ public void clearState(); --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java 2015-04-30 20:13:22.971450980 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java 2015-04-30 20:13:22.887450980 +0400 @@ -27,16 +27,11 @@ import java.util.*; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * A Convenient class provided to help users extend and implement only * getValue(), if there is no need to clear the state and the attribute is not * writable. - * - *

    */ public abstract class MonitoredAttributeBase implements MonitoredAttribute { String name; --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java 2015-04-30 20:13:23.311450979 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java 2015-04-30 20:13:23.227450979 +0400 @@ -27,14 +27,10 @@ import java.util.*; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * Monitored AttributeInfo contains the meta information of the Monitored * Attribute. - *

    */ public interface MonitoredAttributeInfo { @@ -42,45 +38,38 @@ // operations /** - *

    * If the Attribute is writable from ASAdmin then isWritable() will return * true. - *

    - *

    * * @return a boolean with true or false - *

    */ public boolean isWritable(); /** - *

    * isStatistic() is true if the attribute is presented as a Statistic. - *

    - *

    * * @return a boolean with true or false - *

    */ public boolean isStatistic(); /** - *

    - * Class Type: We will allow only basic class types: 1)Boolean 2)Integer - * 3)Byte 4)Long 5)Float 6)Double 7)String 8)Character - *

    - *

    + * Class Type: We will allow only basic class types: + *

      + *
    1. Boolean
      2. + *
    2. Integer
      3. + *
    3. Byte
      4. + *
    4. Long
      5. + *
    5. Float
      6. + *
    6. Double
      7. + *
    7. String
      8. + *
    8. Character
      9. + *
    * * @return a Class Type - *

    */ public Class type(); /** - *

    * Get's the description for the Monitored Attribute. - *

    - *

    * * @return a String with description - *

    */ public String getDescription(); --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java 2015-04-30 20:13:23.651450979 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java 2015-04-30 20:13:23.567450979 +0400 @@ -25,17 +25,12 @@ package com.sun.corba.se.spi.monitoring; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * MonitoredAttributeInfoFactory used mostly by internal classes. If the * User needs to define some special MonitoredAttributes like a Character * type Monitored Attribute, they can use this factory to build the meta * information. - * - *

    */ public interface MonitoredAttributeInfoFactory { --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java 2015-04-30 20:13:23.991450979 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObject.java 2015-04-30 20:13:23.911450979 +0400 @@ -30,161 +30,101 @@ import java.util.Collection; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * Monitored Object provides an Hierarchichal view of the ORB Monitoring * System. It can contain multiple children and a single parent. Each * Monitored Object may also contain Multiple Monitored Attributes. - *

    */ public interface MonitoredObject { /////////////////////////////////////// // operations /** - *

    * Gets the name of this MonitoredObject - *

    * * @return a String with name of this Monitored Object - *

    */ public String getName(); /** - *

    * Gets the description of MonitoredObject - *

    * * @return a String with Monitored Object Description. - *

    */ public String getDescription(); /** - *

    * This method will add a child Monitored Object to this Monitored Object. - *

    - *

    - *

    */ public void addChild( MonitoredObject m ); /** - *

    * This method will remove child Monitored Object identified by the given name - *

    - *

    + * * @param name of the ChildMonitored Object - *

    */ public void removeChild( String name ); /** - *

    * Gets the child MonitoredObject associated with this MonitoredObject * instance using name as the key. The name should be fully qualified name * like orb.connectionmanager - *

    - *

    * * @return a MonitoredObject identified by the given name - *

    - *

    * @param name of the ChildMonitored Object - *

    */ public MonitoredObject getChild(String name); /** - *

    * Gets all the Children registered under this instance of Monitored * Object. - *

    - *

    * * @return Collection of immediate Children associated with this MonitoredObject. - *

    */ public Collection getChildren(); /** - *

    * Sets the parent for this Monitored Object. - *

    - *

    - *

    */ public void setParent( MonitoredObject m ); /** - *

    * There will be only one parent for an instance of MontoredObject, this * call gets parent and returns null if the Monitored Object is the root. - *

    - *

    * * @return a MonitoredObject which is a Parent of this Monitored Object instance - *

    */ public MonitoredObject getParent(); /** - *

    * Adds the attribute with the given name. - *

    - *

    * - *

    - *

    * @param value is the MonitoredAttribute which will be set as one of the * attribute of this MonitoredObject. - *

    */ public void addAttribute(MonitoredAttribute value); /** - *

    * Removes the attribute with the given name. - *

    - *

    * - *

    - *

    * @param name is the MonitoredAttribute name - *

    */ public void removeAttribute(String name); /** - *

    * Gets the Monitored Object registered by the given name - *

    * - *

    * @return a MonitoredAttribute identified by the given name - *

    - *

    * @param name of the attribute - *

    */ public MonitoredAttribute getAttribute(String name); /** - *

    * Gets all the Monitored Attributes for this Monitored Objects. It doesn't * include the Child Monitored Object, that needs to be traversed using * getChild() or getChildren() call. - *

    - *

    * * @return Collection of all the Attributes for this MonitoredObject - *

    */ public Collection getAttributes(); /** - *

    * Clears the state of all the Monitored Attributes associated with the * Monitored Object. It will also clear the state on all it's child * Monitored Object. The call to clearState will be initiated from * CORBAMBean.startMonitoring() call. - *

    - * */ public void clearState(); --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java 2015-04-30 20:13:24.339450978 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java 2015-04-30 20:13:24.255450979 +0400 @@ -29,17 +29,13 @@ import com.sun.corba.se.impl.monitoring.MonitoringManagerFactoryImpl; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * This is used for getting the default factories for * MonitoredObject, MonitoredAttributeInfo and MonitoringManager. We do not * expect users to use the MonitoredAttributeInfo factory most of the time * because the Info is automatically built by StringMonitoredAttributeBase * and LongMonitoredAttributeBase. - *

    */ public class MonitoringFactories { /////////////////////////////////////// @@ -57,20 +53,15 @@ // operations /** - *

    * Gets the MonitoredObjectFactory - *

    - *

    * * @return a MonitoredObjectFactory - *

    */ public static MonitoredObjectFactory getMonitoredObjectFactory( ) { return monitoredObjectFactory; } /** - *

    * Gets the MonitoredAttributeInfoFactory. The user is not expected to use this * Factory, since the MonitoredAttributeInfo is internally created by * StringMonitoredAttributeBase, LongMonitoredAttributeBase and @@ -79,11 +70,8 @@ * build a DoubleMonitoredAttributeBase like LongMonitoredAttributeBase * and build a MonitoredAttributeInfo required by MonitoredAttributeBase * internally by using this Factory. - *

    - *

    * * @return a MonitoredAttributeInfoFactory - *

    */ public static MonitoredAttributeInfoFactory getMonitoredAttributeInfoFactory( ) @@ -92,18 +80,14 @@ } /** - *

    * Gets the MonitoredManagerFactory. The user is not expected to use this * Factory, since the ORB will be automatically initialized with the * MonitoringManager. * * User can get hold of MonitoringManager associated with ORB by calling * orb.getMonitoringManager( ) - *

    - *

    * * @return a MonitoredManagerFactory - *

    */ public static MonitoringManagerFactory getMonitoringManagerFactory( ) { return monitoringManagerFactory; --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java 2015-04-30 20:13:24.683450978 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManager.java 2015-04-30 20:13:24.599450978 +0400 @@ -30,15 +30,11 @@ import java.util.*; /** - *

    * Monitoring Manager will have a 1 to 1 association with the ORB. This * gives access to the top level Monitored Object, using which more * Monitored Objects and Attributes can be added and traversed. - *

    - *

    * * @author Hemanth Puttaswamy - *

    */ public interface MonitoringManager extends Closeable { @@ -46,23 +42,14 @@ // operations /** - *

    * Gets the Root Monitored Object which contains a Hierarchy Of Monitored * Objects exposing various Monitorable Attributes of Various modules. - *

    - *

    - * - * @param MonitoredObject ... - *

    */ public MonitoredObject getRootMonitoredObject(); /** - *

    * Initialize is called whenever there is a start monitoring call to CORBA * MBean. This will result in triaging initialize to all the * MonitoredObjects and it's Monitored Attributes. - *

    - * */ public void clearState(); --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java 2015-04-30 20:13:25.027450978 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java 2015-04-30 20:13:24.943450978 +0400 @@ -25,14 +25,10 @@ package com.sun.corba.se.spi.monitoring; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * MonitoringObjectFactory is used internally by the ORB, It is not for * general public use. - *

    */ public interface MonitoringManagerFactory { /** --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java 2015-04-30 20:13:25.367450978 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java 2015-04-30 20:13:25.283450978 +0400 @@ -27,15 +27,11 @@ import java.util.*; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * StatisticsMonitoredAttribute is provided as a convenience to collect the * Statistics of any entity. The getValue() call will be delegated to the * StatisticsAccumulator set by the user. - *

    */ public class StatisticMonitoredAttribute extends MonitoredAttributeBase { @@ -55,32 +51,19 @@ /** - *

    * Constructs the StaisticMonitoredAttribute, builds the required * MonitoredAttributeInfo with Long as the class type and is always * readonly attribute. - *

    - *

    * * @param name Of this attribute - *

    - *

    - * @return a StatisticMonitoredAttribute - *

    - *

    * @param desc should provide a good description on the kind of statistics * collected, a good example is "Connection Response Time Stats will Provide the * detailed stats based on the samples provided from every request completion * time" - *

    - *

    * @param s is the StatisticsAcumulator that user will use to accumulate the * samples and this Attribute Object will get the computed statistics values * from. - *

    - *

    * @param mutex using which clearState() and getValue() calls need to be locked. - *

    */ public StatisticMonitoredAttribute(String name, String desc, StatisticsAccumulator s, Object mutex) --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java 2015-04-30 20:13:25.711450977 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java 2015-04-30 20:13:25.627450977 +0400 @@ -27,11 +27,8 @@ import java.util.*; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * StatisticsAccumulator accumulates the samples provided by the user and * computes the value of minimum, maximum, sum and sample square sum. When * the StatisticMonitoredAttribute calls getValue(), it will compute all @@ -42,7 +39,6 @@ * Users can easily extend this class and provide the implementation of * toString() method to format the stats as desired. By default all the stats * are printed in a single line. - *

    */ public class StatisticsAccumulator { @@ -72,19 +68,12 @@ /** - *

    * User will use this method to just register a sample with the * StatisticsAccumulator. This is the only method that User will use to * expose the statistics, internally the StatisticMonitoredAttribute will * collect the information when requested from the ASAdmin. - *

    - *

    - * - *

    - *

    * * @param value a double value to make it more precise - *

    */ public void sample(double value) { sampleCount++; @@ -137,19 +126,11 @@ } /** - *

    * Construct the Statistics Accumulator by providing the unit as a String. - * The examples of units are "Hours", "Minutes", - * "Seconds", "MilliSeconds", "Micro Seconds" - * etc., - *

    - *

    + * The examples of units are {@literal "Hours", "Minutes", + * "Seconds", "MilliSeconds", "Micro Seconds"} etc. * - * @return a StatisticsAccumulator with ... - *

    - *

    * @param unit a String representing the units for the samples collected - *

    */ public StatisticsAccumulator( String unit ) { this.unit = unit; --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java 2015-04-30 20:13:26.051450977 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java 2015-04-30 20:13:25.971450977 +0400 @@ -27,14 +27,10 @@ import java.util.*; /** - *

    - * * @author Hemanth Puttaswamy - *

    - *

    + * * A Convenient Abstraction to present String type Monitored Attribute. One * of the examples of StringMonitoredAttribute is the State information. - *

    */ public abstract class StringMonitoredAttributeBase extends MonitoredAttributeBase @@ -45,20 +41,11 @@ /** - *

    * Constructs StringMonitoredAttribute with the MonitoredAttributeInfo * built with the class type of String. - *

    - *

    * * @param name of this attribute - *

    - *

    * @param description of this attribute - *

    - *

    - * @return a StringMonitoredAttributeBase - *

    */ public StringMonitoredAttributeBase(String name, String description) { super( name ); --- old/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java 2015-04-30 20:13:26.395450977 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java 2015-04-30 20:13:26.311450977 +0400 @@ -111,7 +111,7 @@ *
  3. oa.returnServant()
    4. *
  4. oa.exit()
    5. *
  5. pop info
    6. -*
      +*
    * * REVISIT: Is this the required order for exit/pop? Cna they be nested instead? * Note that getInvocationServant and returnServant may throw exceptions. In such cases, --- old/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java 2015-04-30 20:13:26.735450976 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java 2015-04-30 20:13:26.655450977 +0400 @@ -46,8 +46,8 @@ * in the state machine, as the state could be corrupted. * Any exception thrown by the Action for the transition * will be propagated to doIt. - * @param FSM fsm is the state machine causing this action. - * @param Input in is the input that caused the transition. + * @param fsm the state machine causing this action. + * @param in the input that caused the transition. */ public void doIt( FSM fsm, Input in ) ; } --- old/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java 2015-04-30 20:13:27.075450976 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContext.java 2015-04-30 20:13:26.995450976 +0400 @@ -42,9 +42,8 @@ * the service context and provides any needed methods for manipulating * the service context. Each subclass must provide the following * members: -*

    *

      -* a public static final int SERVICE_CONTEXT_ID that gives the OMG +*
    • a public static final int SERVICE_CONTEXT_ID that gives the OMG * (or other) defined id for the service context. This is needed for the * registration mechanism defined in ServiceContexts. OMG defined * service context ids are taken from section 13.6.7 of ptc/98-12-04.
      • --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java 2015-04-30 20:13:27.419450976 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java 2015-04-30 20:13:27.335450976 +0400 @@ -80,7 +80,7 @@ } // generate /** Access the attribute generator. - @returns an object which implements the AttributeGen interface. + @return an object which implements the AttributeGen interface. @see AttributeGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java 2015-04-30 20:13:27.763450976 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ConstEntry.java 2015-04-30 20:13:27.679450976 +0400 @@ -90,7 +90,7 @@ } // generate /** Access the constant generator. - @returns an object which implements the ConstGen interface. + @return an object which implements the ConstGen interface. @see ConstGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java 2015-04-30 20:13:28.103450975 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java 2015-04-30 20:13:28.023450975 +0400 @@ -84,7 +84,7 @@ } // generate /** Access the enumerator generator. - @returns an object which implements the EnumGen interface. + @return an object which implements the EnumGen interface. @see EnumGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java 2015-04-30 20:13:28.447450975 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java 2015-04-30 20:13:28.367450975 +0400 @@ -80,7 +80,7 @@ } // generate /** Access the exception generator. - @returns an object which implements the ExceptionGen interface. + @return an object which implements the ExceptionGen interface. @see ExceptionGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java 2015-04-30 20:13:28.791450975 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardEntry.java 2015-04-30 20:13:28.707450975 +0400 @@ -83,7 +83,7 @@ } // generate /** Access the interface generator. - @returns an object which implements the InterfaceGen interface. + @return an object which implements the InterfaceGen interface. @see InterfaceGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java 2015-04-30 20:13:29.135450975 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java 2015-04-30 20:13:29.051450975 +0400 @@ -79,7 +79,7 @@ } // generate /** Access the interface generator. - @returns an object which implements the ForwardValueGen interface. + @return an object which implements the ForwardValueGen interface. @see ValueGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java 2015-04-30 20:13:29.479450974 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java 2015-04-30 20:13:29.391450974 +0400 @@ -81,7 +81,7 @@ } // generate /** Access the Include type generator. - @returns an object which implements the IncludeGen interface. + @return an object which implements the IncludeGen interface. @see IncludeGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java 2015-04-30 20:13:29.819450974 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java 2015-04-30 20:13:29.735450974 +0400 @@ -111,7 +111,7 @@ } // generate /** Access the interface generator. - @returns an object which implements the InterfaceGen interface. + @return an object which implements the InterfaceGen interface. @see InterfaceGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java 2015-04-30 20:13:30.163450974 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java 2015-04-30 20:13:30.079450974 +0400 @@ -89,7 +89,7 @@ } // generate /** Access the method generator. - @returns an object which implements the MethodGen interface. + @return an object which implements the MethodGen interface. @see MethodGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java 2015-04-30 20:13:30.503450973 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ModuleEntry.java 2015-04-30 20:13:30.419450973 +0400 @@ -84,7 +84,7 @@ } // generate /** Access the module generator. - @returns an object which implements the ModuleGen interface. + @return an object which implements the ModuleGen interface. @see ModuleGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java 2015-04-30 20:13:30.843450973 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/NativeEntry.java 2015-04-30 20:13:30.763450973 +0400 @@ -73,7 +73,7 @@ } // generate /** Access the constant generator. - @returns an object which implements the ConstGen interface. + @return an object which implements the ConstGen interface. @see ConstGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java 2015-04-30 20:13:31.183450973 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ParameterEntry.java 2015-04-30 20:13:31.099450973 +0400 @@ -88,7 +88,7 @@ } // generate /** Access the parameter generator. - @returns an object which implements the ParameterGen interface. + @return an object which implements the ParameterGen interface. @see ParameterGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java 2015-04-30 20:13:31.523450973 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PragmaEntry.java 2015-04-30 20:13:31.443450973 +0400 @@ -80,7 +80,7 @@ } // generate /** Access the Include type generator. - @returns an object which implements the IncludeGen interface. + @return an object which implements the IncludeGen interface. @see IncludeGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java 2015-04-30 20:13:31.867450972 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/PrimitiveEntry.java 2015-04-30 20:13:31.783450972 +0400 @@ -81,7 +81,7 @@ } // generate /** Access the primitive type generator. - @returns an object which implements the PrimitiveGen interface. + @return an object which implements the PrimitiveGen interface. @see PrimitiveGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java 2015-04-30 20:13:32.207450972 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/RepositoryID.java 2015-04-30 20:13:32.123450972 +0400 @@ -68,8 +68,8 @@ /** * Determine is a supplied string meets the minimal format requirement * for a Repository ID. - * @return true iff supplied string has form ':', where - * is any non-empty string not containing ':'. + * @return true if supplied string has form {@code ':'}, where + * {@code } is any non-empty string not containing ':'. **/ public static boolean hasValidForm (String string) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java 2015-04-30 20:13:32.551450972 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SequenceEntry.java 2015-04-30 20:13:32.467450972 +0400 @@ -101,7 +101,7 @@ } // generate /** Access the sequence generator. - @returns an object which implements the SequenceGen interface. + @return an object which implements the SequenceGen interface. @see SequenceGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java 2015-04-30 20:13:32.891450971 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StringEntry.java 2015-04-30 20:13:32.811450971 +0400 @@ -91,7 +91,7 @@ } // generate /** Access the primitive type generator. - @returns an object which implements the PrimitiveGen interface. + @return an object which implements the PrimitiveGen interface. @see PrimitiveGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java 2015-04-30 20:13:33.235450971 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/StructEntry.java 2015-04-30 20:13:33.151450971 +0400 @@ -90,7 +90,7 @@ } // generate /** Access the struct generator. - @returns an object which implements the StructGen interface. + @return an object which implements the StructGen interface. @see StructGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java 2015-04-30 20:13:33.575450971 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabEntry.java 2015-04-30 20:13:33.495450971 +0400 @@ -127,7 +127,7 @@ /** Get the name of this entry's module. If there are modules within modules, each module name is separated by '/'. - @returns this entry's module name. */ + @return this entry's module name. */ public String module () { return _module; --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java 2015-04-30 20:13:33.919450971 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/SymtabFactory.java 2015-04-30 20:13:33.839450971 +0400 @@ -97,7 +97,7 @@ char, octet, short, long, etc. The reason it is not limited to these is that, as an extender, you may wish to override these names. For instance, when generating Java code, octet translates to byte, - so there is an entry in Compile.overrideNames: <"octet", "byte"> + so there is an entry in Compile.overrideNames: {@code <"octet", "byte">} and a PrimitiveEntry in the symbol table for "byte". */ PrimitiveEntry primitiveEntry (String name); --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java 2015-04-30 20:13:34.259450970 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Token.java 2015-04-30 20:13:34.179450970 +0400 @@ -332,7 +332,7 @@ * @param boolean[] collidesWithKeyword is an array containing one value: a flag * representing whether this string is an identifier that collides with a keyword. * This is set by this method. - * @returns Token The resulting Token corresponding to string. + * @return Token The resulting Token corresponding to string. */ public static Token makeKeywordToken( String string, float corbaLevel, boolean escapedOK, boolean[] collision ) --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java 2015-04-30 20:13:34.607450970 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/TypedefEntry.java 2015-04-30 20:13:34.523450970 +0400 @@ -110,7 +110,7 @@ } /** Access the typedef generator. - @returns an object which implements the TypedefGen interface. + @return an object which implements the TypedefGen interface. @see TypedefGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java 2015-04-30 20:13:34.947450970 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/UnionEntry.java 2015-04-30 20:13:34.867450970 +0400 @@ -93,7 +93,7 @@ } // generate /** Access the union generator. - @returns an object which implements the UnionGen interface. + @return an object which implements the UnionGen interface. @see UnionGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java 2015-04-30 20:13:35.287450969 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueBoxEntry.java 2015-04-30 20:13:35.207450970 +0400 @@ -77,7 +77,7 @@ } // generate /** Access the value generator. - @returns an object which implements the ValueGen interface. + @return an object which implements the ValueGen interface. @see ValueGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java 2015-04-30 20:13:35.623450969 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java 2015-04-30 20:13:35.543450969 +0400 @@ -86,7 +86,7 @@ } // generate /** Access the value generator. - @returns an object which implements the ValueGen interface. + @return an object which implements the ValueGen interface. @see ValueGen */ public Generator generator () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java 2015-04-30 20:13:35.975450969 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java 2015-04-30 20:13:35.895450969 +0400 @@ -43,11 +43,11 @@ /** * This class contains values. Objects of this class are the terminal * nodes of an expression tree. - * + *

      * Note that there is a constructor for Double values, but not Float. * CORBA defines that all floating point expressions are evaluated as * double, and that the result is coerced back to float if necessary. - * + *

      * Note also that there is a constructor for long values, but not for * int or short. CORBA defines that all integral expressions are evaluated * as unsigned long. A CORBA long is a Java int. There is no unsigned int --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java 2015-04-30 20:13:36.335450969 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java 2015-04-30 20:13:36.255450969 +0400 @@ -260,7 +260,7 @@ } // packageFromProps /** - * d57482 method added so default emitter check could be overriden. + * d57482 (klr) method added so default emitter check could be overriden. **/ protected void setDefaultEmitter () { // If the flag -fclient was not found, assume it. --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java 2015-04-30 20:13:36.699450968 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java 2015-04-30 20:13:36.615450968 +0400 @@ -64,7 +64,7 @@ } // ctor /** - * Added for 2.4 RTF + * (d62023-klr) Added for 2.4 RTF **/ protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { @@ -83,7 +83,7 @@ } // abstractMethod /** - * Added for 2.4 RTF + * (d62023-klr) Added for 2.4 RTF **/ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java 2015-04-30 20:13:37.047450968 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java 2015-04-30 20:13:36.963450968 +0400 @@ -70,7 +70,7 @@ /** * Generate the heading, including package, imports, class statements, * and open curly. - * - don't implement ValueHelper, make non-boxed helpers abstract + * d62023 - don't implement ValueHelper, make non-boxed helpers abstract **/ protected void writeHeading () { @@ -92,8 +92,10 @@ /** * Generate the instance variables. - * - no helper instance except for boxed valuetypes. - * - move truncatable_ids to mapped class. + * 

      +   * d62023 - no helper instance except for boxed valuetypes;
+   *        - move truncatable_ids to mapped class.
+   *
      **/ protected void writeInstVars () { @@ -110,9 +112,9 @@ } // writeInstVars /** - * generate members of BoxedValueHelper interface if boxed + * d62023 - generate members of BoxedValueHelper interface if boxed * - * Hook in here to write factory methods for non-boxed ValueTypes + * d62023 - hook in here to write factory methods for non-boxed ValueTypes * into Helper. **/ protected void writeValueHelperInterface () @@ -143,8 +145,8 @@ } // writeHelperFactories /** - * Generate constructors only for boxed valuetype helpers - * All other helpers are abstract. + * d62023 - generate constructors only for boxed valuetype helpers. + * All other helpers are abstract. **/ protected void writeCtors () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java 2015-04-30 20:13:37.387450968 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java 2015-04-30 20:13:37.303450968 +0400 @@ -190,17 +190,19 @@ /** * Generate the interface. Provides general algorithm for binding generation: - * 1.) Initialize members unique to this generator. - init () - * 2.) Open print stream - openStream () - * 3.) Write class heading (package, prologue, class statement, open curly - writeHeading () - * 4.) Write class body (member data and methods) - write*Body () - * 5.) Write class closing (close curly) - writeClosing () - * 6.) Close the print stream - closeStream () + *
        + *
      1. Initialize members unique to this generator - init()
        2. + *
      2. Open print stream - openStream()
        3. + *
      3. Write class heading (package, prologue, class statement, open curly - writeHeading()
        4. + *
      4. Write class body (member data and methods) - write*Body()
        5. + *
      5. Write class closing (close curly) - writeClosing()
        6. + *
      6. Close the print stream - closeStream ()
        7. + *
      * * For CORBA 2.3, interfaces are mapped to Operations and Signature * interfaces. The Operations interface contains the method definitions. * The Signature interface extends the Operations interface and adds - * CORBA::Object. + * CORBA::Object. (klr) **/ protected void generateInterface () { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java 2015-04-30 20:13:37.735450967 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java 2015-04-30 20:13:37.655450968 +0400 @@ -96,7 +96,7 @@ } /** - * Write the methodEntry for a valuetype factory method into + * d62023 - write the methodEntry for a valuetype factory method into * the Value Helper class. Contents from email from Simon, * 4/25/99. **/ @@ -135,7 +135,7 @@ } // helperFactoryMethod /** - * - write an abstract method definition + * d62023 - write an abstract method definition **/ protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { @@ -152,8 +152,8 @@ } // abstractMethod /** - * - write a default factory method implementation for the - * DefaultFactory. m is a methodEntry for a factory + * d62023 - write a default factory method implementation for the + * {@code DefaultFactory}. m is a methodEntry for a factory * method contained in a non-abstract ValueEntry. **/ protected void defaultFactoryMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) @@ -176,7 +176,7 @@ } // defaultFactoryMethod /** - * - remove all valueInitializer junk + * d62023 - remove all valueInitializer junk **/ protected void writeMethodSignature () { @@ -242,7 +242,7 @@ } // writeMethodSignature /** - * - delete method templates for valuetypes + * d62023 - delete method templates for valuetypes **/ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java 2015-04-30 20:13:38.083450967 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java 2015-04-30 20:13:37.999450967 +0400 @@ -74,7 +74,7 @@ } // ctor /** - * - write an abstract method definition + * d62023 - write an abstract method definition **/ protected void abstractMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { @@ -91,7 +91,7 @@ } // abstractMethod /** - * - delete method templates for valuetypes + * d62023 - delete method templates for valuetypes **/ protected void interfaceMethod (Hashtable symbolTable, MethodEntry m, PrintWriter stream) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java 2015-04-30 20:13:38.419450967 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java 2015-04-30 20:13:38.339450967 +0400 @@ -69,7 +69,7 @@ } // ctor /** - * - Move from helper to mapped class + * d62023 - Move from helper to mapped class **/ protected void writeTruncatable () // { @@ -84,7 +84,7 @@ /** - * + * d62023 **/ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { @@ -144,7 +144,7 @@ } // helperWrite /** - * + * d62023 **/ public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { --- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java 2015-04-30 20:13:38.771450967 +0400 +++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java 2015-04-30 20:13:38.683450967 +0400 @@ -73,15 +73,17 @@ } // ctor /** - * - delete constructor; helper is abstract + * d62023 - delete constructor; helper is abstract **/ protected void writeConstructor () { } // writeConstructor /** - * - delete write_value from non-boxed helpers - * - delete _write from non-boxed helpers + * 
      +   * d62023 - delete write_value from non-boxed helpers
+   *        - delete _write from non-boxed helpers
+   *
      **/ public void helperWrite (SymtabEntry entry, PrintWriter stream) { @@ -91,7 +93,7 @@ } // helperWrite /** - * + * d62023 **/ public void helperRead (String entryName, SymtabEntry entry, PrintWriter stream) { @@ -101,7 +103,7 @@ } // helperRead /** - * - suppress initializers from mapped value; now generated in + * d62023 - suppress initializers from mapped value; now generated in * the Helper class and Factory class **/ protected void writeInitializers () @@ -110,7 +112,7 @@ } // writeInitializers /** - * - Goes in mapped class, not Helper + * d62023 - goes in mapped class, not Helper **/ protected void writeTruncatable () // { @@ -155,7 +157,7 @@ } /** - * CustomMarshal -> CustomValue for custom valuetypes + * d62023 - CustomMarshal {@literal ->} CustomValue for custom valuetypes * mapped class is abstract **/ protected void writeHeading () @@ -217,7 +219,7 @@ } // writeHeading /** - * - private state maps to protected, not default + * d62023 - private state maps to protected, not default **/ protected void writeMembers () { @@ -245,8 +247,7 @@ } // writeMembers /** - * Methods need to be abstract - * writeStreamable + * d62023 - methods need to be abstract writeStreamable **/ protected void writeMethods () { @@ -294,7 +295,7 @@ } // writeMethods /** - * Call super._read() + * d62023 - call super._read() **/ public int read (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { @@ -335,7 +336,7 @@ } // read /** - * Call super._write() + * d62023 - call super._write() **/ public int write (int index, String indent, String name, SymtabEntry entry, PrintWriter stream) { @@ -374,7 +375,7 @@ } // write /** - * <62023> - generate factory interface and default factory + * d62023 - generate factory interface and default factory **/ public void generate (Hashtable symbolTable, ValueEntry v, PrintWriter str) { --- old/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java 2015-04-30 20:13:39.119450966 +0400 +++ new/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/Type.java 2015-04-30 20:13:39.039450966 +0400 @@ -51,7 +51,7 @@ * conformance checking and name mapping as defined in the "Java to IDL * Mapping" OMG specification. The family is composed of the following * fixed set of types: - * 
      + * 
      {@literal
  *
  *                                              +- RemoteType <-- AbstractType
  *                                              |
@@ -67,7 +67,7 @@
  *                                              |
  *                                              +- NCClassType
  *
- * 
      
+ * }
      * PrimitiveType represents a primitive or a void type. *

      * CompoundType is an abstract base representing any non-special class