os: Use time formatter for CPU usage tree viewer

Instead of a custom text with ns, times are shown in human readable
formats

Change-Id: I85db680c6937a241836dce49df847d622b86c642
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/126912
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: CI Bot

3 files changed, 5 insertions, 4 deletions

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java
index e61aec626a..82371e7096 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/CpuUsageTreeViewer.java
@@ -12,6 +12,7 @@
 
 package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.cpuusage;
 
+import java.text.Format;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -19,10 +20,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tracecompass.analysis.os.linux.core.cpuusage.CpuUsageEntryModel;
+import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.SubSecondTimeWithUnitFormat;
 import org.eclipse.tracecompass.internal.analysis.os.linux.core.cpuusage.CpuUsageDataProvider;
 import org.eclipse.tracecompass.tmf.core.model.filters.SelectedCpuQueryFilter;
 import org.eclipse.tracecompass.tmf.core.model.filters.TimeQueryFilter;
@@ -45,6 +46,8 @@ import com.google.common.collect.Iterables;
  */
 public class CpuUsageTreeViewer extends AbstractSelectTreeViewer {
 
+    private static final Format TIME_FORMATTER = new SubSecondTimeWithUnitFormat();
+
     /** Provides label for the CPU usage tree viewer cells */
     protected class CpuLabelProvider extends TreeLabelProvider {
 
@@ -63,7 +66,7 @@ public class CpuUsageTreeViewer extends AbstractSelectTreeViewer {
                 } else if (columnIndex == 2) {
                     return String.format(Messages.CpuUsageComposite_TextPercent, 100 * obj.getPercent());
                 } else if (columnIndex == 3) {
-                    return NLS.bind(Messages.CpuUsageComposite_TextTime, obj.getModel().getTime());
+                    return TIME_FORMATTER.format(obj.getModel().getTime());
                 }
             }
             return null;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/Messages.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/Messages.java
index 1eaeadbd27..8503c0fe4c 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/Messages.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/Messages.java
@@ -29,7 +29,6 @@ public class Messages extends NLS {
     public static String CpuUsageComposite_ColumnTID;
     public static String CpuUsageComposite_ColumnTime;
     public static String CpuUsageComposite_TextPercent;
-    public static String CpuUsageComposite_TextTime;
     public static String CpuUsageComposite_ColumnLegend;
     public static String CpuUsageView_Title;
     public static String CpuUsageXYViewer_CpuYAxis;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/messages.properties b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/messages.properties
index 151780b57d..f192da3d10 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/messages.properties
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/cpuusage/messages.properties
@@ -15,7 +15,6 @@ CpuUsageComposite_ColumnProcess=Process
 CpuUsageComposite_ColumnTID=TID
 CpuUsageComposite_ColumnTime=Time
 CpuUsageComposite_TextPercent=%1$.3f %%
-CpuUsageComposite_TextTime={0} ns
 CpuUsageComposite_ColumnLegend=Legend
 CpuUsageView_Title=CPU Usage
 CpuUsageXYViewer_CpuYAxis=% CPU