tmf.core: CustomXmlTrace combine if statements

Change-Id: Id159d52caef5f762788d2081e9f62100579c8b40
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/44482
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>

diff --git a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java
index f30fde0b8b9a6af1a9e36fbbe9fc7544e7fdac35..2485e2c8c584656f4cf07c3b4a88fe8f06283111 100644 (file)
--- a/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java
+++ b/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomXmlTrace.java
@@ -435,7 +435,8 @@ public class CustomXmlTrace extends TmfTrace implements ITmfPersistentlyIndexabl
         String separator = null;
         for (int i = 0; i < nodeList.getLength(); i++) {
             final Node node = nodeList.item(i);
-            if (node.getNodeType() == Node.ELEMENT_NODE) {
+            short nodeType = node.getNodeType();
+            if (nodeType == Node.ELEMENT_NODE) {
                 if (separator == null) {
                     separator = " | "; //$NON-NLS-1$
                 } else {
@@ -452,10 +453,8 @@ public class CustomXmlTrace extends TmfTrace implements ITmfPersistentlyIndexabl
                     parseElement(element, buffer);
                     buffer.append(" ]"); //$NON-NLS-1$
                 }
-            } else if (node.getNodeType() == Node.TEXT_NODE) {
-                if (node.getNodeValue().trim().length() != 0) {
-                    buffer.append(node.getNodeValue().trim());
-                }
+            } else if ((nodeType == Node.TEXT_NODE) && (!node.getNodeValue().trim().isEmpty())) {
+                buffer.append(node.getNodeValue().trim());
             }
         }
         return buffer;