From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 1 Jun 2016 19:50:11 +0000 (-0400)
Subject: analysis.lami: merge control flow on ranges equal zero
X-Git-Url: http://git.efficios.com/?p=deliverable%2Ftracecompass.git;a=commitdiff_plain;h=c0794ee73799939d9873cbe68a50a86fed8c4b5d

analysis.lami: merge control flow on ranges equal zero

Even thought it is the expected behaviour Coverity/Sonar flags the two
"if"s as a potential code duplication and infers an error.

Let's comply to Coverity/Sonar.

Note: Patrick Tassé did mention to merge the two "if"s during initial
review [1] and it was simply forgotten.

Coverity ID: 115874

[1] https://git.eclipse.org/r/#/c/73239/7/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/format/LamiTimeStampFormat.java

Change-Id: I22cf9499eb53fd547ae3ebfc73161f21db5cac47
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Reviewed-on: https://git.eclipse.org/r/74314
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Reviewed-by: Hudson CI
---

diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/format/LamiTimeStampFormat.java b/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/format/LamiTimeStampFormat.java
index 87c607b39a..05e437a9c7 100644
--- a/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/format/LamiTimeStampFormat.java
+++ b/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/format/LamiTimeStampFormat.java
@@ -130,11 +130,8 @@ public class LamiTimeStampFormat extends Format {
                 return checkNotNull(toAppendTo.append(fFormat.format(time)));
             }
 
-            if (internalRange.getDelta().compareTo(BigDecimal.ZERO) == 0) {
-                return checkNotNull(toAppendTo.append(fFormat.format(externalRange.getMinimum().doubleValue())));
-            }
-
-            if (externalRange.getDelta().compareTo(BigDecimal.ZERO) == 0) {
+            if (internalRange.getDelta().compareTo(BigDecimal.ZERO) == 0 ||
+                    externalRange.getDelta().compareTo(BigDecimal.ZERO) == 0) {
                 return checkNotNull(toAppendTo.append(fFormat.format(externalRange.getMinimum().doubleValue())));
             }