[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com ridljar/com xmerge/source
Damjan Jovanovic
damjan at apache.org
Sun Aug 23 11:08:47 PDT 2015
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 12 ++++++----
ridljar/com/sun/star/uno/IMethodDescription.java | 4 +--
ridljar/com/sun/star/uno/Type.java | 4 +--
ridljar/com/sun/star/uno/Union.java | 2 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java | 2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java | 6 ++---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java | 10 ++++----
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java | 4 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java | 2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java | 2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java | 2 -
12 files changed, 28 insertions(+), 24 deletions(-)
New commits:
commit 01aadc965ca97f28505418c6fb95a0c4c1f0d160
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Aug 23 17:26:31 2015 +0000
Fix some of the many javadoc 8 errors.
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index eb9bf0c..66ae01f 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -97,6 +97,7 @@ public class Bootstrap {
@param context_entries the hash table contains mappings of entry names (type string) to
context entries (type class ComponentContextEntry).
@return a new context.
+ @throws java.lang.Exception
*/
static public XComponentContext createInitialComponentContext( Hashtable context_entries )
throws Exception
@@ -149,6 +150,7 @@ public class Bootstrap {
* <p>
* @return a freshly boostrapped service manager
* @see com.sun.star.lang.ServiceManager
+ * @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws Exception
{
@@ -157,10 +159,12 @@ public class Bootstrap {
}
- /** Bootstraps the initial component context from a native UNO installation.
-
- @see cppuhelper/defaultBootstrap_InitialComponentContext()
- */
+ /**
+ * Bootstraps the initial component context from a native UNO installation.
+ * <p>
+ * @return
+ * @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ */
static public final XComponentContext defaultBootstrap_InitialComponentContext()
throws Exception
{
diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java b/ridljar/com/sun/star/uno/IMethodDescription.java
index f712556..0c1aad5 100644
--- a/ridljar/com/sun/star/uno/IMethodDescription.java
+++ b/ridljar/com/sun/star/uno/IMethodDescription.java
@@ -52,7 +52,7 @@ public interface IMethodDescription extends IMemberDescription {
boolean isConst();
/**
- * Gives any array of <code>ITypeDescription> of
+ * Gives any array of <code>ITypeDescription</code> of
* the [in] parameters.
* <p>
* @return the in parameters
@@ -60,7 +60,7 @@ public interface IMethodDescription extends IMemberDescription {
ITypeDescription[] getInSignature();
/**
- * Gives any array of <code>ITypeDescription> of
+ * Gives any array of <code>ITypeDescription</code> of
* the [out] parameters.
* <p>
* @return the out parameters
diff --git a/ridljar/com/sun/star/uno/Type.java b/ridljar/com/sun/star/uno/Type.java
index f3a55f4..411db96 100644
--- a/ridljar/com/sun/star/uno/Type.java
+++ b/ridljar/com/sun/star/uno/Type.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
* SHORT</code>) do not have a matching Java class. For another, it can be
* necessary to describe a type which is unknown to the Java runtime system
* (for example, for delaying the need of a class, so that it is possible to
- * generate it on the fly.)</p>
+ * generate it on the fly.)
*
* <p>A <code>Type</code> is uniquely determined by its type class (a
* <code>TypeClass</code>) and its type name (a <code>String</code>); these two
@@ -204,7 +204,7 @@ public class Type {
*
* <p>In certain cases, one Java class corresponds to two UNO types (e.g.,
* the Java class <code>short[].class</code> corresponds to both a sequence
- * of <codde>SHORT</code> and a sequence of <code>UNSIGNED SHORT</code> in
+ * of <code>SHORT</code> and a sequence of <code>UNSIGNED SHORT</code> in
* UNO). In such ambiguous cases, the parameter <code>alternative</code>
* controls which UNO type is chosen:</p>
* <ul>
diff --git a/ridljar/com/sun/star/uno/Union.java b/ridljar/com/sun/star/uno/Union.java
index 8c1822e..ba1b2fe 100644
--- a/ridljar/com/sun/star/uno/Union.java
+++ b/ridljar/com/sun/star/uno/Union.java
@@ -27,7 +27,7 @@ package com.sun.star.uno;
* The Union class is the base class for all classes generated
* as java binding for the IDL type union.
* <p>
- * Note: The idl type <code>union<code> is currently not fully
+ * Note: The idl type <code>union</code> is currently not fully
* integrated into the UNO framework, so don't use it.
*
* @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $
diff --git a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
index 53e9727..7250a5c 100644
--- a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
+++ b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
@@ -352,7 +352,7 @@ org.openoffice.xmerge.converter.xml.OfficeConstants {
}
/**
- * Writes the ExtendedFormat to the <code>Outputstream<code>
+ * Writes the ExtendedFormat to the <code>Outputstream</code>
*
* @param output the <code>Outputstream</code>to write to
*/
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
index 6a548b6..e52685e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
@@ -161,7 +161,7 @@ public class Convert implements Cloneable {
/**
* Clones a Convert object so another Convert object can
- * do the same conversion. <code>InputStream<code> objects passed
+ * do the same conversion. <code>InputStream</code> objects passed
* in via calls to the <code>addInputStream</code> method are not
* copied.
*
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
index 4ae1a98..ed82cc5 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
@@ -28,13 +28,13 @@ import java.io.IOException;
/**
* <p>A <code>DocumentDeserializer</code> represents a converter that
* converts "Device" <code>Document</code> objects into the
- * "Office" <code>Document</code> format.</p>
+ * "Office" <code>Document</code> format.
*
* <p>The <code>DocumentDeserializer</code> object is created by
- * the </code>PluginFactory</code> {@link
+ * the <code>PluginFactory</code> {@link
* org.openoffice.xmerge.DocumentDeserializerFactory#createDocumentDeserializer
* createDocumentDeserializer} method. When it is constructed, a
- * <code>ConvertData</code> object is passed in to be used as input.</p>
+ * <code>ConvertData</code> object is passed in to be used as input.
*
* @author Herbie Ong
* @see org.openoffice.xmerge.PluginFactory
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
index 01dfd7f..4e8d597 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
@@ -31,16 +31,16 @@ import java.io.DataInputStream;
/**
* <p>Provides functionality to decode a PDB formatted file into
* a <code>PalmDB</code> object given an <code>InputStream</code>.
- * This class is only used by the <code>PalmDB</code> object.</p>
+ * This class is only used by the <code>PalmDB</code> object.
*
- * <p>Sample usage:</p>
+ * <p>Sample usage:
*
* <blockquote><pre><code>
* PdbDecoder decoder = new PdbDecoder("sample.pdb");
* PalmDB palmDB = decoder.parse();
* </code></pre></blockquote>
*
- * <p>This decoder has the following assumptions on the PDB file:</p>
+ * <p>This decoder has the following assumptions on the PDB file:
*
* <p><ol>
* <li>There is only one RecordList section in the PDB.</li>
@@ -50,9 +50,9 @@ import java.io.DataInputStream;
* <li>The raw <code>Record</code> in the <code>Record</code> section
* are sorted as well in order, i.e. first <code>Record</code>
* comes ahead of second <code>Record</code>, etc.</li>
- * </ol></p>
+ * </ol>
*
- * <p>Other decoders assume these as well.</p>
+ * <p>Other decoders assume these as well.
*
* @author Herbie Ong
* @see PalmDB
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
index 6ba6870..e6987c0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
@@ -44,7 +44,7 @@ public class ColumnStyle extends Style implements Cloneable {
/**
* Constructor for use when going from DOM to client device format.
*
- * @param Node The <i>style:style</i> <code>Node</code> containing
+ * @param node The <i>style:style</i> <code>Node</code> containing
* the <code>Style</code>. (This <code>Node</code> is
* assumed have a <i>family</i> attribute of <i>text</i>).
* @param sc The <code>StyleCatalog</code>, which is used for
@@ -97,7 +97,7 @@ public class ColumnStyle extends Style implements Cloneable {
* <i>text</i>). Can be null.
* @param parent Name of parent text <code>Style</code>, or null
* for none.
- * @param mask the width of this column
+ * @param colWidth the width of this column
* @param sc The <code>StyleCatalog</code>, which is used for
* looking up ancestor <code>Style</code> objects.
*/
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index 07a99ad..7b61475 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -40,7 +40,7 @@ public interface MergeAlgorithm {
* This method is to merge the difference to an <code>Iterator</code>.
* The original <code>Iterator</code> will be modified after the call.
*
- * @param objSeq The original sequence which the difference
+ * @param orgSeq The original sequence which the difference
* will be applied. It will be modified.
* @param modSeq The modified sequence where the difference
* content will be extracted.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
index 8b5a7cb..7850568 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
@@ -43,6 +43,6 @@ public interface NodeMergeAlgorithm {
* @param modifyNode The <code>Node</code> to be merged. It may
* be modified.
*/
- public void merge(Node orginialNode, Node modifyNode);
+ public void merge(Node orginalNode, Node modifyNode);
}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
index 5593a0e..6ea4866 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
@@ -48,7 +48,7 @@ public final class TextNodeIterator extends NodeIterator {
/**
* Standard constructor.
*
- * @param initial The initial root <code>Node</code>.
+ * @param node The initial root <code>Node</code>.
*/
public TextNodeIterator(Node node) {
super(null, node);
More information about the Libreoffice-commits
mailing list