[Libreoffice-commits] core.git: xmerge/source

[Robert Antoni Buj i Gelonch]

 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/ParaNodeIterator.java |    9 +++------
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/RowIterator.java      |    2 +-
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java |    7 ++++---
 3 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 5b0e6aea60ece93d72f4d256817da67df7150519
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Tue Oct 7 11:14:34 2014 +0200

    xmerge: reuse the value of node.getNodeName() and remove duplicated constants
    
    Change-Id: Ia835139496ab8e5230a09df2caf23637a5559ba4
    Reviewed-on: https://gerrit.libreoffice.org/11836
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

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 2a1b4d2..b0cccc4 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 7d84f7a..972e388 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 fa7c608..8c480cf 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