1 files changed, 10 insertions, 17 deletions

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
index 144c658a2dca..b3bff5b1d81b 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/PositionBaseRowMerge.java
@@ -30,28 +30,26 @@ import org.openoffice.xmerge.merger.diff.CellNodeIterator;
 import org.openoffice.xmerge.converter.xml.OfficeConstants;
 import org.openoffice.xmerge.util.XmlUtil;
 
-
 /**
- *  This is an implementation of the <code>NodeMergeAlgorithm</code>
- *  interface.  It is used to merge two rows using a positional
- *  comparison base method.
+ * This is an implementation of the {@code NodeMergeAlgorithm} interface.
+ *
+ * <p>It is used to merge two rows using a positional comparison base method.
+ * </p>
  */
 public final class PositionBaseRowMerge implements NodeMergeAlgorithm {
 
-    /**  The capabilities of this converter. */
+    /** The capabilities of this converter. */
     private ConverterCapabilities cc_;
 
-
     /**
-     *  Constructor.
+     * Constructor.
      *
-     *  @param  cc  The <code>ConverterCapabilities</code>.
+     * @param  cc  The {@code ConverterCapabilities}.
      */
     public PositionBaseRowMerge(ConverterCapabilities cc) {
         cc_ = cc;
     }
 
-
     public void merge(Node orgRow, Node modRow) {
 
         Iterator orgCells = new CellNodeIterator(cc_, orgRow);
@@ -60,7 +58,6 @@ public final class PositionBaseRowMerge implements NodeMergeAlgorithm {
         mergeCellSequences(orgCells, modCells);
     }
 
-
     // used to compare the cell 1 by 1
     private void mergeCellSequences(Iterator orgSeq, Iterator modSeq) {
 
@@ -72,7 +69,6 @@ public final class PositionBaseRowMerge implements NodeMergeAlgorithm {
 
         while (orgSeqObject != null) {
 
-
             needMerge = true;
 
             if (modSeqObject ==  null)  {
@@ -163,9 +159,8 @@ public final class PositionBaseRowMerge implements NodeMergeAlgorithm {
         }
     }
 
-
-    private Element splitColRepeatedCell(Element orgCell,
-                                         int splitNum, int orgNum) {
+    private Element splitColRepeatedCell(Element orgCell, int splitNum,
+                                         int orgNum) {
         // NOTE: should we really want to do deep clone?
         // in most the case, it is an empty cell, but the
         // specification didn't forbid any node to use multiple
@@ -196,7 +191,6 @@ public final class PositionBaseRowMerge implements NodeMergeAlgorithm {
         return splitCell;
     }
 
-
     private void mergeCells(Element orgCell, Element modCell) {
 
         // remove all the supported attributes and possible text child for
@@ -247,5 +241,4 @@ public final class PositionBaseRowMerge implements NodeMergeAlgorithm {
             }
         }
     }
-}
-
+}
\ No newline at end of file