From 57cba2bf9549cb58524fbc251d57bf022b788714 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 11 Oct 2022 15:11:51 -0400 Subject: [PATCH] Bug 580854: Make o.e.t.tmf.core.mode.annotations API This is renaming package: org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations to: org.eclipse.tracecompass.tmf.core.model.annotations This is needed as parent commit made TmfTreeCompositeDataProvider API and TmfTreeCompositeDataProvider implements IOutputAnnotationProvider in this package, and then IOutputAnnotationProvider references directly or indirectly the rest of the classes in this package. [Added] o.e.t.t.c.model.annotations.Annotation [Added] o.e.t.t.c.model.annotations.AnnotationCategoriesModel [Added] o.e.t.t.c.model.annotations.AnnotationModel [Added] o.e.t.t.c.model.annotations.EventAnnotationProvider [Added] o.e.t.t.c.model.annotations.IAnnotation [Added] o.e.t.t.c.model.annotations.IOutputAnnotationParameters [Added] o.e.t.t.c.model.annotations.IOutputAnnotationProvider [Added] o.e.t.t.c.model.annotations.TraceAnnotationProvider Change-Id: I12376c3899339749dd586ad382630d6b8620d592 Signed-off-by: Jonah Graham Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/196314 Tested-by: Bernd Hufmann Tested-by: Trace Compass Bot Reviewed-by: Bernd Hufmann --- .../resourcesstatus/ResourcesStatusDataProvider.java | 8 ++++---- .../core/threadstatus/ThreadStatusDataProvider.java | 8 ++++---- .../callstack/provider/CallStackDataProvider.java | 2 +- .../annotations/CustomAnnotationProviderTest.java | 6 +++--- .../annotations/PeriodicAnnotationProviderTest.java | 8 ++++---- .../core/tests/model/tree/TmfTreeDataModelTest.java | 10 +++++----- .../META-INF/MANIFEST.MF | 2 +- .../core/annotations/CustomAnnotationProvider.java | 8 ++++---- .../annotations/CustomOutputAnnotationProvider.java | 6 +++--- .../CustomOutputAnnotationProviderFactory.java | 2 +- .../LostEventsOutputAnnotationProvider.java | 10 +++++----- .../LostEventsOutputAnnotationProviderFactory.java | 2 +- .../core/annotations/PeriodicAnnotationProvider.java | 8 ++++---- .../tmf/core/model/annotations/Annotation.java | 3 ++- .../model/annotations/AnnotationCategoriesModel.java | 3 ++- .../tmf/core/model/annotations/AnnotationModel.java | 3 ++- .../model/annotations/EventAnnotationProvider.java | 5 +++-- .../tmf/core/model/annotations/IAnnotation.java | 3 ++- .../annotations/IOutputAnnotationParameters.java | 3 ++- .../model/annotations/IOutputAnnotationProvider.java | 3 ++- .../model/annotations/TraceAnnotationProvider.java | 3 ++- .../tmf/core/model/annotations/package-info.java | 2 +- .../model/tree/TmfTreeCompositeDataProvider.java | 6 +++--- .../.settings/.api_filters | 11 +++++++++++ .../META-INF/MANIFEST.MF | 2 +- tmf/org.eclipse.tracecompass.tmf.ui/pom.xml | 2 +- .../ui/views/timegraph/AbstractTimeGraphView.java | 12 ++++++------ .../timegraph/BaseDataProviderTimeGraphView.java | 10 +++++----- .../tmf/ui/widgets/timegraph/model/MarkerEvent.java | 4 ++-- 29 files changed, 87 insertions(+), 68 deletions(-) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/Annotation.java (97%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/AnnotationCategoriesModel.java (95%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/AnnotationModel.java (96%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/EventAnnotationProvider.java (98%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/IAnnotation.java (95%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/IOutputAnnotationParameters.java (90%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/IOutputAnnotationProvider.java (95%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/TraceAnnotationProvider.java (98%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{internal/provisional => }/tmf/core/model/annotations/package-info.java (86%) create mode 100644 tmf/org.eclipse.tracecompass.tmf.ui/.settings/.api_filters diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/resourcesstatus/ResourcesStatusDataProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/resourcesstatus/ResourcesStatusDataProvider.java index 0535f2d5ac..64f37411d0 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/resourcesstatus/ResourcesStatusDataProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/resourcesstatus/ResourcesStatusDataProvider.java @@ -42,10 +42,6 @@ import org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.Attributes; import org.eclipse.tracecompass.internal.analysis.os.linux.core.registry.LinuxStyle; import org.eclipse.tracecompass.internal.analysis.os.linux.core.resourcesstatus.ResourcesEntryModel.Type; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.EventAnnotationProvider; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.internal.tmf.core.analysis.callsite.CallsiteAnalysis; import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; @@ -64,6 +60,10 @@ import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.OutputStyleModel; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; +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.EventAnnotationProvider; +import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.tmf.core.model.filters.SelectionTimeQueryFilter; import org.eclipse.tracecompass.tmf.core.model.timegraph.AbstractTimeGraphDataProvider; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java index c175a0d1b1..9ce4b3f5cc 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/threadstatus/ThreadStatusDataProvider.java @@ -40,10 +40,6 @@ import org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.Attributes; import org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.StateValues; import org.eclipse.tracecompass.internal.analysis.os.linux.core.registry.LinuxStyle; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.EventAnnotationProvider; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.internal.tmf.core.analysis.callsite.CallsiteAnalysis; import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; @@ -64,6 +60,10 @@ import org.eclipse.tracecompass.tmf.core.model.IOutputStyleProvider; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.OutputStyleModel; +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.EventAnnotationProvider; +import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.tmf.core.model.filters.SelectionTimeQueryFilter; import org.eclipse.tracecompass.tmf.core.model.filters.TimeQueryFilter; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow; diff --git a/analysis/org.eclipse.tracecompass.analysis.profiling.core/src/org/eclipse/tracecompass/internal/analysis/profiling/core/callstack/provider/CallStackDataProvider.java b/analysis/org.eclipse.tracecompass.analysis.profiling.core/src/org/eclipse/tracecompass/internal/analysis/profiling/core/callstack/provider/CallStackDataProvider.java index 91c9054d40..816e3b10b1 100644 --- a/analysis/org.eclipse.tracecompass.analysis.profiling.core/src/org/eclipse/tracecompass/internal/analysis/profiling/core/callstack/provider/CallStackDataProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.profiling.core/src/org/eclipse/tracecompass/internal/analysis/profiling/core/callstack/provider/CallStackDataProvider.java @@ -29,7 +29,6 @@ import org.eclipse.tracecompass.analysis.profiling.core.base.FlameDefaultPalette; import org.eclipse.tracecompass.analysis.profiling.core.callstack.CallStackAnalysis; import org.eclipse.tracecompass.internal.analysis.profiling.core.Activator; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IAnnotation; import org.eclipse.tracecompass.internal.tmf.core.analysis.callsite.CallsiteAnalysis; import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; @@ -41,6 +40,7 @@ import org.eclipse.tracecompass.tmf.core.model.CommonStatusMessage; import org.eclipse.tracecompass.tmf.core.model.IOutputStyleProvider; import org.eclipse.tracecompass.tmf.core.model.OutputStyleModel; +import org.eclipse.tracecompass.tmf.core.model.annotations.IAnnotation; import org.eclipse.tracecompass.tmf.core.model.filters.SelectionTimeQueryFilter; import org.eclipse.tracecompass.tmf.core.model.timegraph.AbstractTimeGraphDataProvider; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow; diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/CustomAnnotationProviderTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/CustomAnnotationProviderTest.java index c701ddb61e..086b082290 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/CustomAnnotationProviderTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/CustomAnnotationProviderTest.java @@ -24,9 +24,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; import org.eclipse.tracecompass.internal.tmf.core.annotations.CustomAnnotationProvider; import org.eclipse.tracecompass.internal.tmf.core.markers.Marker; import org.eclipse.tracecompass.internal.tmf.core.markers.Marker.PeriodicMarker; @@ -41,6 +38,9 @@ import org.eclipse.tracecompass.tmf.core.markers.TimeReference; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; +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.presentation.RGBAColor; import org.eclipse.tracecompass.tmf.core.response.ITmfResponse.Status; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/PeriodicAnnotationProviderTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/PeriodicAnnotationProviderTest.java index fda38ce40e..e65eeb3cc5 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/PeriodicAnnotationProviderTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/annotations/PeriodicAnnotationProviderTest.java @@ -24,10 +24,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.internal.tmf.core.annotations.PeriodicAnnotationProvider; import org.eclipse.tracecompass.statesystem.core.StateSystemUtils; import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils; @@ -35,6 +31,10 @@ import org.eclipse.tracecompass.tmf.core.markers.TimeReference; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; +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.presentation.RGBAColor; import org.eclipse.tracecompass.tmf.core.response.ITmfResponse.Status; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/model/tree/TmfTreeDataModelTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/model/tree/TmfTreeDataModelTest.java index 1ae580f1ce..b5fac390cc 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/model/tree/TmfTreeDataModelTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/model/tree/TmfTreeDataModelTest.java @@ -28,12 +28,12 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IAnnotation.AnnotationType; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; +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.tree.ITmfTreeDataProvider; import org.eclipse.tracecompass.tmf.core.model.tree.TmfTreeCompositeDataProvider; import org.eclipse.tracecompass.tmf.core.model.tree.TmfTreeDataModel; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF index fcaae42c25..3a0c25c800 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF +++ b/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional, org.apache.commons.lang3 Export-Package: org.eclipse.tracecompass.internal.provisional.tmf.core.model, - org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations;x-internal:=true, org.eclipse.tracecompass.internal.provisional.tmf.core.model.events;x-friends:="org.eclipse.tracecompass.tmf.core.tests,org.eclipse.tracecompass.analysis.timing.core.tests", org.eclipse.tracecompass.internal.provisional.tmf.core.model.filter.parser;x-friends:="org.eclipse.tracecompass.tmf.ui,org.eclipse.tracecompass.tmf.core.tests", org.eclipse.tracecompass.internal.provisional.tmf.core.model.filters; @@ -103,6 +102,7 @@ Export-Package: org.eclipse.tracecompass.internal.provisional.tmf.core.model, org.eclipse.tracecompass.tmf.core.io, org.eclipse.tracecompass.tmf.core.markers, org.eclipse.tracecompass.tmf.core.model, + org.eclipse.tracecompass.tmf.core.model.annotations, org.eclipse.tracecompass.tmf.core.model.filters, org.eclipse.tracecompass.tmf.core.model.timegraph, org.eclipse.tracecompass.tmf.core.model.tree, diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomAnnotationProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomAnnotationProvider.java index 290fd6305b..ad641c503d 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomAnnotationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomAnnotationProvider.java @@ -29,10 +29,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.internal.tmf.core.markers.IMarkerConstants; import org.eclipse.tracecompass.internal.tmf.core.markers.Marker; import org.eclipse.tracecompass.internal.tmf.core.markers.Marker.PeriodicMarker; @@ -48,6 +44,10 @@ import org.eclipse.tracecompass.tmf.core.markers.TimeReference; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; +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.presentation.RGBAColor; import org.eclipse.tracecompass.tmf.core.response.ITmfResponse.Status; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProvider.java index c4520abc49..5473ed350a 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProvider.java @@ -19,12 +19,12 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.internal.tmf.core.markers.MarkerConfigXmlParser; import org.eclipse.tracecompass.internal.tmf.core.markers.MarkerSet; import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils; +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.response.ITmfResponse.Status; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProviderFactory.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProviderFactory.java index 2b2c040852..5bb9c00909 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProviderFactory.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/CustomOutputAnnotationProviderFactory.java @@ -12,7 +12,7 @@ package org.eclipse.tracecompass.internal.tmf.core.annotations; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; +import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.tmf.core.trace.AbstractTmfTraceAdapterFactory; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProvider.java index 954579ccf8..5d7f5d4aaf 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProvider.java @@ -27,11 +27,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IAnnotation.AnnotationType; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException; import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException; @@ -39,6 +34,11 @@ import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; +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.response.ITmfResponse.Status; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; import org.eclipse.tracecompass.tmf.core.statistics.TmfStateStatistics.Attributes; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProviderFactory.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProviderFactory.java index 9d5796a1f3..3a78a822f4 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProviderFactory.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/LostEventsOutputAnnotationProviderFactory.java @@ -12,7 +12,7 @@ package org.eclipse.tracecompass.internal.tmf.core.annotations; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; +import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.tmf.core.trace.AbstractTmfTraceAdapterFactory; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/PeriodicAnnotationProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/PeriodicAnnotationProvider.java index 9129a3c142..1048c9d0fc 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/PeriodicAnnotationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/annotations/PeriodicAnnotationProvider.java @@ -25,15 +25,15 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils; import org.eclipse.tracecompass.tmf.core.markers.ITimeReference; import org.eclipse.tracecompass.tmf.core.markers.TimeReference; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; +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.presentation.RGBAColor; import org.eclipse.tracecompass.tmf.core.response.ITmfResponse.Status; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/Annotation.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/Annotation.java similarity index 97% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/Annotation.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/Annotation.java index 4d011d41f9..7836ec0c5c 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/Annotation.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/Annotation.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.tmf.core.model.OutputElement; @@ -22,6 +22,7 @@ * tree annotation is used to add a mark to a specific tree entry. * * @author Simon Delisle + * @since 8.2 */ public class Annotation extends OutputElement implements IAnnotation { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/AnnotationCategoriesModel.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/AnnotationCategoriesModel.java similarity index 95% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/AnnotationCategoriesModel.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/AnnotationCategoriesModel.java index 39cec7af7b..9bf1f3049b 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/AnnotationCategoriesModel.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/AnnotationCategoriesModel.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; import java.util.LinkedHashSet; import java.util.List; @@ -19,6 +19,7 @@ /** * Data provider annotation categories model + * @since 8.2 */ public class AnnotationCategoriesModel { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/AnnotationModel.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/AnnotationModel.java similarity index 96% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/AnnotationModel.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/AnnotationModel.java index 91c6f1cca3..8a87f6516f 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/AnnotationModel.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/AnnotationModel.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; import java.util.ArrayList; import java.util.Collection; @@ -21,6 +21,7 @@ * Data provider annotation model * * @author Simon Delisle + * @since 8.2 */ public class AnnotationModel { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/EventAnnotationProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/EventAnnotationProvider.java similarity index 98% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/EventAnnotationProvider.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/EventAnnotationProvider.java index afd0529331..308ca2feea 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/EventAnnotationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/EventAnnotationProvider.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; import java.util.ArrayList; import java.util.Collection; @@ -29,13 +29,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IAnnotation.AnnotationType; import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.event.aspect.ITmfEventAspect; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; import org.eclipse.tracecompass.tmf.core.model.StyleProperties.SymbolType; +import org.eclipse.tracecompass.tmf.core.model.annotations.IAnnotation.AnnotationType; import org.eclipse.tracecompass.tmf.core.model.timegraph.TimeGraphEntryModel; import org.eclipse.tracecompass.tmf.core.model.tree.TmfTreeModel; import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest.ExecutionType; @@ -62,6 +62,7 @@ * @author Matthew Khouzam * @param * the model type to pass + * @since 8.2 */ public class EventAnnotationProvider<@NonNull M extends TimeGraphEntryModel> implements IOutputAnnotationProvider { private static final TmfModelResponse NO_DATA = new TmfModelResponse<>(new AnnotationModel(Collections.emptyMap()), Status.COMPLETED, ""); //$NON-NLS-1$ diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IAnnotation.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IAnnotation.java similarity index 95% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IAnnotation.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IAnnotation.java index 0ae269a331..15bdf385b3 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IAnnotation.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IAnnotation.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.tracecompass.tmf.core.model.ITimeElement; @@ -18,6 +18,7 @@ * Model of an annotation. A chart annotation is used to mark an interesting * area at a given time or range, or to add a symbol to the chart. A tree * annotation is used to add a mark to a specific tree entry. + * @since 8.2 */ public interface IAnnotation extends ITimeElement { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IOutputAnnotationParameters.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IOutputAnnotationParameters.java similarity index 90% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IOutputAnnotationParameters.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IOutputAnnotationParameters.java index e02095d1b9..7b6ed02232 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IOutputAnnotationParameters.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IOutputAnnotationParameters.java @@ -9,12 +9,13 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; /** * Constants used for output annotation fetch parameters * * @noimplement This interface is not intended to be implemented by clients. + * @since 8.2 */ public interface IOutputAnnotationParameters { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IOutputAnnotationProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IOutputAnnotationProvider.java similarity index 95% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IOutputAnnotationProvider.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IOutputAnnotationProvider.java index 9272bc28de..171dfcc963 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/IOutputAnnotationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/IOutputAnnotationProvider.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 **********************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; import java.util.Map; @@ -22,6 +22,7 @@ * implement this interface to provide annotations. * * @author Simon Delisle + * @since 8.2 */ public interface IOutputAnnotationProvider { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/TraceAnnotationProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/TraceAnnotationProvider.java similarity index 98% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/TraceAnnotationProvider.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/TraceAnnotationProvider.java index 9294717380..13319bd686 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/TraceAnnotationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/TraceAnnotationProvider.java @@ -8,7 +8,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; import java.util.Collection; import java.util.Collections; @@ -36,6 +36,7 @@ * be fetched on top of data provider's annotations. * * @author Bernd Hufmann + * @since 8.2 * */ public class TraceAnnotationProvider implements IOutputAnnotationProvider { diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/package-info.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/package-info.java similarity index 86% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/package-info.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/package-info.java index 879d6282aa..4e13012d4e 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/annotations/package-info.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/annotations/package-info.java @@ -10,4 +10,4 @@ **********************************************************************/ @org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations; +package org.eclipse.tracecompass.tmf.core.model.annotations; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeCompositeDataProvider.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeCompositeDataProvider.java index a6ceef36e5..b82c1139b6 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeCompositeDataProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/tree/TmfTreeCompositeDataProvider.java @@ -25,12 +25,12 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderManager; import org.eclipse.tracecompass.tmf.core.model.CommonStatusMessage; import org.eclipse.tracecompass.tmf.core.model.ITableColumnDescriptor; +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.response.ITmfResponse; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/.settings/.api_filters b/tmf/org.eclipse.tracecompass.tmf.ui/.settings/.api_filters new file mode 100644 index 0000000000..3cd9cdb834 --- /dev/null +++ b/tmf/org.eclipse.tracecompass.tmf.ui/.settings/.api_filters @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF index f0fc5f7776..d8d170e430 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF +++ b/tmf/org.eclipse.tracecompass.tmf.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 8.0.1.qualifier +Bundle-Version: 8.1.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tracecompass.tmf.ui;singleton:=true Bundle-Activator: org.eclipse.tracecompass.internal.tmf.ui.Activator diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml b/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml index a161090005..dd7441c927 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml +++ b/tmf/org.eclipse.tracecompass.tmf.ui/pom.xml @@ -20,7 +20,7 @@ org.eclipse.tracecompass.tmf.ui - 8.0.1-SNAPSHOT + 8.1.0-SNAPSHOT eclipse-plugin 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 987fc8a4c8..f8fd690b4b 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 @@ -103,12 +103,6 @@ import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils; import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils.FlowScopeLog; import org.eclipse.tracecompass.common.core.log.TraceCompassLogUtils.FlowScopeLogBuilder; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IAnnotation.AnnotationType; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.TraceAnnotationProvider; import org.eclipse.tracecompass.internal.provisional.tmf.core.model.filter.parser.FilterCu; import org.eclipse.tracecompass.internal.provisional.tmf.core.model.filter.parser.IFilterStrings; import org.eclipse.tracecompass.internal.provisional.tmf.core.model.filters.TmfFilterAppliedSignal; @@ -127,6 +121,12 @@ import org.eclipse.tracecompass.statesystem.core.StateSystemUtils; import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils; import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty; +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.TraceAnnotationProvider; +import org.eclipse.tracecompass.tmf.core.model.annotations.IAnnotation.AnnotationType; import org.eclipse.tracecompass.tmf.core.model.timegraph.IElementResolver; import org.eclipse.tracecompass.tmf.core.resources.ITmfMarker; import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse; diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java index 8db7f1fcdd..12e51b3170 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/BaseDataProviderTimeGraphView.java @@ -37,11 +37,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.Annotation; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationCategoriesModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.AnnotationModel; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IAnnotation.AnnotationType; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IOutputAnnotationProvider; import org.eclipse.tracecompass.internal.provisional.tmf.ui.widgets.ViewFilterDialog; import org.eclipse.tracecompass.internal.provisional.tmf.ui.widgets.timegraph.BaseDataProviderTimeGraphPresentationProvider; import org.eclipse.tracecompass.internal.tmf.ui.Activator; @@ -52,6 +47,11 @@ import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils; import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite; 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.timegraph.ITimeGraphArrow; import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphDataProvider; diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/MarkerEvent.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/MarkerEvent.java index fb0efb9fdc..40c9346440 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/MarkerEvent.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/model/MarkerEvent.java @@ -17,9 +17,9 @@ import java.util.Objects; import org.eclipse.swt.graphics.RGBA; -import org.eclipse.tracecompass.internal.provisional.tmf.core.model.annotations.IAnnotation; import org.eclipse.tracecompass.tmf.core.model.OutputElementStyle; import org.eclipse.tracecompass.tmf.core.model.StyleProperties; +import org.eclipse.tracecompass.tmf.core.model.annotations.IAnnotation; import org.eclipse.tracecompass.tmf.core.presentation.RGBAColor; import org.eclipse.tracecompass.tmf.ui.model.StyleManager; @@ -101,7 +101,7 @@ public MarkerEvent(ITimeGraphEntry entry, long time, long duration, String categ * The category of the marker * @param foreground * true if the marker is drawn in foreground, and false otherwise - * @since 5.2 + * @since 8.1 */ public MarkerEvent(IAnnotation annotation, ITimeGraphEntry entry, String category, boolean foreground) { super(entry, annotation);