tmf: Bug 494952: Remove deadlock in Time Chart view

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.ui / src / org / eclipse / tracecompass / tmf / ui / widgets / timegraph / TimeGraphViewer.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
index ab5fd9b1643628e5e28000af43911c06823987a9..976eafec7bb79eee227e700b0371c688ad2ed8bb 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
@@ -320,7 +320,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
      * Sets the tree columns for this time graph combo's filter dialog.
      *
      * @param columnNames the tree column names
-     * @since 2.0
+     * @since 1.2
      */
     public void setFilterColumns(String[] columnNames) {
         getShowFilterDialogAction().getFilterDialog().setColumnNames(columnNames);
@@ -330,7 +330,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
      * Sets the tree content provider used by the filter dialog
      *
      * @param contentProvider the tree content provider
-     * @since 2.0
+     * @since 1.2
      */
     public void setFilterContentProvider(ITreeContentProvider contentProvider) {
         getShowFilterDialogAction().getFilterDialog().setContentProvider(contentProvider);
@@ -340,7 +340,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
      * Sets the tree label provider used by the filter dialog
      *
      * @param labelProvider the tree label provider
-     * @since 2.0
+     * @since 1.2
      */
     public void setFilterLabelProvider(ITableLabelProvider labelProvider) {
         getShowFilterDialogAction().getFilterDialog().setLabelProvider(labelProvider);
@@ -548,11 +548,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
         fTimeGraphCtrl.addKeyListener(new KeyAdapter() {
             @Override
             public void keyPressed(KeyEvent e) {
-                if ((e.character == '+' || e.character == '=') && ((e.stateMask & SWT.CTRL) == 0)) {
-                    zoomIn();
-                } else if (e.character == '-' && ((e.stateMask & SWT.CTRL) == 0)) {
-                    zoomOut();
-                } else if (e.keyCode == '.') {
+                if (e.keyCode == '.') {
                     boolean extend = (e.stateMask & SWT.SHIFT) != 0;
                     if (extend) {
                         extendToNextMarker();
@@ -983,6 +979,19 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
         fTimeRangeFixed = false;
     }
 
+    /**
+     * @since 2.0
+     */
+    @Override
+    public void resetStartFinishTime(boolean notify) {
+        if (notify) {
+            setStartFinishTimeNotify(fTime0Bound, fTime1Bound);
+        } else {
+            setStartFinishTime(fTime0Bound, fTime1Bound);
+        }
+        fTimeRangeFixed = false;
+    }
+
     @Override
     public void setSelectedTimeNotify(long time, boolean ensureVisible) {
         setSelectedTimeInt(time, ensureVisible, true);
@@ -1002,7 +1011,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
     }
 
     /**
-     * @since 2.0
+     * @since 1.2
      */
     @Override
     public void setSelectionRangeNotify(long beginTime, long endTime, boolean ensureVisible) {
@@ -1010,7 +1019,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
     }
 
     /**
-     * @since 2.0
+     * @since 1.2
      */
     @Override
     public void setSelectionRange(long beginTime, long endTime, boolean ensureVisible) {
@@ -1827,7 +1836,8 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
         if (parent != null) {
             fTimeGraphCtrl.setExpandedState(parent, true);
         }
-        setSelection(entry);
+        fSelectedEntry = entry;
+        fTimeGraphCtrl.selectItem(entry, false);
         adjustVerticalScrollBar();
     }
 
@@ -2141,7 +2151,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
      * Get the show filter dialog action.
      *
      * @return The Action object
-     * @since 2.0
+     * @since 1.2
      */
     public ShowFilterDialogAction getShowFilterDialogAction() {
         if (fShowFilterDialogAction == null) {
@@ -2546,7 +2556,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
      * Returns this viewer's filters.
      *
      * @return an array of viewer filters
-     * @since 2.0
+     * @since 1.2
      */
     public @NonNull ViewerFilter[] getFilters() {
         return fTimeGraphCtrl.getFilters();
@@ -2558,7 +2568,7 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
      *
      * @param filters
      *            an array of viewer filters, or null
-     * @since 2.0
+     * @since 1.2
      */
     public void setFilters(@NonNull ViewerFilter[] filters) {
         fTimeGraphCtrl.setFilters(filters);