diff options
3 files changed, 8 insertions, 10 deletions
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 2a1b4d22cb32..b0cccc4dfa5c 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 @@ -38,10 +38,6 @@ import org.openoffice.xmerge.converter.xml.OfficeConstants; */ public final class ParaNodeIterator extends NodeIterator { - // can be expanded to an array in the future, not necessary right now - private static final String SUPPORTED_TAG1 = OfficeConstants.TAG_PARAGRAPH; - private static final String SUPPORTED_TAG2 = OfficeConstants.TAG_HEADING; - /** * Standard constructor. * @@ -65,8 +61,9 @@ public final class ParaNodeIterator extends NodeIterator { protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for // future expansion + String nodeName = node.getNodeName(); return node.getNodeType() == Node.ELEMENT_NODE && - (node.getNodeName().equals(SUPPORTED_TAG1) || - node.getNodeName().equals(SUPPORTED_TAG2)); + (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/RowIterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java index 7d84f7a7812b..972e388020ed 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 @@ -61,6 +61,6 @@ public final class RowIterator extends NodeIterator { // can use an array later to check all possible tags for // future expansion return node.getNodeType() == Node.ELEMENT_NODE && - node.getNodeName().equals(OfficeConstants.TAG_TABLE_ROW); + node.getNodeName().equals(OfficeConstants.TAG_TABLE_ROW); } }
\ 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 fa7c6086c36b..8c480cf318e2 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 @@ -60,9 +60,10 @@ public final class TextNodeIterator extends NodeIterator { protected boolean nodeSupported(Node node) { // can use an array later to check all possible tags for // future expansion + String nodeName = node.getNodeName(); return node.getNodeType() == Node.TEXT_NODE || - node.getNodeName().equals(OfficeConstants.TAG_SPACE) || - node.getNodeName().equals(OfficeConstants.TAG_TAB_STOP) || - node.getNodeName().equals(OfficeConstants.TAG_LINE_BREAK); + nodeName.equals(OfficeConstants.TAG_SPACE) || + nodeName.equals(OfficeConstants.TAG_TAB_STOP) || + nodeName.equals(OfficeConstants.TAG_LINE_BREAK); } }
\ No newline at end of file |