From ab400cf1b2f0918e4b14826c9550975bd5d2a723 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Fri, 27 Nov 2015 17:36:24 -0500 Subject: [PATCH] ss: Avoid concatenating nonliterals in TmfStateInterval#toString() Change-Id: Ia5a18114a73418ad677b7d8b3a606c2f67af36b2 Signed-off-by: Jean-Christian Kouame Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/60557 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam --- .../META-INF/MANIFEST.MF | 3 ++- .../statesystem/core/interval/TmfStateInterval.java | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/statesystem/org.eclipse.tracecompass.statesystem.core/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.statesystem.core/META-INF/MANIFEST.MF index e5e675127d..e7b6481826 100644 --- a/statesystem/org.eclipse.tracecompass.statesystem.core/META-INF/MANIFEST.MF +++ b/statesystem/org.eclipse.tracecompass.statesystem.core/META-INF/MANIFEST.MF @@ -19,4 +19,5 @@ Export-Package: org.eclipse.tracecompass.internal.statesystem.core;x-friends:="o org.eclipse.tracecompass.statesystem.core.exceptions, org.eclipse.tracecompass.statesystem.core.interval, org.eclipse.tracecompass.statesystem.core.statevalue -Import-Package: com.google.common.collect;version="12.0.0" +Import-Package: com.google.common.base, + com.google.common.collect;version="12.0.0" diff --git a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/interval/TmfStateInterval.java b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/interval/TmfStateInterval.java index be4e50e878..d2bd91c4f3 100644 --- a/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/interval/TmfStateInterval.java +++ b/statesystem/org.eclipse.tracecompass.statesystem.core/src/org/eclipse/tracecompass/statesystem/core/interval/TmfStateInterval.java @@ -14,6 +14,8 @@ package org.eclipse.tracecompass.statesystem.core.interval; import org.eclipse.tracecompass.statesystem.core.statevalue.ITmfStateValue; +import com.google.common.base.Objects; + /** * The StateInterval represents the "state" a particular attribute was in, at a * given time. It is the main object being returned from queries to the state @@ -81,11 +83,12 @@ public final class TmfStateInterval implements ITmfStateInterval { @Override public String toString() { /* Only used for debugging */ - StringBuffer buf = new StringBuffer(start + " to "); //$NON-NLS-1$ - buf.append(end + ", "); //$NON-NLS-1$ - buf.append(String.format("key = %4d, ", attribute)); //$NON-NLS-1$ - buf.append("value = " + sv.toString()); //$NON-NLS-1$ - return buf.toString(); + return Objects.toStringHelper(this) + .add("start", start) //$NON-NLS-1$ + .add("end", end) //$NON-NLS-1$ + .add("key", attribute) //$NON-NLS-1$ + .add("value", sv.toString()) //$NON-NLS-1$ + .toString(); } } -- 2.34.1