Optimize

Author: TranHoangThanhDuy

tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xychart/linechart/TmfCommonXLineChartTooltipProvider.java

@@ -23,14 +23,16 @@
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGBA;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.tracecompass.internal.tmf.ui.Messages;
 import org.eclipse.tracecompass.tmf.core.presentation.RGBAColor;
+import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
+import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp;
 import org.eclipse.tracecompass.tmf.ui.viewers.TmfAbstractToolTipHandler;
 import org.eclipse.tracecompass.tmf.ui.viewers.TmfAbstractToolTipHandler.ToolTipString;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.IAxis;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.ITmfChartTimeProvider;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.IXYSeries;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.TmfBaseProvider;
-import org.eclipse.tracecompass.tmf.ui.viewers.xychart.linechart.TmfCommonXAxisChartViewer;
 
 /**
  * Displays a tooltip on line charts. For each series, it shows the y value at
@@ -93,16 +95,19 @@ protected boolean isValidSeriesIndex(IXYSeries series, int index) {
     }
 
     protected void addAdditionalTooltipItems(double xCoordinate, String seriesKey) {
-        // Default: no-op
+        ITmfTimestamp time = TmfTimestamp.fromNanos((long) xCoordinate + getChartViewer().getTimeOffset());
+        addItem(null,
+                ToolTipString.fromString(Messages.TmfCommonXLineChartTooltipProvider_time),
+                ToolTipString.fromTimestamp(time.toString(), time.toNanos()));
     }
 
-    protected void addSeriesTooltipItem(IXYSeries series, String key, int index, Format format) {
+    protected void addSeriesTooltipItem(IXYSeries series, int index, Format format) {
         double[] ySeries = series.getYSeries();
         if (ySeries == null || index < 0 || index >= ySeries.length) {
             return;
         }
 
-        String label = formatSeriesLabel(series, key);
+        String label = formatSeriesLabel(series);
         double yValue = ySeries[index];
         if (format == null) {
             addItem(null, ToolTipString.fromHtml(label), ToolTipString.fromDecimal(yValue));
@@ -111,7 +116,8 @@ protected void addSeriesTooltipItem(IXYSeries series, String key, int index, For
         }
     }
 
-    protected String formatSeriesLabel(IXYSeries series, String key) {
+    protected String formatSeriesLabel(IXYSeries series) {
+        String key = series.getId();
         String label = (key == null) ? "" : key; //$NON-NLS-1$
         Color color = series.getColor();
         if (color != null) {
@@ -147,19 +153,20 @@ public void fill(Control control, MouseEvent event, Point pt) {
                 format = chartViewer.getSwtChart().getAxisSet().getYAxes()[0].getTick().getFormat();
             }
 
-            boolean additionalItemsAdded = false;
+            String firstValidSeriesKey = null;
             for (IXYSeries xySeries : series) {
-                if (!isValidSeriesIndex(xySeries, index)) {
-                    continue;
+                if (isValidSeriesIndex(xySeries, index)) {
+                    firstValidSeriesKey = xySeries.getId();
+                    break;
                 }
+            }
+            addAdditionalTooltipItems(xCoordinate, firstValidSeriesKey);
 
-                String key = xySeries.getId();
-                if (!additionalItemsAdded) {
-                    addAdditionalTooltipItems(xCoordinate, key);
-                    additionalItemsAdded = true;
+            for (IXYSeries xySeries : series) {
+                if (!isValidSeriesIndex(xySeries, index)) {
+                    continue;
                 }
-
-                addSeriesTooltipItem(xySeries, key, index, format);
+                addSeriesTooltipItem(xySeries, index, format);
             }
         }
     }