From 737792b63250b2dd145d61c6f81d3957202cd1f8 Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Tue, 17 Nov 2015 17:10:55 -0500 Subject: [PATCH] tmf: Allow AbstractTimeGraphView subclass to set filter content provider Change-Id: I4127bff23d3a76bb0f23758568d1211eaaa1f60f Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/60666 Reviewed-by: Hudson CI --- .../views/timegraph/AbstractTimeGraphView.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java index a934df7daa..d6909b4c7c 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java @@ -203,6 +203,9 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA /** The pack done flag */ private boolean fPackDone = false; + /** The filter content provider, or null if filter is not used */ + private ITreeContentProvider fFilterContentProvider; + /** The filter label provider, or null if filter is not used */ private TreeLabelProvider fFilterLabelProvider; @@ -814,6 +817,18 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA fFilterColumns = filterColumns; } + /** + * Sets the filter content provider. + * This should be called from the constructor. + * + * @param contentProvider + * The filter content provider + * @since 2.0 + */ + protected void setFilterContentProvider(final ITreeContentProvider contentProvider) { + fFilterContentProvider = contentProvider; + } + /** * Sets the filter label provider. * This should be called from the constructor. @@ -1043,7 +1058,7 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA combo.setTreeColumns(fColumns); } fTimeGraphWrapper.setTimeGraphContentProvider(fTimeGraphContentProvider); - fTimeGraphWrapper.setFilterContentProvider(fTimeGraphContentProvider); + fTimeGraphWrapper.setFilterContentProvider(fFilterContentProvider != null ? fFilterContentProvider : fTimeGraphContentProvider); fTimeGraphWrapper.setFilterLabelProvider(fFilterLabelProvider); fTimeGraphWrapper.setFilterColumns(fFilterColumns); -- 2.34.1