From f625ccd4fe6518b45eba5ec51a37f6997aecb73d Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Wed, 21 Sep 2016 16:04:21 -0400 Subject: [PATCH] releng: Add 2.1.0 baseline and fix API errors Change-Id: I794f2670e344bf98d3587abeaf97ea279d2a9b3f Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/81634 Reviewed-by: Hudson CI Reviewed-by: Alexandre Montplaisir Tested-by: Alexandre Montplaisir --- .../META-INF/MANIFEST.MF | 2 +- .../statistics/SegmentStoreStatistics.java | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../AbstractSegmentStoreStatisticsViewer.java | 4 +- .../tracecompass-baseline-2.1.0.target | 48 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 2 +- .../tracecompass/tmf/ui/views/TmfView.java | 2 +- .../callstack/CallStackAnalysisListener.java | 2 +- 8 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.1.0.target diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF index 4e9e32182b..e45246c1d1 100644 --- a/analysis/org.eclipse.tracecompass.analysis.timing.core/META-INF/MANIFEST.MF +++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/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: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tracecompass.analysis.timing.core;singleton:=true Bundle-Activator: org.eclipse.tracecompass.internal.analysis.timing.core.Activator diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java index 8b80610b99..23ce5f65f9 100644 --- a/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java +++ b/analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/analysis/timing/core/segmentstore/statistics/SegmentStoreStatistics.java @@ -154,7 +154,7 @@ public class SegmentStoreStatistics { * * @param other * The other segment store statistics - * @since 1.1 + * @since 1.2 */ public void merge(SegmentStoreStatistics other) { if (other.fNbSegments == 0) { diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF index 2a8f724036..200ef44b5f 100644 --- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF +++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ lttManifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tracecompass.analysis.timing.ui;singleton:=true Bundle-Activator: org.eclipse.tracecompass.internal.analysis.timing.ui.Activator diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java index cf264dfc75..5bb0544cf0 100644 --- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java +++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java @@ -426,7 +426,7 @@ public abstract class AbstractSegmentStoreStatisticsViewer extends AbstractTmfTr * Get the type label * * @return the label - * @since 1.1 + * @since 1.2 */ protected String getTypeLabel() { return checkNotNull(Messages.AbstractSegmentStoreStatisticsViewer_types); @@ -436,7 +436,7 @@ public abstract class AbstractSegmentStoreStatisticsViewer extends AbstractTmfTr * Get the total column label * * @return the totals column label - * @since 1.1 + * @since 1.2 */ protected String getTotalLabel() { return checkNotNull(Messages.AbstractSegmentStoreStatisticsViewer_total); diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.1.0.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.1.0.target new file mode 100644 index 0000000000..0151bcf3db --- /dev/null +++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-2.1.0.target @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 77609d5973..6c964c0b44 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: 2.1.0.qualifier +Bundle-Version: 2.2.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/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java index 455b631d8f..f073027a66 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/TmfView.java @@ -207,7 +207,7 @@ public abstract class TmfView extends ViewPart implements ITmfComponent { * simply if secondary ID is null * * @return This view's view ID - * @since 2.1 + * @since 2.2 */ protected String getViewId() { IViewSite viewSite = getViewSite(); diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java index 97e49e2147..2f736b1b83 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackAnalysisListener.java @@ -20,7 +20,7 @@ import org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput; * extension to add the view, but the listener fixes the issue. * * @author Geneviève Bastien - * @since 2.1 + * @since 2.2 */ public class CallStackAnalysisListener implements ITmfNewAnalysisModuleListener { -- 2.34.1