diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java
index fdf35018275..9a46afd1b88 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java
@@ -171,9 +171,9 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
* @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 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
* 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 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
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 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
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 @@ public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMulti
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);
}
}
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java
index ad2019a9559..ddf84a311e4 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java
@@ -37,9 +37,6 @@ import com.sun.corba.se.spi.ior.ObjectKeyTemplate ;
import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
-/**
- * @author
- */
public class ObjectKeyImpl implements ObjectKey
{
private ObjectKeyTemplate oktemp;
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java
index 8dba5d3fabb..ed09d58bf52 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java
@@ -35,9 +35,6 @@ import org.omg.CORBA_2_3.portable.InputStream ;
import org.omg.CORBA.INTERNAL ;
-/**
- * @author
- */
public class TaggedProfileTemplateFactoryFinderImpl extends
IdentifiableFactoryFinderBase
{
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
index 473cf6487ca..866d22c4370 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
@@ -593,7 +593,7 @@ public class Util implements javax.rmi.CORBA.UtilDelegate
* @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.
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java
index 31982454a9a..df8faeb7fa6 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java
@@ -114,7 +114,7 @@ public abstract class BindingIteratorImpl extends BindingIteratorPOA
* 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)
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java
index b591aad929c..3b2c19f3dd2 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java
@@ -181,7 +181,7 @@ public abstract class NamingContextImpl
* 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 @@ public abstract class NamingContextImpl
* 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 @@ public abstract class NamingContextImpl
/**
* 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 @@ public abstract class NamingContextImpl /** * 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 @@ public abstract class NamingContextImpl * 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 @@ public abstract class NamingContextImpl /** * 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) diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java index 736b353c56d..468a5339299 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java @@ -63,7 +63,6 @@ public class TransientBindingIterator extends BindingIteratorImpl * @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. */ diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java index 729191631b0..7842dd1f3a6 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java @@ -85,7 +85,7 @@ public class TransientNameService * 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. */ diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java index f6a7709bb37..67483e0d35b 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java @@ -116,8 +116,8 @@ public class NamingContextImpl * 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 @@ public class NamingContextImpl * 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 @@ public class NamingContextImpl * 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 @@ public class NamingContextImpl * 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 diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java index 621560888d8..7c43e6baea0 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java @@ -64,7 +64,6 @@ public class PersistentBindingIterator extends BindingIteratorImpl * @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. */ diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java index 780287b98ee..8290e179f58 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java @@ -61,7 +61,7 @@ import com.sun.corba.se.impl.protocol.JIDLLocalCRDImpl ; * Its characteristics include: *
[ Introduction to this package. ] - + * [ Introduction to this package. ] **/ public class CondVar { diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java index 154a597f78a..c696b795083 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Sync.java @@ -181,11 +181,11 @@ package com.sun.corba.se.impl.orbutil.concurrent; * } * } * } - * + * *
* Here is an even fancier version, that uses lock re-ordering * upon conflict: - *
+ * {@code
* class Cell {
* long value;
* Sync lock = ...;
@@ -214,8 +214,8 @@ package com.sun.corba.se.impl.orbutil.concurrent;
* }
* catch (InterruptedException ex) { return; }
* }
- *}
- *
+ * }
+ * }
* * Interruptions are in general handled as early as possible. * Normally, InterruptionExceptions are thrown @@ -248,7 +248,7 @@ package com.sun.corba.se.impl.orbutil.concurrent; * 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 @@ package com.sun.corba.se.impl.orbutil.concurrent;
* }
* }
* }
- *
+ * }
* * In addition pure synchronization control, Syncs * may be useful in any context requiring before/after methods. @@ -277,7 +277,7 @@ package com.sun.corba.se.impl.orbutil.concurrent; * (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. ] **/ diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java index 0cbce53ffc1..4f8aedafc3d 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java @@ -130,13 +130,13 @@ public abstract class CorbaConnectionCacheBase * 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. diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html index 2bdbb74e804..e3784dcc4a4 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/ior/package.html @@ -41,8 +41,8 @@ The abstract model of IORs works as follows:
In all cases, containment is represented by having the appropriate interface (IOR and diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java index d9e06b1b512..baf4eb7e560 100644 --- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java @@ -48,7 +48,7 @@ import com.sun.corba.se.spi.transport.SocketInfo; * * property.
* - * Example:
+ * Example: *
* -Dcom.sun.CORBA.connection.ORBSocketFactoryClass=MySocketFactory
@@ -145,7 +145,7 @@ public interface ORBSocketFactory
*
* property.
*
- * Example usage:
+ * Example usage:
*
*
* ... \
@@ -203,7 +203,7 @@ public interface ORBSocketFactory
* 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 @@ public interface ORBSocketFactory
*
* ORBConstants.BAD_SERVER_ID_HANDLER_CLASS_PROPERTY
*
- * Example:
+ * Example:
*
*
*
@@ -271,7 +271,7 @@ public interface ORBSocketFactory
* 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 @@ public interface ORBSocketFactory
*
* The SocketInfo given to getEndPointInfo
* is either null or an object obtained
- * from GetEndPointInfoAgainException
+ * from GetEndPointInfoAgainException
*
*/
public SocketInfo getEndPointInfo(org.omg.CORBA.ORB orb,
@@ -333,7 +333,7 @@ public interface ORBSocketFactory
/**
- * DEPRECATED. DEPRECATED. DEPRECATED. DEPRECATED.
*
* This method is used by a client side ORB.
*
@@ -346,7 +346,7 @@ public interface ORBSocketFactory
*
* 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)
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java
index 72cbce9c8de..094b33f5337 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttribute.java
@@ -42,7 +42,7 @@ public interface MonitoredAttribute {
/**
* 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 @@ public interface MonitoredAttribute {
* 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();
/**
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java
index 86feebb55b4..d7b03e7d701 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java
@@ -25,14 +25,9 @@
package com.sun.corba.se.spi.monitoring;
/**
- *
- *
* @author Hemanth Puttaswamy
- *
- *
*
* MonitoredObject Factory to create Monitored Object.
- *
*/
public interface MonitoredObjectFactory {
/**
diff --git a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java
index 244d9799a1d..dbe1ac9648c 100644
--- a/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java
+++ b/corba/src/java.corba/share/classes/com/sun/corba/se/spi/oa/ObjectAdapter.java
@@ -89,7 +89,7 @@ import com.sun.corba.se.spi.ior.IORTemplate ;
* * Each of these 3 cases is handled a bit differently. On each request, assume as known @@ -113,9 +113,9 @@ import com.sun.corba.se.spi.ior.IORTemplate ; *
Then, on each invocation:
+*Then, on each invocation: *
+ *
* @deprecated Deprecated by CORBA 2.3.
*/
@Deprecated
diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java
index 90185aec51d..35a03442c70 100644
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java
+++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/Arguments.java
@@ -68,9 +68,9 @@ public class Arguments
* 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 @@ import org.omg.CORBA.portable.*;
*
+ * 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
diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java
index fcbbaccfd4a..386e3082c36 100644
--- a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java
+++ b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/CompoundType.java
@@ -145,15 +145,15 @@ public abstract class CompoundType extends Type {
/**
* 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 @@ public abstract class CompoundType extends Type {
}
/**
- * 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 () {
diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java
index d79bfcbefd3..518d9a4f751 100644
--- a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java
+++ b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/ContextStack.java
@@ -95,7 +95,7 @@ public class ContextStack {
}
/**
- * Return true if env.nerrors > 0.
+ * Return true if {@code env.nerrors > 0}.
*/
public boolean anyErrors () {
return env.nerrors > 0;
diff --git a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java
index 5b0e56b8387..c29414a52dc 100644
--- a/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java
+++ b/corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java
@@ -91,8 +91,8 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
/**
* 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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
* 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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
argv[i] = null;
ifHash.put( idlFrom,idlTo );
continue nextArg;
- }
+ }
}
main.error("rmic.option.requires.argument", "-idlfile");
result = false;
@@ -403,7 +403,7 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
* 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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
* 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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
* 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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
* 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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
/**
* 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 @@ public class IDLGenerator extends sun.rmi.rmic.iiop.Generator {
/**
* 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 @@ import com.sun.tools.corba.se.idl.constExpr.DefaultExprFactory;
*
* Options:
*
- *
*
@@ -81,9 +81,9 @@ import com.sun.tools.corba.se.idl.constExpr.DefaultExprFactory;
* 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 class Compile
**/
public Arguments arguments = null;
/**
- * This hashtable contains {@code
* includes=
+ * }
*
**/
public class UnionBranch
diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java
index c9c9854b8e2..08aecd1dac5 100644
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java
+++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java
@@ -87,37 +87,37 @@ import com.sun.tools.corba.se.idl.InvalidArgument;
*
* 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 @@ import com.sun.tools.corba.se.idl.InvalidArgument;
* 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
diff --git a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
index 7e0d8373dab..7397619f2f2 100644
--- a/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
+++ b/corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Util.java
@@ -534,7 +534,7 @@ public class Util extends com.sun.tools.corba.se.idl.Util
} // 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 class LocalObject implements org.omg.CORBA.Object
public LocalObject() {}
/**
- *