--- old/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2015-05-05 20:14:58.015833430 +0400
+++ new/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2015-05-05 20:14:57.931833430 +0400
@@ -171,9 +171,9 @@
* @param out The stream to write the value to
* @param value The value to be written to the stream
**/
- public void writeValue(org.omg.CORBA.portable.OutputStream _out,
+ public void writeValue(org.omg.CORBA.portable.OutputStream out,
java.io.Serializable value) {
- writeValueWithVersion(_out, value, STREAM_FORMAT_VERSION_1);
+ writeValueWithVersion(out, value, STREAM_FORMAT_VERSION_1);
}
private void writeValueWithVersion(org.omg.CORBA.portable.OutputStream _out,
@@ -240,25 +240,25 @@
* Reads a value from the stream using java semantics.
* @param in The stream to read the value from
* @param clazz The type of the value to be read in
- * @param sender The sending context runtime
+ * @param rt The sending context runtime
**/
- public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream _in,
+ public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream in,
int offset,
java.lang.Class clazz,
String repositoryID,
- org.omg.SendingContext.RunTime _sender)
+ org.omg.SendingContext.RunTime rt)
{
// Must use narrow rather than a direct cast to a com.sun
// class. Fix for bug 4379539.
- CodeBase sender = CodeBaseHelper.narrow(_sender);
+ CodeBase sender = CodeBaseHelper.narrow(rt);
- org.omg.CORBA_2_3.portable.InputStream in =
- (org.omg.CORBA_2_3.portable.InputStream) _in;
+ org.omg.CORBA_2_3.portable.InputStream inStream =
+ (org.omg.CORBA_2_3.portable.InputStream) in;
if (!useHashtables) {
if (inputStreamBridge == null) {
inputStreamBridge = createInputStream();
- inputStreamBridge.setOrbStream(in);
+ inputStreamBridge.setOrbStream(inStream);
inputStreamBridge.setSender(sender); //d11638
// backward compatability 4365188
inputStreamBridge.setValueHandler(this);
@@ -269,7 +269,7 @@
try {
inputStreamBridge.increaseRecursionDepth();
- result = (java.io.Serializable) readValueInternal(inputStreamBridge, in, offset, clazz, repositoryID, sender);
+ result = (java.io.Serializable) readValueInternal(inputStreamBridge, inStream, offset, clazz, repositoryID, sender);
} finally {
@@ -287,16 +287,16 @@
if (inputStreamPairs == null)
inputStreamPairs = new Hashtable();
- jdkToOrbInputStreamBridge = (IIOPInputStream)inputStreamPairs.get(_in);
+ jdkToOrbInputStreamBridge = (IIOPInputStream)inputStreamPairs.get(in);
if (jdkToOrbInputStreamBridge == null) {
jdkToOrbInputStreamBridge = createInputStream();
- jdkToOrbInputStreamBridge.setOrbStream(in);
+ jdkToOrbInputStreamBridge.setOrbStream(inStream);
jdkToOrbInputStreamBridge.setSender(sender); //d11638
// backward compatability 4365188
jdkToOrbInputStreamBridge.setValueHandler(this);
- inputStreamPairs.put(_in, jdkToOrbInputStreamBridge);
+ inputStreamPairs.put(in, jdkToOrbInputStreamBridge);
}
java.io.Serializable result = null;
@@ -304,12 +304,12 @@
try {
jdkToOrbInputStreamBridge.increaseRecursionDepth();
- result = (java.io.Serializable) readValueInternal(jdkToOrbInputStreamBridge, in, offset, clazz, repositoryID, sender);
+ result = (java.io.Serializable) readValueInternal(jdkToOrbInputStreamBridge, inStream, offset, clazz, repositoryID, sender);
} finally {
if (jdkToOrbInputStreamBridge.decreaseRecursionDepth() == 0) {
- inputStreamPairs.remove(_in);
+ inputStreamPairs.remove(in);
}
}
--- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java 2015-05-05 20:14:58.383833429 +0400
+++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java 2015-05-05 20:14:58.299833429 +0400
@@ -37,9 +37,6 @@
import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
-/**
- * @author
- */
public class ObjectKeyImpl implements ObjectKey
{
private ObjectKeyTemplate oktemp;
--- old/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java 2015-05-05 20:14:58.723833429 +0400
+++ new/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java 2015-05-05 20:14:58.643833429 +0400
@@ -35,9 +35,6 @@
import org.omg.CORBA.INTERNAL ;
-/**
- * @author
- */
public class TaggedProfileTemplateFactoryFinderImpl extends
IdentifiableFactoryFinderBase
{
--- old/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2015-05-05 20:14:59.067833429 +0400
+++ new/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java 2015-05-05 20:14:58.983833429 +0400
@@ -593,7 +593,7 @@
* @param className the name of the class.
* @param remoteCodebase a space-separated list of URLs at which
* the class might be found. May be null.
- * @param loadingContext a class whose ClassLoader may be used to
+ * @param loader a class whose ClassLoader may be used to
* load the class if all other methods fail.
* @return the Class
object representing the loaded class.
* @exception ClassNotFoundException if class cannot be loaded.
--- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java 2015-05-05 20:14:59.411833429 +0400
+++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java 2015-05-05 20:14:59.331833429 +0400
@@ -114,7 +114,7 @@
* scope, It will be called from NamingContext.list() operation or
* this.next_n().
* @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.
*/
public boolean list( int how_many, org.omg.CosNaming.BindingListHolder blh)
--- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java 2015-05-05 20:14:59.763833428 +0400
+++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java 2015-05-05 20:14:59.679833428 +0400
@@ -181,7 +181,7 @@
* exists. The NamingContext will participate in recursive resolving.
* @param n a sequence of NameComponents which is the name under which
* the object will be bound.
- * @param obj the NamingContect object reference to be bound.
+ * @param nc the NamingContext object reference to be bound.
* @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with
* multiple components was supplied, but the first component could not be
* resolved.
@@ -278,7 +278,7 @@
* resolving.
* @param n a sequence of NameComponents which is the name under which
* the object will be bound.
- * @param obj the object reference to be bound.
+ * @param nc the object reference to be bound.
* @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with
* multiple components was supplied, but the first component could not be
* resolved.
@@ -853,10 +853,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 @@ -882,10 +881,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 @@ -920,14 +918,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) @@ -961,15 +958,15 @@ /** * 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. * @exception org.omg.CosNaming.NamingContextPackage.AlreadyBound - * Indicates the name is already bound.
+ * Indicates the name is already bound. * */ public org.omg.CORBA.Object resolve_str(String sn) --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java 2015-05-05 20:15:00.115833428 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java 2015-05-05 20:15:00.031833428 +0400 @@ -63,7 +63,6 @@ * @param orb a org.omg.CORBA.ORB object. * @param aTable A hashtable containing InternalBindingValues which is * the content of the TransientNamingContext. - * @param java.lang.Exception a Java exception. * @exception Exception a Java exception thrown of the base class cannot * initialize. */ --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java 2015-05-05 20:15:00.451833428 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java 2015-05-05 20:15:00.371833428 +0400 @@ -85,7 +85,7 @@ * NamingContext, whose object * reference can be obtained by the initialNamingContext method. * @param orb The ORB object - * @param nameserviceName Stringified key used for INS Service registry + * @param serviceName Stringified key used for INS Service registry * @exception org.omg.CORBA.INITIALIZE Thrown if * the TransientNameService cannot initialize. */ --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java 2015-05-05 20:15:00.795833427 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java 2015-05-05 20:15:00.711833427 +0400 @@ -116,8 +116,8 @@ * Runs the super constructor. * @param orb an ORB object. * @param objKey as String - * @param TheNameService as NameService - * @param TheServantManagerImpl as ServantManagerImpl + * @param theNameService as NameService + * @param theServantManagerImpl as ServantManagerImpl * @exception java.lang.Exception a Java exception. */ @@ -223,7 +223,7 @@ * exists. The NamingContext will participate in recursive resolving. * @param n a sequence of NameComponents which is the name under which * the object will be bound. - * @param obj the NamingContect object reference to be bound. + * @param nc the NamingContect object reference to be bound. * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with multiple * components was supplied, but the first component could not be * resolved. @@ -301,7 +301,7 @@ * unbound first. The NamingContext will participate in recursive resolving. * @param n a sequence of NameComponents which is the name under which * the object will be bound. - * @param obj the object reference to be bound. + * @param nc the object reference to be bound. * @exception org.omg.CosNaming.NamingContextPackage.NotFound A name with multiple * components was supplied, but the first component could not be * resolved. @@ -907,7 +907,7 @@ * The doResolve( ) method calls Resolve( ) recursively to resolve n level * Names. * @param n a sequence of NameComponents which is the name to be resolved. - * @param bt Type of binding (as object or as context). + * @param bth Type of binding (as object or as context). * @return the object reference bound under the supplied name. * @exception org.omg.CosNaming.NamingContextPackage.NotFound Neither a NamingContext * or a Corba Object reference not found under this Name --- old/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java 2015-05-05 20:15:01.315833427 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java 2015-05-05 20:15:01.231833427 +0400 @@ -64,7 +64,6 @@ * @param orb a org.omg.CORBA.ORB object. * @param aTable A hashtable containing InternalBindingValues which is * the content of the PersistentNamingContext. - * @param java.lang.Exception a Java exception. * @exception Exception a Java exception thrown of the base class cannot * initialize. */ --- old/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java 2015-05-05 20:15:01.655833427 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java 2015-05-05 20:15:01.571833427 +0400 @@ -61,7 +61,7 @@ * Its characteristics include: *
[ Introduction to this package. ] - + * [ Introduction to this package. ] **/ public class CondVar { --- old/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java 2015-05-05 20:15:02.683833426 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java 2015-05-05 20:15:02.599833426 +0400 @@ -181,11 +181,11 @@ * } * } * } - * + * *
* Here is an even fancier version, that uses lock re-ordering * upon conflict: - *
+ **{@code * class Cell { * long value; * Sync lock = ...; @@ -214,8 +214,8 @@ * } * catch (InterruptedException ex) { return; } * } - *} - *+ * } + * }
* Interruptions are in general handled as early as possible. * Normally, InterruptionExceptions are thrown @@ -248,7 +248,7 @@ * it is normally best to just use acquire(), various forms * of busy waits can be implemented. For a simple example * (but one that would probably never be preferable to using acquire()): - *
+ **{@code * class X { * Sync lock = ... * void spinUntilAcquired() throws InterruptedException { @@ -269,7 +269,7 @@ * } * } * } - *+ * }
* In addition pure synchronization control, Syncs * may be useful in any context requiring before/after methods. @@ -277,7 +277,7 @@ * (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. ] + * [ Introduction to this package. ] **/ --- old/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java 2015-05-05 20:15:03.027833426 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java 2015-05-05 20:15:02.943833426 +0400 @@ -130,13 +130,13 @@ * This method must be synchronized since one WorkerThread could * be reclaming connections inside the synchronized backingStore * block and a second WorkerThread (or a SelectorThread) could have - * already executed the if (numberOfConnections <= .... ). As a + * already executed the if (numberOfConnections {@literal <=} .... ). As a * result the second thread would also attempt to reclaim connections. * * If connection reclamation becomes a performance issue, the connection * reclamation could make its own task and consequently executed in * a separate thread. - * Currently, the accept & reclaim are done in the same thread, WorkerThread + * Currently, the accept {@literal &} reclaim are done in the same thread, WorkerThread * by default. It could be changed such that the SelectorThread would do * it for SocketChannels and WorkerThreads for Sockets by updating the * ParserTable. --- old/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html 2015-05-05 20:15:03.371833425 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html 2015-05-05 20:15:03.287833425 +0400 @@ -41,8 +41,8 @@
In all cases, containment is represented by having the appropriate interface (IOR and --- old/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java 2015-05-05 20:15:03.715833425 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java 2015-05-05 20:15:03.631833425 +0400 @@ -48,7 +48,7 @@ * * property.
* - * Example:
+ * Example: *
* -Dcom.sun.CORBA.connection.ORBSocketFactoryClass=MySocketFactory @@ -145,7 +145,7 @@ * * property.* - * Example usage:
+ * Example usage: * *
* ... \ @@ -203,7 +203,7 @@ * Once you have the port you may add information to references * created by the associated adapter by calling * - *IORInfo::add_ior_component
+ *
IORInfo::add_ior_component
* * * Note: if one is using a POA and the lifespan policy of that @@ -247,7 +247,7 @@ * *
ORBConstants.BAD_SERVER_ID_HANDLER_CLASS_PROPERTY
* - * Example:
+ * Example: * *
* @@ -271,7 +271,7 @@ *SOCKET_FACTORY_CLASS_PROPERTY
and *LISTEN_SOCKET_PROPERTY
* - * as used by other clients and servers in your distributed system.+ * as used by other clients and servers in your distributed system. * */ public ServerSocket createServerSocket(String type, int port) @@ -324,7 +324,7 @@ * * The
SocketInfo
given togetEndPointInfo
* is either null or an object obtained - * fromGetEndPointInfoAgainException
+ * from
GetEndPointInfoAgainException
* */ public SocketInfo getEndPointInfo(org.omg.CORBA.ORB orb, @@ -333,7 +333,7 @@ /** - * DEPRECATED. DEPRECATED. DEPRECATED. DEPRECATED.* * This method is used by a client side ORB.
* @@ -346,7 +346,7 @@ * * If this method throws GetEndPointInfoAgainException then the * ORB calls
getEndPointInfo
again, passing it the - *SocketInfo
object contained in the exception.+ *
SocketInfo
object contained in the exception. * */ public Socket createSocket(SocketInfo socketInfo) --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java 2015-05-05 20:15:04.059833425 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java 2015-05-05 20:15:03.979833425 +0400 @@ -42,7 +42,7 @@ /** * Gets the Monitored Attribute Info for the attribute. * - * @param monitoredAttributeInfo for this Monitored Attribute. + * @return monitoredAttributeInfo for this Monitored Attribute. */ public MonitoredAttributeInfo getAttributeInfo(); /** @@ -67,7 +67,7 @@ * getvalue is same as the one specified in MonitoredAttributeInfo for this * attribute. * - * @param value is the current value for this MonitoredAttribute + * @return the current value for this MonitoredAttribute */ public Object getValue(); /** --- old/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java 2015-05-05 20:15:04.399833424 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java 2015-05-05 20:15:04.319833424 +0400 @@ -25,14 +25,9 @@ package com.sun.corba.se.spi.monitoring; /** - *- * * @author Hemanth Puttaswamy - *
- ** * MonitoredObject Factory to create Monitored Object. - *
*/ public interface MonitoredObjectFactory { /** --- old/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java 2015-05-05 20:15:04.739833424 +0400 +++ new/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java 2015-05-05 20:15:04.655833424 +0400 @@ -89,7 +89,7 @@ *
* Each of these 3 cases is handled a bit differently. On each request, assume as known @@ -113,9 +113,9 @@ *
Then, on each invocation:
+*Then, on each invocation: *
+ *
* @deprecated Deprecated by CORBA 2.3.
*/
@Deprecated
--- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java 2015-05-05 20:15:06.131833423 +0400
+++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java 2015-05-05 20:15:06.051833423 +0400
@@ -68,9 +68,9 @@
* must check the arguments passed to it for validity and process the
* arguments appropriately. If it detects an invalid argument, it should
* throw an InvalidArgument exception. Arguments MUST be of the form
- * `/ Used as a base class for implementation of a local IDL interface in the
+ * Used as a base class for implementation of a local IDL interface in the
* Java language mapping. It is a class which implements all the operations
* in the org.omg.CORBA.Object interface.
* Local interfaces are implemented by using CORBA::LocalObject
@@ -49,9 +49,10 @@
*
+ * Volume I - orbos/99-07-01
+ *
* @see Determines whether the two object references are equivalent,
+ * Determines whether the two object references are equivalent,
* so far as the ORB can easily determine. Two object references are equivalent
* if they are identical. Two distinct object references which in fact refer to
* the same object are also equivalent. However, ORBs are not required
--- old/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java 2015-05-05 20:15:09.243833420 +0400
+++ new/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java 2015-05-05 20:15:09.163833421 +0400
@@ -145,15 +145,15 @@
/**
* Return true if this type implements
- * isIDLEntity() && isException().
+ * {@code isIDLEntity() && isException()}.
*/
public boolean isIDLEntityException () {
return isIDLEntity() && isException();
}
/**
- * Return true if isIDLEntity() && !isValueBase()
+ * Return true if {@code isIDLEntity() && !isValueBase()
* && !isAbstractBase() && !isCORBAObject()
- * && !isIDLEntityException().
+ * && !isIDLEntityException()}.
*/
public boolean isBoxed () {
return (isIDLEntity() && !isValueBase() &&
@@ -1984,7 +1984,7 @@
}
/**
- * Return true if this is NOT a constructor && is not
+ * Return true if this is NOT a constructor {@code &&} is not
* an attribute.
*/
public boolean isNormalMethod () {
--- old/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java 2015-05-05 20:15:09.619833420 +0400
+++ new/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java 2015-05-05 20:15:09.535833420 +0400
@@ -95,7 +95,7 @@
}
/**
- * Return true if env.nerrors > 0.
+ * Return true if {@code env.nerrors > 0}.
*/
public boolean anyErrors () {
return env.nerrors > 0;
--- old/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java 2015-05-05 20:15:09.963833420 +0400
+++ new/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java 2015-05-05 20:15:09.879833420 +0400
@@ -91,8 +91,8 @@
/**
* Create and return a top-level type.
- * @param env The compiler environment.
* @param cdef The top-level class definition.
+ * @param stack The context stack.
* @return An RemoteType or null if is non-conforming.
*/
protected sun.rmi.rmic.iiop.CompoundType getTopType(ClassDefinition cdef,
@@ -169,7 +169,7 @@
* Examine and consume command line arguments.
* @param argv The command line arguments. Ignore null
* and unknown arguments. Set each consumed argument to null.
- * @param error Report any errors using the main.error() methods.
+ * @param main Report any errors using the main.error() methods.
* @return true if no errors, false otherwise.
*/
public boolean parseArgs(String argv[], Main main) {
@@ -195,11 +195,11 @@
else if ( argv[i].equalsIgnoreCase( "-init" ) ) {
factory = false;
argv[i] = null;
- }
+ }
else if ( argv[i].equalsIgnoreCase( "-factory" ) ) {
factory = true;
argv[i] = null;
- }
+ }
else if ( argv[i].equalsIgnoreCase( "-idlfile" ) ) {
argv[i] = null;
if ( ++i < argv.length && argv[i] != null && !argv[i].startsWith("-") ) {
@@ -210,7 +210,7 @@
argv[i] = null;
ifHash.put( idlFrom,idlTo );
continue nextArg;
- }
+ }
}
main.error("rmic.option.requires.argument", "-idlfile");
result = false;
@@ -403,7 +403,7 @@
* Write the output for the given OutputFileName into the output stream.
* (The IDL mapping for java.lang.Class is generated from
* javax.rmi.CORBA.ClassDesc in the tools workspace)
- * @param OutputType ot One of the items returned by getOutputTypesFor(...)
+ * @param ot One of the items returned by getOutputTypesFor(...)
* @param alreadyChecked A set of Types which have already been checked.
* Intended to be passed to Type.collectMatching(filter,alreadyChecked).
* @param p The output stream.
@@ -927,7 +927,7 @@
* Add reference for given type avoiding duplication.
* Sort into specials, arrays and regular references.
* Filter out types which are not required.
- * @param t Given Type
+ * @param ref Given Type
* @param refHash Hashtable for type references
* @param spcHash Hashtable for special type references
* @param arrHash Hashtable for array references
@@ -986,7 +986,7 @@
* Collect and filter thrown exceptions for a given pre-filtered method.
* Keep only 'checked' exception classes minus java.rmi.RemoteException
* and its subclasses
- * @param method The current method
+ * @param mth The current method
* @param excHash Hashtable containing non-duplicate thrown exceptions
*/
protected void getExceptions(
@@ -1077,7 +1077,7 @@
* order.
* Non-static, non-transient fields are mapped.
* If the type is a custom valuetype, only public fields are mapped.
- * @param ct The current CompoundType
+ * @param t The current CompoundType
* @return Vector containing the data fields
*/
protected Vector getData(
@@ -1163,7 +1163,7 @@
/**
* Write forward reference for boxed valuetype for single dimension of IDL
* sequence.
- * If the dimension is <1 and the element is a CompoundType, write a
+ * If the dimension is {@literal < 1} and the element is a CompoundType, write a
* forward declare for the element
* @param at ArrayType for forward declare
* @param dim The dimension to write
@@ -1276,7 +1276,7 @@
/**
* Write #includes
- * @param incHash Hashtable loaded with Types to include
+ * @param inhHash Hashtable loaded with Types to include
* @param p The output stream.
*/
protected void writeInheritedIncludes(
*
- * java com.sun.tools.corba.se.idl.toJava.compile [options]
*
* where <idl file> is the name of a file containing IDL definitions,
@@ -62,17 +62,17 @@
*
* Options:
*
- *
*
@@ -81,9 +81,9 @@
* time. Instead, these can be placed into a config file called idl.config.
* This file must be in the CLASSPATH. The format of the includes line is:
*
- *
+ *
*
* Note that the path separator character, here shown as a semicolon, is
* machine dependent. For instance, on Windows 95 this character is a
@@ -481,10 +481,10 @@
**/
public Arguments arguments = null;
/**
- * This hashtable contains {@code
* includes=
+ * }
*
**/
public class UnionBranch
--- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java 2015-05-05 20:15:07.851833422 +0400
+++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java 2015-05-05 20:15:07.767833422 +0400
@@ -87,37 +87,37 @@
*
* Options:
*
- * case 1: short x;
- *
- *
- * case 0:
- * case 8:
- * case 2: long x;
- *
- *
+ * {@code case 8:}
+ * {@code case 2: long x;}
+ *
- * default: long x;
- *
- *
- * case 0:
- * case 2:
- * default: char c;
- *
- *
+ * {@code case 2:}
+ * {@code default: char c;}
+ *
- *
*
@@ -127,9 +127,9 @@
* called idl.config. This file must be in the CLASSPATH. The format of
* the includes line is:
*
- *
+ *
*
* Note that the path separator character, here shown as a semicolon,
* is machine dependent. For instance, on Windows 95 this character
--- old/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java 2015-05-05 20:15:08.199833421 +0400
+++ new/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java 2015-05-05 20:15:08.115833421 +0400
@@ -534,7 +534,7 @@
} // holderName
/**
- * {@code
* includes=
+ * }LocalObject
is to be used as the base class of locally
* constrained objects, such as those in the PortableServer module.
* The specification here is based on the CORBA Components
- * Volume I - orbos/99-07-01CORBA
package
- * comments for unimplemented features
+ * comments for unimplemented features
*/
public class LocalObject implements org.omg.CORBA.Object
@@ -64,7 +65,7 @@
public LocalObject() {}
/**
- *