Java cleanup - fix various javadoc issues

Change-Id: Ic292fddb1b9c0ba98b983b257059e50aa1963e46

19 files changed, 73 insertions, 83 deletions

diff --git a/jurt/com/sun/star/comp/connections/Acceptor.java b/jurt/com/sun/star/comp/connections/Acceptor.java
index 2d2f8af982a9..e70398dbf47c 100644
--- a/jurt/com/sun/star/comp/connections/Acceptor.java
+++ b/jurt/com/sun/star/comp/connections/Acceptor.java
@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKey;
  * components (like <code>com.sun.star.connection.socketAcceptor</code>) to
  * implement its functionality.</p>
  *
- * @see com.sun.star.connections.XAcceptor
- * @see com.sun.star.connections.XConnection
- * @see com.sun.star.connections.XConnector
+ * @see com.sun.star.connection.XAcceptor
+ * @see com.sun.star.connection.XConnection
+ * @see com.sun.star.connection.XConnector
  * @see com.sun.star.loader.JavaLoader
  *
  * @since UDK 1.0
@@ -100,8 +100,8 @@ public final class Acceptor implements XAcceptor {
      * @param connectionDescription the description of the connection.
      * @return an <code>XConnection</code> to the client.
      *
-     * @see com.sun.star.connections.XConnection
-     * @see com.sun.star.connections.XConnector
+     * @see com.sun.star.connection.XConnection
+     * @see com.sun.star.connection.XConnector
      */
     public XConnection accept(String connectionDescription) throws
         AlreadyAcceptingException, ConnectionSetupException,
diff --git a/jurt/com/sun/star/comp/connections/Connector.java b/jurt/com/sun/star/comp/connections/Connector.java
index da5925c6666f..98a065ed9679 100644
--- a/jurt/com/sun/star/comp/connections/Connector.java
+++ b/jurt/com/sun/star/comp/connections/Connector.java
@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKey;
  * components (like <code>com.sun.star.connection.socketConnector</code>) to
  * implement its functionality.</p>
  *
- * @see com.sun.star.connections.XAcceptor
- * @see com.sun.star.connections.XConnection
- * @see com.sun.star.connections.XConnector
+ * @see com.sun.star.connection.XAcceptor
+ * @see com.sun.star.connection.XConnection
+ * @see com.sun.star.connection.XConnector
  * @see com.sun.star.loader.JavaLoader
  *
  * @since UDK 1.0
@@ -98,8 +98,8 @@ public class Connector implements XConnector {
      * @param connectionDescription the description of the connection.
      * @return an <code>XConnection</code> to the server.
      *
-     * @see com.sun.star.connections.XAcceptor
-     * @see com.sun.star.connections.XConnection
+     * @see com.sun.star.connection.XAcceptor
+     * @see com.sun.star.connection.XConnection
      */
     public synchronized XConnection connect(String connectionDescription)
         throws NoConnectException, ConnectionSetupException
diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
index 4711b654ca33..f9dd02caea1f 100644
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
@@ -89,7 +89,7 @@ public class ConstantInstanceProvider implements XInstanceProvider {
      * Constructs a new <code>ConstantInstanceProvider</code>.
      * Uses the provided ServiceManager as the provided instance.
      * <p>
-     * @param    serviceName   the provided service manager
+     * @param    serviceManager   the provided service manager
      */
     public ConstantInstanceProvider(XMultiServiceFactory serviceManager) {
         _serviceManager = serviceManager;
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index a972ea977fea..04856ba925bf 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -35,7 +35,7 @@ import com.sun.star.registry.XRegistryKey;
  * in one Process.
  * <p>
  * @author      Kay Ramme
- * @see         com.sun.star.connections.XConnection
+ * @see         com.sun.star.connection.XConnection
  * @see         com.sun.star.loader.JavaLoader
  * @since       UDK1.0
  */
@@ -158,9 +158,9 @@ public class PipedConnection implements XConnection {
      * Read the required number of bytes.
      * <p>
      * @return   the number of bytes read
-     * @param    aReadBytes   the outparameter, where the bytes have to be placed
+     * @param    aReadBytes   the out parameter, where the bytes have to be placed
      * @param    nBytesToRead the number of bytes to read
-     * @see       com.sun.star.connections.XConnection#read
+     * @see      com.sun.star.connection.XConnection#read
      */
     public synchronized int read(/*OUT*/byte[][] aReadBytes, int nBytesToRead) throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         aReadBytes[0] = new byte[nBytesToRead];
@@ -214,7 +214,7 @@ public class PipedConnection implements XConnection {
      * Write bytes.
      * <p>
      * @param    aData the bytes to write
-     * @see       com.sun.star.connections.XConnection#write
+     * @see       com.sun.star.connection.XConnection#write
      */
     public void write(byte aData[]) throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         _otherSide.receive(aData);
@@ -223,7 +223,7 @@ public class PipedConnection implements XConnection {
     /**
      * Flushes the buffer, notifies if necessary the other side that new data has arrived.
      * <p>
-     * @see       com.sun.star.connections.XConnection#flush
+     * @see       com.sun.star.connection.XConnection#flush
      */
     public void flush() throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         synchronized(_otherSide) {
@@ -234,7 +234,7 @@ public class PipedConnection implements XConnection {
     /**
      * Closes the pipe.
      * <p>
-     * @see       com.sun.star.connections.XConnection#closed
+     * @see       com.sun.star.connection.XConnection#close()
      */
     public synchronized void close() throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         if(!_closed) {
@@ -250,7 +250,7 @@ public class PipedConnection implements XConnection {
      * Gives a description of this pipe.
      * <p>
      * @return  the description
-     * @see       com.sun.star.connections.XConnection#getDescription
+     * @see       com.sun.star.connection.XConnection#getDescription
      */
     public String getDescription() throws com.sun.star.uno.RuntimeException {
         return getClass().getName();
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 9ac66d00211b..73ff9d3f37bf 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -57,7 +57,6 @@ import com.sun.star.uno.AnyConverter;
  * @see         com.sun.star.loader.XImplementationLoader
  * @see         com.sun.star.loader.Java
  * @see         com.sun.star.comp.servicemanager.ServiceManager
- * @see         com.sun.star.lang.ServiceManager
  * @since       UDK1.0
  */
 public class JavaLoader implements XImplementationLoader,
@@ -143,7 +142,6 @@ public class JavaLoader implements XImplementationLoader,
     /**
      * Creates a new instance of the <code>JavaLoader</code> class.
      * <p>
-     * @return  new instance
      */
     public JavaLoader() {}
 
@@ -153,10 +151,8 @@ public class JavaLoader implements XImplementationLoader,
      * loading.
      * To set the <code>MultiServiceFactory</code> you can use the <code>com.sun.star.lang.XInitialization</code> interface, either.
      * <p>
-     * @return  new instance
      * @param   factory     the <code>ServiceManager</code>
-     * @see     com.sun.star.lang.ServiceManager
-     * @see     com.sun.star.lang.ServiceManager
+     * @see     com.sun.star.comp.servicemanager.ServiceManager
      * @see     com.sun.star.lang.XInitialization
      */
     public JavaLoader(XMultiServiceFactory factory) {
@@ -169,7 +165,7 @@ public class JavaLoader implements XImplementationLoader,
      * <p>
      * @param       args - the first parameter (args[0]) specifices the <code>ServiceManager</code>
      * @see         com.sun.star.lang.XInitialization
-     * @see         com.sun.star.lang.ServiceManager
+     * @see         com.sun.star.comp.servicemanager.ServiceManager
      */
     public void initialize( java.lang.Object[] args )
             throws com.sun.star.uno.Exception,
@@ -241,9 +237,9 @@ public class JavaLoader implements XImplementationLoader,
      * @param       implementationName          the implementation (class) name of the component
      * @param       implementationLoaderUrl     the URL of the implementation loader. Not used.
      * @param       locationUrl                 points to an archive (JAR file) which contains a component
-     * @param       xKey
-     * @see         com.sun.star.lang.XImplementationLoader
-     * @see         com.sun.star.com.loader.RegistrationClassFinder
+     * @param       xKey                        registry key
+     * @see         com.sun.star.loader.XImplementationLoader
+     * @see         com.sun.star.comp.loader.RegistrationClassFinder
      */
     public java.lang.Object activate( String implementationName,
                                       String implementationLoaderUrl,
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index 673db0468c3c..cc9b0323e8d8 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -216,7 +216,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * @param   args    the first argument ( args[0] ) specifices the SimpleRegistry object
      * @see     com.sun.star.lang.XInitialization
      * @see     com.sun.star.lang.RegistryServiceManager
-     * @see     com.sun.star.lang.XSimpleRegistry
+     * @see     com.sun.star.registry.XSimpleRegistry
      */
     public void initialize( Object args[] )
                 throws  com.sun.star.uno.Exception,
@@ -294,7 +294,7 @@ public class ServiceManager implements XMultiServiceFactory,
      * the name is looked up in the the implementation list.
      * <p>
      * @return  the factory of the service / implementation
-     * @param   serviceSpecifier    indicates the service or implementation name
+     * @param   serviceName    indicates the service or implementation name
      * @see     com.sun.star.lang.XMultiServiceFactory
      */
     private Object queryServiceFactory(String serviceName)
@@ -626,10 +626,10 @@ public class ServiceManager implements XMultiServiceFactory,
     }
 
     /**
-     * Provides an enumeration of all registred services.
+     * Provides an enumeration of all registered services.
      * <p>
-     * @return  an enumeration of all avialable services.
-     * @see     com.sun.star.conatiner.XEnumerationAccess
+     * @return  an enumeration of all available services.
+     * @see     com.sun.star.container.XEnumerationAccess
      */
     public XEnumeration createEnumeration()
             throws com.sun.star.uno.RuntimeException
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index fefe9cad0c7a..0d73e70a5c0b 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -43,7 +43,7 @@ import com.sun.star.uno.UnoRuntime;
  * This component gives a factory for an <code>UnoUrlResolver</code> service.
  * <p>
  * @author      Kay Ramme
- * @see         com.sun.star.brige.XBrideFactory
+ * @see         com.sun.star.bridge.XBridgeFactory
  * @see         com.sun.star.connection.Connector
  * @since       UDK1.0
  */
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
index 679359dea52f..bffe74048766 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -33,9 +33,9 @@ import com.sun.star.lib.util.NativeLibraryLoader;
  * This class is not part of the provided <code>api</code>.
  * <p>
  * @author      Kay Ramme
- * @see         com.sun.star.comp.connections.PipeAcceptor
- * @see         com.sun.star.comp.connections.PipeConnector
- * @see         com.sun.star.connections.XConnection
+ * @see         com.sun.star.lib.connections.pipe.pipeAcceptor
+ * @see         com.sun.star.lib.connections.pipe.pipeConnector
+ * @see         com.sun.star.connection.XConnection
  * @since       UDK1.0
  */
 public class PipeConnection implements XConnection, XConnectionBroadcaster {
@@ -58,7 +58,6 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * Constructs a new <code>PipeConnection</code>.
      * <p>
      * @param  description   the description of the connection
-     * @param  pipe        the pipe of the connection
      */
     public PipeConnection(String description)
         throws IOException
@@ -152,9 +151,9 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * Read the required number of bytes.
      * <p>
      * @return   the number of bytes read
-     * @param    aReadBytes   the outparameter, where the bytes have to be placed
+     * @param    bytes   the outparameter, where the bytes have to be placed
      * @param    nBytesToRead the number of bytes to read
-     * @see       com.sun.star.connections.XConnection#read
+     * @see       com.sun.star.connection.XConnection#read
      */
     public int read(/*OUT*/byte[][] bytes, int nBytesToRead)
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
@@ -172,7 +171,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * Write bytes.
      * <p>
      * @param    aData the bytes to write
-     * @see       com.sun.star.connections.XConnection#write
+     * @see       com.sun.star.connection.XConnection#write
      */
     public void write(byte aData[])
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
@@ -183,7 +182,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
     /**
      * Flushes the buffer.
      * <p>
-     * @see       com.sun.star.connections.XConnection#flush
+     * @see       com.sun.star.connection.XConnection#flush
      */
     public void flush()
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
@@ -194,7 +193,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
     /**
      * Closes the connection.
      * <p>
-     * @see       com.sun.star.connections.XConnection#close
+     * @see       com.sun.star.connection.XConnection#close
      */
     public void close()
         throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException
@@ -209,7 +208,7 @@ public class PipeConnection implements XConnection, XConnectionBroadcaster {
      * Gives a description of the connection.
      * <p>
      * @return  the description
-      * @see       com.sun.star.connections.XConnection#getDescription
+      * @see       com.sun.star.connection.XConnection#getDescription
      */
     public String getDescription() throws com.sun.star.uno.RuntimeException {
         return _aDescription;
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
index f83005f3e535..9ce1321569dd 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKey;
  * pipes for communication.  The <code>pipeAcceptor</code> is generally used
  * by the <code>com.sun.star.connection.Acceptor</code> service.</p>
  *
- * @see com.sun.star.connections.XAcceptor
- * @see com.sun.star.connections.XConnection
- * @see com.sun.star.connections.XConnector
+ * @see com.sun.star.connection.XAcceptor
+ * @see com.sun.star.connection.XConnection
+ * @see com.sun.star.connection.XConnector
  * @see com.sun.star.loader.JavaLoader
  *
  * @since UDK 1.0
@@ -101,8 +101,8 @@ public final class pipeAcceptor implements XAcceptor {
      * @param connectionDescription the description of the connection.
      * @return an <code>XConnection</code> to the client.
      *
-     * @see com.sun.star.connections.XConnection
-     * @see com.sun.star.connections.XConnector
+     * @see com.sun.star.connection.XConnection
+     * @see com.sun.star.connection.XConnector
      */
     public XConnection accept(String connectionDescription) throws
         AlreadyAcceptingException, ConnectionSetupException,
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java b/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
index e3f40d076a4c..3ac44464e205 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
+++ b/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKey;
  * pipes for communication.  The <code>pipeConnector</code> is generally
  * used by the <code>com.sun.star.connection.Connector</code> service.</p>
  *
- * @see com.sun.star.connections.XAcceptor
- * @see com.sun.star.connections.XConnection
- * @see com.sun.star.connections.XConnector
+ * @see com.sun.star.connection.XAcceptor
+ * @see com.sun.star.connection.XConnection
+ * @see com.sun.star.connection.XConnector
  * @see com.sun.star.loader.JavaLoader
  *
  * @since UDK 1.0
@@ -95,8 +95,8 @@ public final class pipeConnector implements XConnector {
      * @param connectionDescription the description of the connection.
      * @return an <code>XConnection</code> to the server.
      *
-     * @see com.sun.star.connections.XAcceptor
-     * @see com.sun.star.connections.XConnection
+     * @see com.sun.star.connection.XAcceptor
+     * @see com.sun.star.connection.XConnection
      */
     public synchronized XConnection connect(String connectionDescription)
         throws NoConnectException, ConnectionSetupException
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
index 9809f0eeaba0..373194d95866 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
@@ -37,9 +37,9 @@ import com.sun.star.io.XStreamListener;
  * This class is not part of the provided <code>api</code>.
  * <p>
  * @author      Kay Ramme
- * @see         com.sun.star.comp.connections.SocketAcceptor
- * @see         com.sun.star.comp.connections.SocketConnector
- * @see         com.sun.star.connections.XConnection
+ * @see         com.sun.star.lib.connections.socket.socketAcceptor
+ * @see         com.sun.star.lib.connections.socket.socketConnector
+ * @see         com.sun.star.connection.XConnection
  * @since       UDK1.0
  */
 public class SocketConnection implements XConnection, XConnectionBroadcaster {
@@ -118,9 +118,9 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
      * Read the required number of bytes.
      * <p>
      * @return   the number of bytes read
-     * @param    aReadBytes   the outparameter, where the bytes have to be placed
+     * @param    bytes   the outparameter, where the bytes have to be placed
      * @param    nBytesToRead the number of bytes to read
-     * @see       com.sun.star.connections.XConnection#read
+     * @see       com.sun.star.connection.XConnection#read
      */
     public int read(/*OUT*/byte[][] bytes, int nBytesToRead) throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         if(_firstRead) {
@@ -171,7 +171,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
      * Write bytes.
      * <p>
      * @param    aData the bytes to write
-     * @see       com.sun.star.connections.XConnection#write
+     * @see       com.sun.star.connection.XConnection#write
      */
     public void write(byte aData[]) throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         try {
@@ -190,7 +190,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
     /**
      * Flushes the buffer.
      * <p>
-     * @see       com.sun.star.connections.XConnection#flush
+     * @see       com.sun.star.connection.XConnection#flush
      */
     public void flush() throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         try {
@@ -207,7 +207,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
     /**
      * Closes the connection.
      * <p>
-     * @see       com.sun.star.connections.XConnection#close
+     * @see       com.sun.star.connection.XConnection#close
      */
     public void close() throws com.sun.star.io.IOException, com.sun.star.uno.RuntimeException {
         try {
@@ -228,7 +228,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster {
      * Gives a description of the connection.
      * <p>
      * @return  the description
-     * @see       com.sun.star.connections.XConnection#getDescription
+     * @see       com.sun.star.connection.XConnection#getDescription
      */
     public String getDescription() throws com.sun.star.uno.RuntimeException {
         return _description;
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
index 6a8ff8e67d41..10e3ae92ae62 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
@@ -38,9 +38,9 @@ import java.net.Socket;
  * sockets for communication.  The <code>socketAcceptor</code> is generally used
  * by the <code>com.sun.star.connection.Acceptor</code> service.</p>
  *
- * @see com.sun.star.connections.XAcceptor
- * @see com.sun.star.connections.XConnection
- * @see com.sun.star.connections.XConnector
+ * @see com.sun.star.connection.XAcceptor
+ * @see com.sun.star.connection.XConnection2
+ * @see com.sun.star.connection.XConnector
  * @see com.sun.star.loader.JavaLoader
  *
  * @since UDK 1.0
@@ -106,8 +106,8 @@ public final class socketAcceptor implements XAcceptor {
      * @param connectionDescription the description of the connection.
      * @return an <code>XConnection</code> to the client.
      *
-     * @see com.sun.star.connections.XConnection
-     * @see com.sun.star.connections.XConnector
+     * @see com.sun.star.connection.XConnection
+     * @see com.sun.star.connection.XConnector
      */
     public XConnection accept(String connectionDescription) throws
         AlreadyAcceptingException, ConnectionSetupException,
diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
index ca61f71bdabc..1c8822ffb13c 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
@@ -38,9 +38,9 @@ import java.net.UnknownHostException;
  * sockets for communication.  The <code>socketConnector</code> is generally
  * used by the <code>com.sun.star.connection.Connector</code> service.</p>
  *
- * @see com.sun.star.connections.XAcceptor
- * @see com.sun.star.connections.XConnection
- * @see com.sun.star.connections.XConnector
+ * @see com.sun.star.connection.XAcceptor
+ * @see com.sun.star.connection.XConnection
+ * @see com.sun.star.connection.XConnector
  * @see com.sun.star.loader.JavaLoader
  *
  * @since UDK 1.0
@@ -100,8 +100,8 @@ public final class socketConnector implements XConnector {
      * @param connectionDescription the description of the connection.
      * @return an <code>XConnection</code> to the server.
      *
-     * @see com.sun.star.connections.XAcceptor
-     * @see com.sun.star.connections.XConnection
+     * @see com.sun.star.connection.XAcceptor
+     * @see com.sun.star.connection.XConnection
      */
     public synchronized XConnection connect(String connectionDescription)
         throws NoConnectException, ConnectionSetupException
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
index fe3c8852ac37..776296dd6d85 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/BridgedObject.java
@@ -27,7 +27,7 @@ public final class BridgedObject {
     /**
      * Obtains the bridge associated with a bridged object.
      *
-     * @param object a reference to a (Java representation of a) UNO object;
+     * @param obj a reference to a (Java representation of a) UNO object;
      *     must not be null
      * @return the bridge associated with the given object, if it is indeed
      *     bridged; otherwise, null is returned
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 7b57e87c0687..1174becfb6a2 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -400,7 +400,7 @@ public class java_remote_bridge
      * Maps an object from destination environment to the source environment.
      * <p>
      * @return     the object in the source environment
-     * @param      object     the object to map
+     * @param      oId        the object to map
      * @param      type       the interface under which is to be mapped
      * @see                   com.sun.star.uno.IBridge#mapInterfaceFrom
      */
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java b/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
index 7d430bea30b8..1409787567d2 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IProtocol.java
@@ -63,7 +63,7 @@ public interface IProtocol {
      * @param function a non-null function (the name of a UNO interface method
      *     or attribute compatible with the given <code>type</code>, or either
      *     <code>"queryInterface"</code> or <code>"release"</code>)
-     * @param threadId a non-null TID
+     * @param tid a non-null TID
      * @param arguments a list of UNO arguments compatible with the given
      *     <code>type</code> and <code>function</code>; may be null to represent
      *     an empty list
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
index 0fd151d16c8a..7a2b8f4f3b47 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
@@ -66,7 +66,8 @@ public interface IThreadPool {
      * and a handle returned by attach.
      * The function exists for performance
      * optimization reasons.
-     * @see #attach,#detach
+     * @see #attach()
+     * @see #detach()
      */
     public void detach( Object handle, ThreadId id );
 
@@ -103,7 +104,7 @@ public interface IThreadPool {
      * all threads by throwing a <code>DisposedException</code> with the given
      * <code>Throwable</code> cause.
      * <p>
-     * @param throwing   the cause
+     * @param throwable   the cause
      */
     public void dispose(Throwable throwable);
 
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
index cc8d142ed68f..81b5d613bba4 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
@@ -60,11 +60,6 @@ public class Job {
      * Dispatches a <code>queryInterface</code> call
      * <p>
      * @return  the result of the call (should be an <code>Any</code>)
-     * @param message       the parameter for the call
-     * @param resultClass   the result type as an out parameter
-     * @param status        the status as an out parameter
-     * @param o_outs        the out parameters of the call as out parameters
-     * @param o_out_sig     the out signature as an out parameter
      */
     protected Object dispatch_queryInterface(Type type) {
         Class<?> zInterface = type.getTypeDescription().getZClass();
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 6c96bbe578ae..e0ec809c5a12 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -112,7 +112,6 @@ public class JobQueue {
      * which belongs to the given sync job queue.
      * <p>
      * @param threadId         the thread id
-     * @param sync_jobQueue    the sync queue this async queue belongs to
      * @see                    com.sun.star.lib.uno.environments.remote.ThreadID
      */
     JobQueue(JavaThreadPoolFactory javaThreadPoolFactory, ThreadId threadId) {