Skip to content

Commit

Permalink
Bug 581856: Remove the deprecated IFilterProperty
Browse files Browse the repository at this point in the history 
Replace it with CoreFilterProperty use, as prescribed by the deprecation
notice.

Deprecated in org.eclipse.tracecompass commit 2d3d2f02cd, since v7.1.0.

Reorganize the imports while doing these replacements, accordingly.

This change accompanies the corresponding removal in o.e.tracecompass.

Change-Id: I1a34c26fcc662b65ed26535e18da9c80f644aa4d
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/201572
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
  • Loading branch information
@marco-miller
marco-miller committed Apr 27, 2023
1 parent 15eebd2 commit 99ff910
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
24 changes: 12 additions & 12 deletions ...s/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java
View file
Expand Up @@ -90,8 +90,8 @@
import org.eclipse.tracecompass.internal.provisional.tmf.core.model.filters.TraceCompassFilter;
import org.eclipse.tracecompass.internal.tmf.ui.Activator;
import org.eclipse.tracecompass.internal.tmf.ui.util.TimeGraphStyleUtil;
import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty;
import org.eclipse.tracecompass.tmf.core.model.ICoreElementResolver;
import org.eclipse.tracecompass.tmf.core.model.timegraph.IFilterProperty;
import org.eclipse.tracecompass.tmf.core.resources.ITmfMarker;
import org.eclipse.tracecompass.tmf.core.signal.TmfDataModelSelectedSignal;
import org.eclipse.tracecompass.tmf.core.signal.TmfMarkerEventSourceUpdatedSignal;
Expand Down Expand Up @@ -1904,7 +1904,7 @@ public void doRun() {
if (filterDialog.hasActiveSavedFilters()) {
computedLinks = Collections.emptyList();
} else {
computedLinks.forEach(link -> link.setProperty(IFilterProperty.DIMMED, filterDialog.isFilterActive()));
computedLinks.forEach(link -> link.setProperty(CoreFilterProperty.DIMMED, filterDialog.isFilterActive()));
}
}
}
Expand Down Expand Up @@ -2043,7 +2043,7 @@ protected void doFilterEvents(TimeGraphEntry entry, List<ITimeEvent> eventList,

boolean status = value.test(toTest);
Integer property = mapEntry.getKey();
if (property == IFilterProperty.DIMMED || property == IFilterProperty.EXCLUDE) {
if (property == CoreFilterProperty.DIMMED || property == CoreFilterProperty.EXCLUDE) {
te.setProperty(property, !status);
} else {
te.setProperty(property, status);
Expand All @@ -2070,7 +2070,7 @@ && getTimeEventFilterDialog() != null && getTimeEventFilterDialog().hasActiveSav
eventList.forEach(te -> {
// Keep only the events that do not have the 'exclude' property
// activated
if (!te.isPropertyActive(IFilterProperty.EXCLUDE)) {
if (!te.isPropertyActive(CoreFilterProperty.EXCLUDE)) {
filtered.add(te);
}
});
Expand All @@ -2082,17 +2082,17 @@ && getTimeEventFilterDialog() != null && getTimeEventFilterDialog().hasActiveSav
for (ITimeEvent event : filtered) {
if (prevTime < event.getTime()) {
NullTimeEvent nullTimeEvent = new NullTimeEvent(entry, prevTime, event.getTime() - prevTime);
nullTimeEvent.setProperty(IFilterProperty.DIMMED, true);
nullTimeEvent.setProperty(IFilterProperty.EXCLUDE, true);
nullTimeEvent.setProperty(CoreFilterProperty.DIMMED, true);
nullTimeEvent.setProperty(CoreFilterProperty.EXCLUDE, true);
eventList.add(nullTimeEvent);
}
eventList.add(event);
prevTime = event.getTime() + event.getDuration();
}
if (prevTime < endTime) {
NullTimeEvent nullTimeEvent = new NullTimeEvent(entry, prevTime, endTime - prevTime);
nullTimeEvent.setProperty(IFilterProperty.DIMMED, true);
nullTimeEvent.setProperty(IFilterProperty.EXCLUDE, true);
nullTimeEvent.setProperty(CoreFilterProperty.DIMMED, true);
nullTimeEvent.setProperty(CoreFilterProperty.EXCLUDE, true);
eventList.add(nullTimeEvent);
}
}
Expand Down Expand Up @@ -2390,13 +2390,13 @@ private void createContextMenu() {
@NonNull
String dialogRegex = fTimeEventFilterDialog != null ? fTimeEventFilterDialog.getTextBoxRegex() : ""; //$NON-NLS-1$
if (!dialogRegex.isEmpty()) {
regexes.put(IFilterProperty.DIMMED, dialogRegex);
regexes.put(CoreFilterProperty.DIMMED, dialogRegex);
}

Set<@NonNull String> savedFilters = fTimeEventFilterDialog != null ? fTimeEventFilterDialog.getSavedFilters() : Collections.emptySet();
for (String savedFilter : savedFilters) {
regexes.put(IFilterProperty.EXCLUDE, savedFilter);
regexes.put(IFilterProperty.DIMMED, savedFilter);
regexes.put(CoreFilterProperty.EXCLUDE, savedFilter);
regexes.put(CoreFilterProperty.DIMMED, savedFilter);
}

ITmfTrace trace = fTrace;
Expand All @@ -2407,7 +2407,7 @@ private void createContextMenu() {
if (globalFilter == null) {
return regexes;
}
regexes.putAll(IFilterProperty.DIMMED, globalFilter.getRegexes());
regexes.putAll(CoreFilterProperty.DIMMED, globalFilter.getRegexes());

return regexes;
}
Expand Down
6 changes: 3 additions & 3 deletions ...tor/internal/tmf/ui/multiview/ui/view/timegraph/BaseDataProviderTimeGraphMultiViewer.java
View file
Expand Up @@ -44,13 +44,13 @@
import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderManager;
import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils;
import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite;
import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty;
import org.eclipse.tracecompass.tmf.core.model.IOutputElement;
import org.eclipse.tracecompass.tmf.core.model.annotations.Annotation;
import org.eclipse.tracecompass.tmf.core.model.annotations.AnnotationCategoriesModel;
import org.eclipse.tracecompass.tmf.core.model.annotations.AnnotationModel;
import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider;
import org.eclipse.tracecompass.tmf.core.model.annotations.IAnnotation.AnnotationType;
import org.eclipse.tracecompass.tmf.core.model.timegraph.IFilterProperty;
import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider;
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow;
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphDataProvider;
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphRowModel;
Expand Down Expand Up @@ -489,7 +489,7 @@ protected List<ITimeEvent> createTimeEvents(TimeGraphEntry entry, List<ITimeGrap
// fill in the gap.
TimeEvent timeEvent = new TimeEvent(entry, prevEnd, event.getTime() - prevEnd);
if (getTimeEventFilterDialog() != null && getTimeEventFilterDialog().isFilterActive()) {
timeEvent.setProperty(IFilterProperty.DIMMED, true);
timeEvent.setProperty(CoreFilterProperty.DIMMED, true);
}
events.add(timeEvent);
}
Expand Down
4 changes: 2 additions & 2 deletions ...c/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
View file
Expand Up @@ -87,9 +87,9 @@
import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderManager;
import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils;
import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty;
import org.eclipse.tracecompass.tmf.core.model.IOutputElement;
import org.eclipse.tracecompass.tmf.core.model.filters.SelectionTimeQueryFilter;
import org.eclipse.tracecompass.tmf.core.model.timegraph.IFilterProperty;
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphDataProvider;
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphRowModel;
import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphState;
Expand Down Expand Up @@ -801,7 +801,7 @@ private void zoomEntries(@NonNull Iterable<@NonNull TimeGraphEntry> entries, lon
if (globalFilter == null) {
return regexes;
}
regexes.putAll(IFilterProperty.DIMMED, globalFilter.getRegexes());
regexes.putAll(CoreFilterProperty.DIMMED, globalFilter.getRegexes());

return regexes;
}
Expand Down

0 comments on commit 99ff910

Please sign in to comment.