From 72ce0058eacbd199a6bbda27e5ec80b0495b61b1 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Fri, 2 Aug 2019 11:55:13 +0200 Subject: Fix typos Change-Id: I8e2f3104f3ae9d20e520d357e61c02afde0cedf4 Reviewed-on: https://gerrit.libreoffice.org/76858 Tested-by: Jenkins Reviewed-by: Andrea Gelmini --- .../java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java | 2 +- .../org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java | 2 +- .../java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java | 4 ++-- .../java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java | 4 ++-- .../java/org/openoffice/xmerge/merger/diff/CharacterParser.java | 4 ++-- .../xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java | 4 ++-- .../java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java | 4 ++-- .../java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java | 4 ++-- .../openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java | 4 ++-- .../source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) (limited to 'xmerge') diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java index d8e2caea05b4..03649deffc4c 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java @@ -157,7 +157,7 @@ public class ColumnRowInfo { } /** - * Test if the row height as been set manually. + * Test if the row height has been set manually. * * @return {@code true} if user defined otherwise {@code false}. */ diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java index 215e806e24bb..b8d3ddfb9918 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java @@ -77,4 +77,4 @@ public class DocumentMergerImpl implements DocumentMerger { docMerge.applyDifference(i1, i2, diffTable); } -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java index 3d2dfc144d77..791c809f92a9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CellNodeIterator.java @@ -30,7 +30,7 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; *

It will traverse the tree and find cell {@code Node} sequences.

* *

Note: Once the XML Tree is parsed, then the {@code Iterator} will be a - * snap shot of that tree. That means even the tree is modified later, than the + * snapshot of that tree. That means even the tree is modified later, then the * cached paragraph {@code Node} list will not be updated accordingly. For this * reason and for performance reasons this {@code Iterator} does not support any * operation methods such as insert, remove or replace. The main purpose of this @@ -93,4 +93,4 @@ public final class CellNodeIterator extends NodeIterator { return equal; } -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java index 94c2bea396cd..9e9eaf369a26 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java @@ -79,7 +79,7 @@ public class CharArrayLCSAlgorithm { int modSeqlen = modSeq.length + 1; int[][] diffTable; - // initialize the diffTable (it need to be 1 row/col bigger + // initialize the diffTable (it needs to be 1 row/col bigger // than the original str) diffTable = new int[orgSeqlen][]; for (int i = 0; i < orgSeqlen; i++) { @@ -185,4 +185,4 @@ public class CharArrayLCSAlgorithm { } } } -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java index 9603d0ed9853..622fedf9edce 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java @@ -33,7 +33,7 @@ import java.util.List; * {@code Node}).

* *

Note: Once the XML Tree is parsed, then the {@code Iterator} will be a - * snap shot of that tree. That means even the tree is modified later, than + * snapshot of that tree. That means even the tree is modified later, then * the cached paragraph {@code Node} list will not be updated accordingly. For * this reason and for performance reasons this {@code Iterator} does not * support any operation methods such as insert, remove or replace. The main @@ -124,4 +124,4 @@ public class CharacterParser { nodeList_.add(nodeEntry); } -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java index 6a3768065722..fe5bfdd08dff 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/NodeIterator.java @@ -35,7 +35,7 @@ import org.w3c.dom.NodeList; *

It will traverse the tree and find {@code Node} sequences.

* *

Note: Once the XML Tree is parsed, then the {@code Iterator} will be a - * snap shot of that tree. That means even the tree is modified later, than the + * snapshot of that tree. That means even the tree is modified later, then the * cached paragraph {@code Node} list will not be updated accordingly. For this * reason and for performance reasons this {@code Iterator} does not support any * operation methods such as insert, remove or replace. The main purpose of this @@ -355,4 +355,4 @@ public abstract class NodeIterator implements Iterator { } } } -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java index b0cccc4dfa5c..0ab96e9b8727 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java @@ -30,7 +30,7 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; * sequences.

* *

Note: Once the XML Tree is parsed, then the {@code Iterator} will be a - * snap shot of that tree. That means even the tree is modified later, than the + * snapshot of that tree. That means even the tree is modified later, then the * cached paragraph {@code Node} list will not be updated accordingly. For this * reason and for performance reasons this {@code Iterator} does not support any * operation methods such as insert, remove or replace. The main purpose of this @@ -66,4 +66,4 @@ public final class ParaNodeIterator extends NodeIterator { (nodeName.equals(OfficeConstants.TAG_PARAGRAPH) || nodeName.equals(OfficeConstants.TAG_HEADING)); } -} \ No newline at end of file +} 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 8c480cf318e2..aa1e14cbb6ed 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 @@ -29,7 +29,7 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; *

* *

Note: Once the XML Tree is parsed, then the {@code Iterator} will be a - * snap shot of that tree. That means even the tree is modified later, than the + * snapshot of that tree. That means even the tree is modified later, then the * cached paragraph {@code Node} list will not be updated accordingly. For this * reason and for performance reasons this {@code Iterator} does not support * any operation methods such as insert, remove or replace. The main purpose of @@ -66,4 +66,4 @@ public final class TextNodeIterator extends NodeIterator { nodeName.equals(OfficeConstants.TAG_TAB_STOP) || nodeName.equals(OfficeConstants.TAG_LINE_BREAK); } -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java index 6ce425d205c7..f2db38b65d57 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java @@ -36,7 +36,7 @@ import org.openoffice.xmerge.util.Debug; public final class CharacterBaseParagraphMerge implements NodeMergeAlgorithm { /** - * Merge two paragraph {@code Node} by using Longest Common Subsequence + * Merge two paragraphs {@code Node} by using Longest Common Subsequence * (LCS) character algorithm defined in {@link * org.openoffice.xmerge.merger.diff.CharArrayLCSAlgorithm * CharArrayLCSAlgorithm}. @@ -278,4 +278,4 @@ public final class CharacterBaseParagraphMerge implements NodeMergeAlgorithm { orgNode.setNodeValue(newString); } } -} \ No newline at end of file +} diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java index 414655770848..56b8212b6be8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java @@ -64,7 +64,7 @@ public class IntArrayList { * input as {@code fillValue}.

* * @param minCapacity The minimum capacity of the list. - * @param fillValue This method adds in a integer for each slot that was + * @param fillValue This method adds in an integer for each slot that was * added to ensure that the list meets the minimum * capacity. {@code fillValue} is the value used as the * initial value of these added elements. -- cgit