summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorNigel Hawkins <n.hawkins@gmx.com>2010-11-01 14:47:27 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-11-01 21:03:26 +0000
commit7b617a914eafd8e71621606eb0ad718642274678 (patch)
treee42012565eba3218aca3cff9fc187fde1c85653b /xmerge
parentb822b0e5619a113d8fce62aa77bb8dfaffcee5a8 (diff)
Fix javadoc warnings in filters/xmerge - merger
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java5
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java2
2 files changed, 2 insertions, 5 deletions
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 b1d4d5b510fd..afd90733eb68 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -44,15 +44,12 @@ 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.
* @param differences The <code>Difference</code> array.
*
- * @return An <code>Iterator</code> which is the modified original
- * <code>Iterator</code> Sequence. Same as the first parameter.
- *
* @throws MergeException If an error occurs during the merge.
*/
public void applyDifference(Iterator orgSeq, Iterator modSeq,
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 9337816c64ab..525cbd74d481 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
@@ -47,6 +47,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);
}