summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-08-20 12:54:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-08-20 12:54:24 +0100
commitf6a62d9e4106f36aff899c847d63e3198532796e (patch)
tree2c006788af8c1367510d7cf2706fd1b8cdaa6b12
parentaf4ca5a8c6e2848cb855a15986d5c4c9991140bf (diff)
Java update - fix various javadoc issues
Along the way, remove some javadoc comments that are completely incorrect. Change-Id: I02f96b6cbe665d2c10bd6ee245a7d8e2eef0f755
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/Frame.java2
-rw-r--r--accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java2
-rw-r--r--bean/com/sun/star/comp/beans/OOoBean.java2
-rw-r--r--connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java12
-rw-r--r--connectivity/qa/connectivity/tools/CRMDatabase.java2
-rw-r--r--filter/qa/complex/filter/detection/typeDetection/Helper.java2
-rw-r--r--filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java3
-rw-r--r--framework/qa/complex/XUserInputInterception/EventTest.java5
-rw-r--r--framework/qa/complex/framework/autosave/Protocol.java8
-rw-r--r--framework/qa/complex/framework/recovery/RecoveryTest.java4
-rw-r--r--framework/qa/complex/framework/recovery/RecoveryTools.java1
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java2
-rw-r--r--javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java4
-rw-r--r--jurt/com/sun/star/comp/connections/Acceptor.java2
-rw-r--r--jurt/com/sun/star/comp/connections/Connector.java2
-rw-r--r--jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java2
-rw-r--r--jurt/com/sun/star/comp/connections/PipedConnection.java2
-rw-r--r--jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java2
-rw-r--r--jurt/com/sun/star/lib/connections/pipe/pipeConnector.java2
-rw-r--r--jurt/com/sun/star/lib/connections/socket/socketAcceptor.java2
-rw-r--r--jurt/com/sun/star/lib/connections/socket/socketConnector.java2
-rw-r--r--jurt/com/sun/star/lib/uno/environments/remote/Job.java2
-rw-r--r--jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java8
-rw-r--r--ridljar/com/sun/star/uno/UnoRuntime.java2
-rw-r--r--scripting/java/com/sun/star/script/framework/container/ParcelContainer.java11
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java3
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java4
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java3
-rw-r--r--scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java2
-rw-r--r--sfx2/qa/complex/sfx2/UndoManager.java3
-rw-r--r--sfx2/qa/complex/sfx2/undo/DocumentTest.java4
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java7
-rw-r--r--xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java4
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java5
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java19
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java2
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java2
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java2
-rw-r--r--xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java4
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java2
-rw-r--r--xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java2
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java2
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java6
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java2
-rw-r--r--xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java4
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java2
55 files changed, 75 insertions, 119 deletions
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
index 37153492848c..f36d35851460 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/Frame.java
@@ -467,7 +467,7 @@ public class Frame extends java.awt.Frame implements javax.accessibility.Accessi
*
* @return an instance of AccessibleState containing the current state
* of the object
- * @see AccessibleState
+ * @see javax.accessibility.AccessibleState
*/
public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
javax.accessibility.AccessibleStateSet states = super.getAccessibleStateSet();
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
index 7ffc16c14d96..7283fe48b937 100644
--- a/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
+++ b/accessibility/bridge/org/openoffice/java/accessibility/MenuItem.java
@@ -71,7 +71,7 @@ class MenuItem extends ToggleButton {
*
* @return an instance of <code>AccessibleStateSet</code>
* containing the current state set of the object
- * @see AccessibleState
+ * @see javax.accessibility.AccessibleState
*/
public javax.accessibility.AccessibleStateSet getAccessibleStateSet() {
javax.accessibility.AccessibleStateSet stateSet = super.getAccessibleStateSet();
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index 07e6e1a1c527..2c7a72005563 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1062,7 +1062,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
/** Helper method to set tool bar visibilty.
- @param bnewValue
+ @param bNewValue
If false, the tool bar is disabled,
If true, the tool bar is visible.
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
index 289593807688..445669a16c10 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
@@ -67,7 +67,7 @@ public class StorageNativeOutputStream {
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs. In particular,
+ * @exception java.io.IOException if an I/O error occurs. In particular,
* an <code>IOException</code> is thrown if the output
* stream is closed.
*/
@@ -80,7 +80,7 @@ public class StorageNativeOutputStream {
* <code>write(b, 0, b.length)</code>.
*
* @param b the data.
- * @exception IOException if an I/O error occurs.
+ * @exception java.io.IOException if an I/O error occurs.
* @see java.io.OutputStream#write(byte[], int, int)
*/
public native void write(String key,String _file,byte[] b) throws java.io.IOException;
@@ -95,7 +95,7 @@ public class StorageNativeOutputStream {
* @param key The name of the data source.
* @param _file The name of the file to write to.
*
- * @exception IOException if an I/O error occurs.
+ * @exception java.io.IOException if an I/O error occurs.
*/
public native void close(String key,String _file) throws java.io.IOException;
@@ -112,7 +112,7 @@ public class StorageNativeOutputStream {
* @param key The name of the data source.
* @param _file The name of the file to write to.
* @param b the <code>byte</code>.
- * @exception IOException if an I/O error occurs. In particular,
+ * @exception java.io.IOException if an I/O error occurs. In particular,
* an <code>IOException</code> may be thrown if the
* output stream has been closed.
*/
@@ -130,7 +130,7 @@ public class StorageNativeOutputStream {
* @param key The name of the data source.
* @param _file The name of the file to write to.
*
- * @exception IOException if an I/O error occurs.
+ * @exception java.io.IOException if an I/O error occurs.
*/
public native void flush(String key,String _file) throws java.io.IOException;
@@ -151,7 +151,7 @@ public class StorageNativeOutputStream {
* be flushed (for example, by invoking
* OutputStream.flush) before that data will be affected by sync.
*
- * @exception IOException
+ * @exception java.io.IOException
* Thrown when the buffers cannot be flushed,
* or because the system cannot guarantee that all the
* buffers have been synchronized with physical media.
diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java
index 72aa9c76b231..2e1ae231658f 100644
--- a/connectivity/qa/connectivity/tools/CRMDatabase.java
+++ b/connectivity/qa/connectivity/tools/CRMDatabase.java
@@ -83,7 +83,7 @@ public class CRMDatabase
* creates a CRMDatabase from an existing document, given by URL
* @param _orb
* @param _existingDocumentURL
- * @throws Exceptio
+ * @throws Exception
*/
public CRMDatabase( XMultiServiceFactory _orb, final String _existingDocumentURL ) throws Exception
{
diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java b/filter/qa/complex/filter/detection/typeDetection/Helper.java
index d0991fac6b45..2ed403f631b1 100644
--- a/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -304,7 +304,7 @@ public class Helper {
* @param propNames String Array of propertie names
* @param values Objecr Array of propertie values
* @return <code>PropertyValue[]<code>
- * @see com.sun.star.benas.PropertyValue
+ * @see com.sun.star.beans.PropertyValue
* @see com.sun.star.document.MediaDescriptor
*/
public PropertyValue[] createMediaDescriptor(String[] propNames, Object[] values) {
diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
index 49b4c75fbd82..1f8eca92c8b0 100644
--- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
+++ b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java
@@ -706,8 +706,7 @@ public class Base64
* @param source The data to convert
* @param off Offset in array where conversion should begin
* @param len Length of data to convert
- * @param options Specified options
- * @param options alphabet type is pulled from this (standard, url-safe, ordered)
+ * @param options Specified options, alphabet type is pulled from this (standard, url-safe, ordered)
* @see Base64#GZIP
* @see Base64#DONT_BREAK_LINES
* @since 2.0
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 160e9b094ff9..d7b8b320caf5 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -309,7 +309,7 @@ public class EventTest {
* <CODE>m_keyReleased</CODE> are <CODE>TRUE</CODE>
* @param xUII the XUserInputInterception
* @param xModel the XModel of a document
- * @see EventTest.MyKeyHander
+ * @see EventTest.MyKeyHandler
* @see EventTest.EventTrigger
*/
private void checkKeyListener(XUserInputInterception xUII, XModel xModel) {
@@ -341,10 +341,9 @@ public class EventTest {
* <CODE>m_mouseReleased</CODE> are <CODE>TRUE</CODE>
* @param xUII the XUserInputInterception
* @param xModel the XModel of a document
- * @see EventTest.MyMouseClickHander
+ * @see EventTest.MyMouseClickHandler
* @see EventTest.EventTrigger
*/
-
private void checkMouseListener(XUserInputInterception xUII, XModel xModel) {
m_mousePressed = false;
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 05fb45455b57..8a78cdb5ac5e 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -526,7 +526,7 @@ public class Protocol extends JComponent
* @param sMessage
* the pure message
*
- * @see log(type,message)
+ * @see #log(int, String)
*/
public synchronized void log( /*IN*/ String sMessage )
{
@@ -756,8 +756,8 @@ public class Protocol extends JComponent
*
* @return A string, which includes the whole header.
*
- * @see finish()
- * @see generateHTMLFooter()
+ * @see #finish()
+ * @see #impl_generateHTMLFooter()
*/
private String impl_generateHTMLHeader()
{
@@ -786,7 +786,7 @@ public class Protocol extends JComponent
* @param sOut
* used to generate the log output there.
*
- * @param lProps/aProp
+ * @param lProps
* represent the property(array) to be logged.
*/
private void impl_logPropertyArray( /*OUT*/ StringBuffer sOut ,
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index defc57658d21..fedc92e18fe6 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -539,8 +539,8 @@ public class RecoveryTest extends ComplexTestCase {
/**
* This function uses accessibility to handle the dialog "Are you sure".
- * It cklick "Yes" or "No", dependend on the value of the parameter <CODE>Yes</CODE>
- * @param yes If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
+ * It click "Yes" or "No", depending on the value of the parameter <CODE>Yes</CODE>
+ * @param saveDocuments If value is <CODE>TRUE</CODE> the button "Yes" was clicked, otherwise the button
* "No".
*/
private void handleSaveDocumentsDialog(boolean saveDocuments)
diff --git a/framework/qa/complex/framework/recovery/RecoveryTools.java b/framework/qa/complex/framework/recovery/RecoveryTools.java
index 3b9646583a9c..9f4b81836e57 100644
--- a/framework/qa/complex/framework/recovery/RecoveryTools.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTools.java
@@ -141,7 +141,6 @@ public class RecoveryTools {
/**
* remove the content of the user backup folder and removes the Recovery.xcu. This
* was done from the Office via XSimpleFileAccess
- * @param xMSF a <CODE>XMultiServiceFactory</CODE> to get <CODE>XSimpleFileAccess</CODE>
* @throws com.sun.star.io.IOException the exception was thrown if something goes wrong.
*/
public void cleanRecoveryData()
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 56c77a8d4953..bc34c875331b 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -96,8 +96,6 @@ public class InterfaceContainer implements Cloneable
/**
* The size of the ArrayList (the number of elements it contains).
- *
- * @serial
*/
private int size;
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
index 46ba04d368cb..7285e3741bd3 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java
@@ -74,6 +74,7 @@ public class WeakAdapter implements XAdapter
{
return m_weakRef.get();
}
+
/** Method of com.sun.star.uno.XAdapter. Called by clients to register listener which
* are notified when the weak object is dying.
*@param xReference a listener
@@ -82,8 +83,9 @@ public class WeakAdapter implements XAdapter
{
m_xreferenceList.remove(xReference);
}
+
/** Method of com.sun.star.uno.XAdapter. Called by clients to unregister listeners.
- *@param a listener
+ *@param xReference listener
*/
public void addReference(XReference xReference)
{
diff --git a/jurt/com/sun/star/comp/connections/Acceptor.java b/jurt/com/sun/star/comp/connections/Acceptor.java
index e70398dbf47c..cc7ce7635bb0 100644
--- a/jurt/com/sun/star/comp/connections/Acceptor.java
+++ b/jurt/com/sun/star/comp/connections/Acceptor.java
@@ -37,7 +37,7 @@ import com.sun.star.registry.XRegistryKey;
* @see com.sun.star.connection.XAcceptor
* @see com.sun.star.connection.XConnection
* @see com.sun.star.connection.XConnector
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
*
* @since UDK 1.0
*/
diff --git a/jurt/com/sun/star/comp/connections/Connector.java b/jurt/com/sun/star/comp/connections/Connector.java
index 98a065ed9679..17d3a1ca28b4 100644
--- a/jurt/com/sun/star/comp/connections/Connector.java
+++ b/jurt/com/sun/star/comp/connections/Connector.java
@@ -37,7 +37,7 @@ import com.sun.star.registry.XRegistryKey;
* @see com.sun.star.connection.XAcceptor
* @see com.sun.star.connection.XConnection
* @see com.sun.star.connection.XConnector
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
*
* @since UDK 1.0
*/
diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
index f9dd02caea1f..cfc6e15f5e5a 100644
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
@@ -36,7 +36,7 @@ import com.sun.star.comp.loader.FactoryHelper;
* @see com.sun.star.bridge.XBridge
* @see com.sun.star.bridge.XBridgeFactory
* @see com.sun.star.bridge.XInstanceProvider
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
* @since UDK1.0
*/
public class ConstantInstanceProvider implements XInstanceProvider {
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index 04856ba925bf..def2872008e5 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -36,7 +36,7 @@ import com.sun.star.registry.XRegistryKey;
* <p>
* @author Kay Ramme
* @see com.sun.star.connection.XConnection
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
* @since UDK1.0
*/
public class PipedConnection implements XConnection {
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
index 9ce1321569dd..e483c89c48d8 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/pipe/pipeAcceptor.java
@@ -37,7 +37,7 @@ import com.sun.star.registry.XRegistryKey;
* @see com.sun.star.connection.XAcceptor
* @see com.sun.star.connection.XConnection
* @see com.sun.star.connection.XConnector
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
*
* @since UDK 1.0
*/
diff --git a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java b/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
index 3ac44464e205..57a0d05277ee 100644
--- a/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
+++ b/jurt/com/sun/star/lib/connections/pipe/pipeConnector.java
@@ -37,7 +37,7 @@ import com.sun.star.registry.XRegistryKey;
* @see com.sun.star.connection.XAcceptor
* @see com.sun.star.connection.XConnection
* @see com.sun.star.connection.XConnector
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
*
* @since UDK 1.0
*/
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
index 10e3ae92ae62..32f0f2018e67 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
@@ -41,7 +41,7 @@ import java.net.Socket;
* @see com.sun.star.connection.XAcceptor
* @see com.sun.star.connection.XConnection2
* @see com.sun.star.connection.XConnector
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
*
* @since UDK 1.0
*/
diff --git a/jurt/com/sun/star/lib/connections/socket/socketConnector.java b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
index 1c8822ffb13c..74fb1695e3fb 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketConnector.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketConnector.java
@@ -41,7 +41,7 @@ import java.net.UnknownHostException;
* @see com.sun.star.connection.XAcceptor
* @see com.sun.star.connection.XConnection
* @see com.sun.star.connection.XConnector
- * @see com.sun.star.loader.JavaLoader
+ * @see com.sun.star.comp.loader.JavaLoader
*
* @since UDK 1.0
*/
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 81b5d613bba4..281c4df3d908 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
@@ -37,7 +37,7 @@ import com.sun.star.uno.XCurrentContext;
* remotely because of a method invocation.
* <p>
* @author Kay Ramme
- * @see com.sun.star.lib.uno.environments.remote.ThreadID
+ * @see com.sun.star.lib.uno.environments.remote.ThreadId
* @see com.sun.star.lib.uno.environments.remote.IReceiver
* @since UDK1.0
*/
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 e0ec809c5a12..f9c3353dd1a4 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -32,7 +32,7 @@ import com.sun.star.lang.DisposedException;
* @author Kay Ramme
* @see com.sun.star.lib.uno.environments.remote.ThreadPool
* @see com.sun.star.lib.uno.environments.remote.Job
- * @see com.sun.star.lib.uno.environments.remote.ThreadID
+ * @see com.sun.star.lib.uno.environments.remote.ThreadId
* @since UDK1.0
*/
public class JobQueue {
@@ -112,7 +112,7 @@ public class JobQueue {
* which belongs to the given sync job queue.
* <p>
* @param threadId the thread id
- * @see com.sun.star.lib.uno.environments.remote.ThreadID
+ * @see com.sun.star.lib.uno.environments.remote.ThreadId
*/
JobQueue(JavaThreadPoolFactory javaThreadPoolFactory, ThreadId threadId) {
_javaThreadPoolFactory = javaThreadPoolFactory;
@@ -139,7 +139,7 @@ public class JobQueue {
* <p>
* @param threadId the thread id
* @param createThread if true, the queue creates a worker thread if needed
- * @see com.sun.star.lib.uno.environments.remote.ThreadID
+ * @see com.sun.star.lib.uno.environments.remote.ThreadId
*/
JobQueue(JavaThreadPoolFactory javaThreadPoolFactory, ThreadId threadId, boolean createThread){
_javaThreadPoolFactory = javaThreadPoolFactory;
@@ -154,7 +154,7 @@ public class JobQueue {
* Gives the thread id of this queue
* <p>
* @return the thread id
- * @see com.sun.star.lib.uno.environments.remote.ThreadID
+ * @see com.sun.star.lib.uno.environments.remote.ThreadId
*/
ThreadId getThreadId() {
return _threadId;
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java
index e20ba72e492d..a2fb84848da4 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -160,7 +160,7 @@ public class UnoRuntime {
* Queries the given UNO object for the given Java class (which must
* represent a UNO interface type).
*
- * @param ifc a Java class representing a UNO interface type
+ * @param zInterface a Java class representing a UNO interface type
* @param object a reference to any Java object representing (a facet of) a
* UNO object; may be <code>null</code>
* @return a reference to the requested UNO interface type if available,
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
index ff4678f7a97f..367186ee44a2 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java
@@ -217,11 +217,9 @@ public class ParcelContainer implements XNameAccess
* @param xCtx UNO component context
* @param containerUrl location of this container.
* @param language language for which entries are stored
- * @return name of <tt>ParcelContainer</tt>
- * @throws IllegalArgumentException
+ * @throws com.sun.star.lang.IllegalArgumentException
* @throws WrappedTargetException
*/
-
public ParcelContainer( XComponentContext xCtx, String containerUrl, String language ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
{
@@ -235,8 +233,7 @@ public class ParcelContainer implements XNameAccess
* @param language language for which entries are stored
* @param loadParcels set to <tt>true</tt> if parcels are to be loaded
* on construction.
- * @return name of <tt>ParcelContainer</tt>
- * @throws IllegalArgumentException
+ * @throws com.sun.star.lang.IllegalArgumentException
* @throws WrappedTargetException
*/
public ParcelContainer( XComponentContext xCtx, String containerUrl, String language, boolean loadParcels ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
@@ -252,10 +249,8 @@ public class ParcelContainer implements XNameAccess
* @param language language for which entries are stored
* @param loadParcels set to <tt>true</tt> if parcels are to be loaded
* on construction.
- * @return name of <tt>ParcelContainer</tt>
- * @throws IllegalArgumentException
+ * @throws com.sun.star.lang.IllegalArgumentException
*/
-
public ParcelContainer( ParcelContainer parent, XComponentContext xCtx, String containerUrl, String language, boolean loadParcels ) throws com.sun.star.lang.IllegalArgumentException, com.sun.star.lang.WrappedTargetException
{
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index 1cfab1202b65..a679d695742b 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -184,9 +184,8 @@ public class ScriptEditorForBeanShell
* If an editor window is already open for that data it will be
* moved to the front.
*
- * @param metadata The metadata describing the script
* @param context The context in which to execute the script
- *
+ * @param entry The metadata describing the script
*/
public void edit(final XScriptContext context, ScriptMetaData entry) {
if (entry != null ) {
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 4ed2f8e53fb6..c98a1ed59f95 100644
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -165,7 +165,7 @@ class ScriptImpl implements XScript
* Invoke
*
*
- * @param aParams All parameters; pure, out params are undefined in
+ * @param params All parameters; pure, out params are undefined in
* sequence, i.e., the value has to be ignored by the callee
* @param aOutParamIndex Out indices
* @param aOutParam Out parameters
@@ -173,7 +173,7 @@ class ScriptImpl implements XScript
* @throws IllegalArgumentException If there is no matching script name
* @throws CannotConvertException If args do not match or cannot be converted
* the those of the invokee
- * @throws InvocationTargetException If the running script throws an exception
+ * @throws com.sun.star.reflection.InvocationTargetException If the running script throws an exception
* this information is captured and rethrown as this exception type.
*/
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index 3604677d0c24..d234a0019acf 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -167,9 +167,8 @@ public class ScriptEditorForJavaScript implements ScriptEditor
* If an editor window is already open for that data it will be
* moved to the front.
*
- * @param metadata The metadata describing the script
* @param context The context in which to execute the script
- *
+ * @param entry The metadata describing the script
*/
public void edit(final XScriptContext context, ScriptMetaData entry)
{
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index 9300e1ed450b..aa36af86a176 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -149,7 +149,7 @@ class ScriptImpl implements XScript
*
*
*
- * @param aParams All parameters; pure, out params are
+ * @param params All parameters; pure, out params are
* undefined in sequence, i.e., the value
* has to be ignored by the callee
*
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index 5b5e39e3b271..92265d232718 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -298,8 +298,7 @@ public class UndoManager
// -----------------------------------------------------------------------------------------------------------------
/**
- * returns the undo manager belonging to a given document
- * @return
+ * @return returns the undo manager belonging to a given document
*/
private XUndoManager getUndoManager()
{
diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTest.java b/sfx2/qa/complex/sfx2/undo/DocumentTest.java
index 8d89d0e33dbd..ad0b2f405ee0 100644
--- a/sfx2/qa/complex/sfx2/undo/DocumentTest.java
+++ b/sfx2/qa/complex/sfx2/undo/DocumentTest.java
@@ -63,8 +63,8 @@ public interface DocumentTest
/**
* does multiple modifications do the document, which would normally result in multiple Undo actions.
*
- * The test framework will encapsulate the call into an {@link XUndoManager.enterUndoContext()} and
- * {@link XUndoManager.leaveUndoContext()} call.
+ * The test framework will encapsulate the call into an {@link com.sun.star.document.XUndoManager#enterUndoContext} and
+ * {@link com.sun.star.document.XUndoManager#leaveUndoContext} call.
*
* @return
* the number of modifications done to the document. The caller assumes (and asserts) that the number
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
index 8ad9434a9835..df8e7972532f 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocDecoder.java
@@ -27,8 +27,7 @@ import org.openoffice.xmerge.util.Resources;
import org.openoffice.xmerge.util.Debug;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxw.DocumentDeserializerImpl}
+ * This class is used by {@link DocumentDeserializerImpl}
* to decode the AportisDoc format. It currently decodes
* the text content into a single <code>String</code> object.
*
@@ -56,7 +55,7 @@ final class DocDecoder implements DocConstants {
* Decode the text records into a single <code>String</code>
* of text content.
*
- * @param Record <code>Record</code> array holding AportisDoc
+ * @param recs <code>Record</code> array holding AportisDoc
* contents.
*
* @throws IOException If any I/O error occurs.
@@ -114,7 +113,7 @@ final class DocDecoder implements DocConstants {
* with the encoding of that PDB and throw
* <code>IOException</code>.</p>
*
- * @param bytes Compressed <code>byte</code> array.
+ * @param cBytes Compressed <code>byte</code> array.
* @param textRecordSize Size of uncompressed
* <code>byte</code> array.
*
diff --git a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
index 657784fe7684..bcf498d8444f 100644
--- a/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
+++ b/xmerge/source/aportisdoc/java/org/openoffice/xmerge/converter/xml/sxw/aportisdoc/DocEncoder.java
@@ -27,9 +27,7 @@ import java.util.ArrayList;
import org.openoffice.xmerge.converter.palm.Record;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxw.DocumentSerializerImpl
- * DocumentSerializerImpl} to encode the AportisDoc format.
+ * This class is used by {@link DocumentSerializerImpl} to encode the AportisDoc format.
* It does not deal with any XML tags. It only knows how to encode
* from <code>String</code>.
*
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
index 219670fdfedc..a69433833c1e 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelDecoder.java
@@ -45,8 +45,7 @@ import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Worksheet;
import org.openoffice.xmerge.util.Debug;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocumentDeserializerImpl}
+ * This class is used by {@link SxcDocumentDeserializerImpl}
* SxcDocumentDeserializerImpl} to decode the Pocket Excel format.
*
* @author Paul Rank
@@ -84,7 +83,7 @@ final class PocketExcelDecoder extends SpreadsheetDecoder {
* converts it into a PocketWord WorkSheet. The WorkSheet is then
* added to the WorkBook.
*
- * @param InputStream An <code>ConvertData</code> containing a
+ * @param cd An <code>ConvertData</code> containing a
* Pocket Excel WorkSheet.
*
* @throws IOException If any I/O error occurs.
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
index a7b64d94bd2e..ce5779cf1e75 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/PocketExcelEncoder.java
@@ -31,9 +31,7 @@ import org.openoffice.xmerge.converter.xml.sxc.NameDefinition;
import org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
/**
- * This class is used by {@link
- * org.openoffice.xmerge.converter.xml.sxc.SxcDocumentSerializerImpl
- * SxcDocumentSerializerImpl} to encode the Pocket Excel format.
+ * This class is used by {@link SxcDocumentSerializerImpl} to encode the Pocket Excel format.
*
* @author Martin Maher
*/
@@ -200,20 +198,13 @@ final class PocketExcelEncoder extends SpreadsheetEncoder {
/**
* Set the width of the columns in the WorkBook.
*
- * @param columnWidths An <code>IntArrayList</code> of column
- * widths.
+ * @param columnRows An <code>ArrayList</code> of ColumnRowInfo
*/
public void setColumnRows(ArrayList<ColumnRowInfo> columnRows) throws IOException {
wb.addColInfo(columnRows);
}
- /**
- * Set the width of the columns in the WorkBook.
- *
- * @param columnWidths An <code>IntArrayList</code> of column
- * widths.
- */
public void setNameDefinition(NameDefinition nd) throws IOException {
String parsedName = nd.getDefinition();
@@ -222,12 +213,6 @@ final class PocketExcelEncoder extends SpreadsheetEncoder {
wb.addNameDefinition(nd);
}
- /**
- * Set the width of the columns in the WorkBook.
- *
- * @param columnWidths An <code>IntArrayList</code> of column
- * widths.
- */
public void addSettings(BookSettings s) throws IOException {
wb.addSettings(s);
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
index d9401c27e0b5..51ac357973f0 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/BoundSheet.java
@@ -59,7 +59,7 @@ public class BoundSheet implements BIFFRecord {
* Sets the worksheet name. The sheetname length must be doubled as the
* String is stored in unicode format.
*
- * @param sheetname worksheet name
+ * @param sheetName worksheet name
*/
void setSheetName(String sheetName) throws IOException {
this.cch = (byte) sheetName.length();
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
index d0422ebb5745..7c88383e9c48 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
@@ -118,8 +118,6 @@ public class LabelCell extends CellValue {
/**
* Sets the <code>String</code> representing the cells contents
- *
- * @return the <code>String</code> representing the cells contents
*/
private void setLabel(String cellContents) throws IOException {
rgch = cellContents.getBytes("UTF-16LE");
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
index 9dd327354078..db7c8e59d180 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaParser.java
@@ -128,7 +128,7 @@ public class FormulaParser {
/**
* Identify <, >, <=, >=, =, <>
*
- * @param The <code>String</code> which is to be identified
+ * @param op The <code>String</code> which is to be identified
* @return A boolean returning the result of the comparison
*/
private boolean isLogicalOp(String op) {
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
index d597b2292dbb..2d26654d0a2c 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/TokenEncoder.java
@@ -279,7 +279,7 @@ public class TokenEncoder {
/**
* A Cell Reference Encoder (It supports absolute and relative addressing)
*
- * @param t <code>Token</code> to be encoded
+ * @param cellCoordinates <code>Token</code> to be encoded
* @return A <code>Vector</code> of pexcel <code>Byte</code>
*/
private byte[] encodeCellCoordinates(String cellCoordinates) {
@@ -362,7 +362,7 @@ public class TokenEncoder {
/**
* This function will find the sheetname index for a given String
*
- * @param t <code>Token</code> to be encoded
+ * @param s <code>Token</code> to be encoded
* @return A <code>Vector</code> of pexcel <code>Byte</code>
*/
private short findSheetIndex(String s) {
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
index 313054c9adaa..ac52a781c7ff 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/DocumentDeserializerImpl.java
@@ -125,8 +125,6 @@ public final class DocumentDeserializerImpl
*
* @param data An Enumeration of all Paragraphs in the Pocket Word doc.
*
- * @return The OpenOffice Writer XML representation of the data.
- *
* @throws IOException If any I/O errors occur.
*/
private void buildDocument(Iterator<Paragraph> data) throws IOException {
diff --git a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
index 47f8f53de1cb..0c3e08bbf116 100644
--- a/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
+++ b/xmerge/source/pocketword/java/org/openoffice/xmerge/converter/xml/sxw/pocketword/ParagraphTextSegment.java
@@ -75,7 +75,7 @@ class ParagraphTextSegment implements PocketWordConstants {
/**
* <p>Sets the style for this segment.</p>
*
- * @param data The style describing this segment.
+ * @param style The style describing this segment.
*/
public void setStyle (TextStyle style) {
pStyle = style;
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
index 20ef21e3cb61..9ab74066cf5b 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentDeserializerImpl.java
@@ -284,7 +284,7 @@ implements DOCConstants, OfficeConstants, DocumentDeserializer {
* <code>SXWDocument</code>.
*
* @param docName <code>Document</code> name
- * @param str Text content of WordSmith format
+ * @param data Text content of WordSmith format
*
* @return Resulting <code>SXWDocument</code> object.
*
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
index bea4b6581a21..fb6383ed40df 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/DocumentSerializerImpl.java
@@ -100,10 +100,6 @@ implements OfficeConstants, DocumentSerializer {
* but this is the only way to not modify most of the existing
* code right now.</p>
*
- * @param doc Input should be an XML <code>Document</code>
- * object
- * @param os Output of <code>PalmDB</code> object
- *
* @throws ConvertException If any conversion error occurs.
* @throws IOException If any I/O error occurs.
*/
@@ -457,7 +453,7 @@ implements OfficeConstants, DocumentSerializer {
* <i>text:h</i>, <i>text:unordered-list</i> and
* <i>text:ordered-list</i>.
*
- * @param Node <code>Node</code> to traverse.
+ * @param node <code>Node</code> to traverse.
*
* @throws IOException If any I/O error occurs.
*/
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
index a62f48c6a3ad..10185a09502c 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/PluginFactoryImpl.java
@@ -126,8 +126,6 @@ public final class PluginFactoryImpl extends SxwPluginFactory
* which is an implementation of the <code>DocumentMerger</code>
* interface.
*
- * @param doc <code>Document</code> to merge.
- *
* @return A Device Document object
*/
public Document createDeviceDocument(String name, InputStream is)
diff --git a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
index 2b86395d1bc8..bcd363e56e3a 100644
--- a/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
+++ b/xmerge/source/wordsmith/java/org/openoffice/xmerge/converter/xml/sxw/wordsmith/WSDecoder.java
@@ -56,7 +56,7 @@ final class WSDecoder implements DOCConstants {
/**
* Decode the text records into a single <code>byte</code> array.
*
- * @param Record <code>Record</code> array holding WordSmith
+ * @param recs <code>Record</code> array holding WordSmith
* contents.
*
* @throws IOException If any I/O error occurs.
@@ -113,7 +113,7 @@ final class WSDecoder implements DOCConstants {
/**
* Decode the text records into a <code>Wse</code> array.
*
- * @param Record[] <code>Record</code> array holding DOC
+ * @param recs <code>Record</code> array holding DOC
* contents.
*
* @throws IOException If any I/O error occurs.
@@ -173,7 +173,7 @@ final class WSDecoder implements DOCConstants {
* it as a problem with the encoding of that PDB and
* throw <code>IOException</code>.</p>
*
- * @param bytes Compressed <code>byte</code> array
+ * @param cBytes Compressed <code>byte</code> array
* @param textRecordSize Size of uncompressed <code>byte</code>
* array
*
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
index 936bd021ab9e..86024f138caf 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
@@ -228,7 +228,7 @@ public class DOMDocument
* <p>TODO: remove dependency on com.sun.xml.tree.XmlDocument
* package!</p>
*
- * @param Document DOM <code>Document</code> object.
+ * @param doc DOM <code>Document</code> object.
*
* @return <code>byte</code> array of DOM <code>Document</code>
* object.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
index e40fef1ee368..9d3352bbdcde 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
@@ -101,7 +101,7 @@ final class PdbHeader {
* Read in the data for the PDB header. Need to
* preserve the unsigned value for some of the fields.
*
- * @param di A <code>DataInput</code> object.
+ * @param in A <code>DataInput</code> object.
*
* @throws IOException If any I/O error occurs.
*/
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
index 48314db3b66e..95e4a6f272d5 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
@@ -102,8 +102,6 @@ public class EmbeddedBinaryObject extends EmbeddedObject {
/**
* Package private method that constructs the manifest.xml entries for this
* embedded object.
- *
- * @return Document <code>Document</code> containing the manifest entries.
*/
void writeManifestData(Document manifestDoc) throws DOMException {
Element objNode = manifestDoc.createElement(OfficeConstants.TAG_MANIFEST_FILE);
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
index 7d9d10c058ff..cdc3d51d88fc 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedObject.java
@@ -100,8 +100,6 @@ public abstract class EmbeddedObject {
/**
* Package private method that constructs the manifest.xml entries for this
* embedded object.
- *
- * @return Document <code>Document</code> containing the manifest entries.
*/
abstract void writeManifestData(Document manifestDoc) throws DOMException;
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index 5e9014604172..baca3dec1d80 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -832,7 +832,7 @@ public abstract class OfficeDocument
* <p>TODO: remove dependency on com.sun.xml.tree.XmlDocument
* package!</p>
*
- * @param Document DOM <code>Document</code> object.
+ * @param doc DOM <code>Document</code> object.
*
* @return <code>byte</code> array of DOM <code>Document</code>
* object.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
index cbd9f7ca8ad7..c7f7055c6eaa 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeZip.java
@@ -34,7 +34,7 @@ import org.openoffice.xmerge.util.Debug;
/**
* Class used by {@link
- * org.openoffice.xmerge.converter.OfficeDocument
+ * org.openoffice.xmerge.converter.xml.OfficeDocument
* OfficeDocument} to handle reading and writing
* from a ZIP file, as well as storing ZIP entries.
*
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
index 90c815dd3d2a..8b8b4c42f935 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/Style.java
@@ -28,8 +28,8 @@ import org.w3c.dom.NamedNodeMap;
* <code>ParaStyle</code> are used.
*
* @author David Proulx
- * @see <a href="TextStyle.html">TextStyle</a>,
- * <a href="ParaStyle.html">ParaStyle</a>
+ * @see <a href="TextStyle.html">TextStyle</a>
+ * @see <a href="ParaStyle.html">ParaStyle</a>
*/
public class Style {
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index fca77ac19939..5fb13dee5c24 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -441,7 +441,7 @@ public class TextStyle extends Style implements Cloneable {
* Private function to return the value as an element in
* a Comma Separated Value (CSV) format.
*
- * @param The value to format.
+ * @param value The value to format.
*
* @return The formatted value.
*/
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
index fa5bdd51cff4..dbd7411a4d0a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
@@ -114,7 +114,7 @@ public class BookSettings implements OfficeConstants {
* Adds an XML entry for a particular setting
*
* @param root the root node at which to add the xml entry
- * @param attriute the name of the attribute to add
+ * @param attribute the name of the attribute to add
* @param type the attribute type (int, short etc)
* @param value the value of the attribute
*/
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
index 47779eb514df..73a57401a23d 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
@@ -227,7 +227,7 @@ public class SheetSettings implements OfficeConstants {
* Adds an XML entry for a particular setting
*
* @param root the root node at which to add the xml entry
- * @param attriute the name of the attribute to add
+ * @param attribute the name of the attribute to add
* @param type the attribute type (int, short etc)
* @param value the value of the attribute
*/