From c0794ee73799939d9873cbe68a50a86fed8c4b5d Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 1 Jun 2016 15:50:11 -0400 Subject: [PATCH] analysis.lami: merge control flow on ranges equal zero MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://git.eclipse.org/r/74314 Reviewed-by: Patrick Tasse Tested-by: Patrick Tasse Reviewed-by: Alexandre Montplaisir Reviewed-by: Mathieu Desnoyers Reviewed-by: Hudson CI --- .../analysis/lami/ui/format/LamiTimeStampFormat.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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()))); } -- 2.34.1