diff options
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/merger')
18 files changed, 0 insertions, 36 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java index 49aae7faaddd..7378f5b1be98 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java @@ -24,8 +24,6 @@ package org.openoffice.xmerge.merger; * <code>DiffAlgorithm</code> as a set of difference between two * <code>Iterators</code> (the original and modified * <code>Iterators</code>). - * - * @author smak */ public final class Difference { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java index 4466f32d7c31..7a35abb03bd8 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java @@ -24,8 +24,6 @@ package org.openoffice.xmerge.merger; * DiffAlgorithm} and {@link * org.openoffice.xmerge.merger.MergeAlgorithm * MergeAlgorithm} to access a <code>Document</code>. - * - * @author smak */ public interface Iterator { 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 3a242dbe5ab5..3e7360a665c3 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java @@ -26,8 +26,6 @@ import org.openoffice.xmerge.merger.Difference; * This is the <code>MergeAlgorithm</code> interface. It is an * interface so that different merge algorithms may be plugged-in * to actually merge the diffs back to an original document. - * - * @author smak */ public interface MergeAlgorithm { 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 2d998885d9e2..eed70495c21a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java @@ -25,8 +25,6 @@ import org.w3c.dom.Node; * org.openoffice.xmerge.merger.MergeAlgorithm * MergeAlgorithm} to merge two <code>Node</code> objects. It is an * interface so that different merge algorithms may be plugged-in. - * - * @author smak */ public interface NodeMergeAlgorithm { 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 cf93b719d3ac..16102e831fc4 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 @@ -36,8 +36,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; * this <code>Iterator</code> does not support any operation methods such * as insert, remove or replace. The main purpose of this * <code>Iterator</code> is to be used with difference, not with merge.</p> - * - * @author smak */ public final class CellNodeIterator extends NodeIterator { 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 77bc4732452e..6f558e00bf84 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 @@ -28,8 +28,6 @@ import org.openoffice.xmerge.merger.Difference; * <p>It also use Longest Common Subsequence (LCS). The algorithm is based * on the book "Introduction to Algorithms" by Thomas H.Cormen, * Charles E.Leiserson, and Ronald L.Riverst (MIT Press 1990) page 314.</p> - * - * @author smak */ public class CharArrayLCSAlgorithm { 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 da22778ad1ab..258401e4135b 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 @@ -39,8 +39,6 @@ import java.util.List; * not support any operation methods such as insert, remove or replace. The * main purpose of this <code>Iterator</code> is to be used with difference, * not with merge.</p> - * - * @author smak */ public class CharacterParser { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java index 58e511c5f022..c7959be59225 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java @@ -29,8 +29,6 @@ import org.openoffice.xmerge.util.Debug; * Using Longest Common Subsequence (LCS). The algorithm here is based * on the book "Introduction to Algorithms" by Thomas H.Cormen, * Charles E.Leiserson and Ronald L.Riverst (MIT Press 1990) page 314. - * - * @author smak */ public class IteratorLCSAlgorithm implements DiffAlgorithm { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java index 7a0cdf2c4680..94d4112de75b 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java @@ -52,8 +52,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; * </li></ol></p> * * <p>NOTE: The algorithm will have potential side effect to split rows.</p> - * - * @author smak */ public class IteratorRowCompare implements DiffAlgorithm { 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 31cc2efca0b0..0e67e9763693 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 @@ -41,8 +41,6 @@ import org.w3c.dom.NodeList; * <code>Iterator</code> does not support any operation methods such as * insert, remove or replace. The main purpose of this * <code>Iterator</code> is to be used with difference, not with merge.</p> - * - * @author smak */ public abstract class NodeIterator implements Iterator { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java index 1327e4b36b2e..9854d16a0b8a 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ObjectArrayIterator.java @@ -25,8 +25,6 @@ import org.openoffice.xmerge.merger.Iterator; * It is based upon a simple <code>Object</code> array.</p> * * <p>Note: this class is not thread safe for performance reasons.</p> - * - * @author smak */ public final class ObjectArrayIterator implements Iterator { 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 3279eeb870ee..23ba1d3b7f07 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 @@ -36,8 +36,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; * <code>Iterator</code> does not support any operation methods such as * insert, remove or replace. The main purpose of this * <code>Iterator</code> is to be used with difference, not with merge.</p> - * - * @author smak */ public final class ParaNodeIterator extends NodeIterator { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java index babe1df6a8a6..779393e33540 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java @@ -27,8 +27,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; /** * This is an implementation of the <code>Iterator</code> interface and extends * <code>NodeIterator</code>. It will traverse the tree and find row sequences. - * - * @author smak */ public final class RowIterator extends NodeIterator { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java index 5c494fabfb8f..d20a0055e9c3 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeEntry.java @@ -25,8 +25,6 @@ import org.w3c.dom.Node; * <code>Node</code> pointer in a text <code>Node</code>. It is * mainly used for character parser to make a list of text * <code>Node</code> cache entries. - * - * @author smak */ public class TextNodeEntry { 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 f40aaff3cd7d..24509141d2d5 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 @@ -35,8 +35,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; * this <code>Iterator</code> does not support any operation methods * such as insert, remove or replace. The main purpose of this * <code>Iterator</code> is to be used with difference, not with merge.</p> - * - * @author smak */ public final class TextNodeIterator extends NodeIterator { 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 36c1b72c856b..a303794c67e5 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 @@ -31,8 +31,6 @@ import org.openoffice.xmerge.util.Debug; * This is an implementation of the <code>NodeMergeAlgorithm</code> * interface. It is used to merge two paragraph <code>Node</code> * objects based on character comparisons. - * - * @author smak */ public final class CharacterBaseParagraphMerge implements NodeMergeAlgorithm { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java index cb60e1614b2a..87dd1dabbf05 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/DocumentMerge.java @@ -35,8 +35,6 @@ import org.openoffice.xmerge.util.XmlUtil; * appropriate class which implements {@link * org.openoffice.xmerge.merger.NodeMergeAlgorithm * NodeMergeAlgorithm} to perform the merge. - * - * @author smak */ public class DocumentMerge implements MergeAlgorithm { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java index f64c137424f2..0af951fe0337 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetMerge.java @@ -32,8 +32,6 @@ import org.openoffice.xmerge.merger.NodeMergeAlgorithm; * is that this merge will try to maintain unsupported features by * examining the cell <code>node</code> objects one by one when it * removes a node from the original <code>Iterator</code>. - * - * @author smak */ public final class SheetMerge extends DocumentMerge { |