tmf: Avoid recursion in AbstractSegmentStoreTableViewer pack listener

[deliverable/tracecompass.git] / analysis / org.eclipse.tracecompass.analysis.timing.ui / src / org / eclipse / tracecompass / analysis / timing / ui / views / segmentstore / AbstractSegmentStoreTableViewer.java

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/AbstractSegmentStoreTableViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/AbstractSegmentStoreTableViewer.java
index 018fb46401bfeb69226ccacfe22a00ebe3d3748f..ae868e76067070d4fbee0595c641e78a2b0fbb71 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/AbstractSegmentStoreTableViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/AbstractSegmentStoreTableViewer.java
@@ -363,6 +363,7 @@ public abstract class AbstractSegmentStoreTableViewer extends TmfSimpleTableView
     // ------------------------------------------------------------------------
     // Helper methods
     // ------------------------------------------------------------------------
+
     /*
      * Add the listener for SetData on the table
      */
@@ -370,14 +371,15 @@ public abstract class AbstractSegmentStoreTableViewer extends TmfSimpleTableView
         getControl().addListener(SWT.SetData, new Listener() {
             @Override
             public void handleEvent(@Nullable Event event) {
+                // Remove the listener before the pack
+                getControl().removeListener(SWT.SetData, this);
+
                 // Pack the column the first time data is set
                 TableViewer tableViewer = getTableViewer();
                 if (tableViewer != null) {
                     for (TableColumn col : tableViewer.getTable().getColumns()) {
                         col.pack();
                     }
-                    // Remove the listener after the pack
-                    getControl().removeListener(SWT.SetData, this);
                 }
             }
         });