Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Chouinard2012-07-13 10:59:56 -0400
committerGerrit Code Review @ Eclipse.org2012-07-13 10:59:56 -0400
commit302b681beffd30733e522c8d742302866e28fcec (patch)
tree275c305f012fcb87eb63fce99e4c3f3f21d58446
parent8ea9dcf8a28f570eb67754749bef09f0cfc78dde (diff)
parent7019a00d22ce11aa7043356b387cb9ebebf1eba3 (diff)
downloadorg.eclipse.linuxtools-302b681beffd30733e522c8d742302866e28fcec.tar.gz
org.eclipse.linuxtools-302b681beffd30733e522c8d742302866e28fcec.tar.xz
org.eclipse.linuxtools-302b681beffd30733e522c8d742302866e28fcec.zip
Merge "Fix for bug 385055: Time graph selection prevents trace garbage collection."
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java3
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java1
2 files changed, 4 insertions, 0 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java
index 733d2800fa..f8039cd4c0 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphCombo.java
@@ -594,6 +594,9 @@ public class TimeGraphCombo extends Composite {
public void setInput(ITimeGraphEntry[] input) {
fInhibitTreeSelection = true;
fTreeViewer.setInput(input);
+ for (SelectionListenerWrapper listenerWrapper : fSelectionListenerMap.values()) {
+ listenerWrapper.selection = null;
+ }
fInhibitTreeSelection = false;
fTreeViewer.expandAll();
fTreeViewer.getTree().getVerticalBar().setEnabled(false);
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java
index 1c78b54ead..ca3c629a53 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/widgets/timegraph/TimeGraphViewer.java
@@ -142,6 +142,7 @@ public class TimeGraphViewer implements ITimeDataProvider, SelectionListener {
_verticalScrollBar.setEnabled(true);
setTopIndex(0);
_selectedTime = 0;
+ _selectedEntry = null;
refreshAllData(input);
}
}

Back to the top