[PATCH 14/17] Fix javadoc warnings in filters/xmerge - merger

[Nigel Hawkins]

---
 .../openoffice/xmerge/merger/MergeAlgorithm.java   |    5 +----
 .../xmerge/merger/NodeMergeAlgorithm.java          |    2 +-
 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 c3b5f3c..6f8a810 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 9ff5617..1fcc6c6 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);
 }
 
-- 
1.7.0.4


--=-zi8rTBtV5HRgom5kjdOr
Content-Disposition: attachment; filename*0=0015-Fix-javadoc-comments-in-filters-xmerge-XMergeBridge..pat; filename*1=ch
Content-Type: text/x-patch; name="0015-Fix-javadoc-comments-in-filters-xmerge-XMergeBridge..patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit