From 5dd0ebfe8bafd7b522ff986b70e19b90c8c0b239 Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Mon, 5 Oct 2015 16:20:49 -0400
Subject: [PATCH] Add Trace Compass 1.1 baseline, fix some API errors

Change-Id: I356706eae6fd2afb85f0f32fae91291c7e11dcad
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/57447
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  2 +-
 .../tracecompass/common/core/ObjectUtils.java |  2 +-
 .../category.xml                              |  2 +-
 .../baseline/tracecompass-baseline-1.1.target | 38 +++++++++++++++++++
 .../viewers/table/TmfSimpleTableViewer.java   |  2 +
 .../AbstractStateSystemTimeGraphView.java     |  1 +
 7 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-1.1.target

diff --git a/common/org.eclipse.tracecompass.common.core/META-INF/MANIFEST.MF b/common/org.eclipse.tracecompass.common.core/META-INF/MANIFEST.MF
index 262c7b8439..accac5f341 100644
--- a/common/org.eclipse.tracecompass.common.core/META-INF/MANIFEST.MF
+++ b/common/org.eclipse.tracecompass.common.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.common.core;singleton:=true
 Bundle-Activator: org.eclipse.tracecompass.internal.common.core.Activator
diff --git a/common/org.eclipse.tracecompass.common.core/pom.xml b/common/org.eclipse.tracecompass.common.core/pom.xml
index edca49606a..9ab679809e 100644
--- a/common/org.eclipse.tracecompass.common.core/pom.xml
+++ b/common/org.eclipse.tracecompass.common.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
 
   <artifactId>org.eclipse.tracecompass.common.core</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <name>Trace Compass Common Utilities Core Plug-in</name>
diff --git a/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/ObjectUtils.java b/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/ObjectUtils.java
index 4a9ad16587..df7532960e 100644
--- a/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/ObjectUtils.java
+++ b/common/org.eclipse.tracecompass.common.core/src/org/eclipse/tracecompass/common/core/ObjectUtils.java
@@ -24,7 +24,7 @@ import org.eclipse.jdt.annotation.Nullable;
  * Utility methods for arbitrary objects.
  *
  * @author Patrick Tasse
- * @since 1.1
+ * @since 1.2
  */
 public final class ObjectUtils {
 
diff --git a/releng/org.eclipse.tracecompass.releng-site/category.xml b/releng/org.eclipse.tracecompass.releng-site/category.xml
index 8cf5a82eb4..240811fc29 100644
--- a/releng/org.eclipse.tracecompass.releng-site/category.xml
+++ b/releng/org.eclipse.tracecompass.releng-site/category.xml
@@ -27,6 +27,6 @@
    <feature url="features/org.eclipse.tracecompass.tmf.remote.source_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.tmf.remote.source" version="0.0.0"/>
    <feature url="features/org.eclipse.tracecompass.tmf.pcap.source_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.tmf.pcap.source" version="0.0.0"/>
    <feature url="features/org.eclipse.tracecompass.testing.source_0.0.0.qualifier.jar" id="org.eclipse.tracecompass.testing.source" version="0.0.0"/>
-   <bundle id="org.eclipse.tracecompass.common.core" version="1.1.0.qualifier"/>
+   <bundle id="org.eclipse.tracecompass.common.core"/>
    <category-def name="Trace Compass" label="Trace Compass Main Features"/>
 </site>
diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-1.1.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-1.1.target
new file mode 100644
index 0000000000..9fb300cbd0
--- /dev/null
+++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-1.1.target
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="tracecompass-baseline-1.1" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tracecompass.analysis.os.linux.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.analysis.os.linux.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.btf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.btf.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.common.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.ctf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.ctf.parser" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.gdbtrace.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.gdbtrace.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.control.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.control.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.kernel.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.kernel.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.ust.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.ust.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.pcap.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.statesystem.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.analysis.xml.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.analysis.xml.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.ctf.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.pcap.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.pcap.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.ui" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tracecompass/releases/1.1.0/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.core.runtime" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/mars"/>
+</location>
+</locations>
+</target>
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java
index b5ff3318d4..1fc76e0a57 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/table/TmfSimpleTableViewer.java
@@ -205,6 +205,7 @@ public class TmfSimpleTableViewer extends TmfViewer {
      *          the menu manager
      * @param sel
      *          the current selection
+     * @since 2.0
      */
     protected void appendToTablePopupMenu(@NonNull IMenuManager manager, @NonNull IStructuredSelection sel) {
     }
@@ -221,6 +222,7 @@ public class TmfSimpleTableViewer extends TmfViewer {
      *            the comparator associated with clicking on the column, if it
      *            is null, a string comparator on the label will be used
      * @return the column that was created
+     * @since 2.0
      */
     public final TableColumn createColumn(String name, ColumnLabelProvider provider, @Nullable Comparator<?> comparator) {
         TableViewerColumn col = new TableViewerColumn(fTableViewer, SWT.NONE);
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractStateSystemTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractStateSystemTimeGraphView.java
index a44374d9a4..9103c2e21f 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractStateSystemTimeGraphView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractStateSystemTimeGraphView.java
@@ -404,6 +404,7 @@ public abstract class AbstractStateSystemTimeGraphView extends AbstractTimeGraph
      * @param monitor
      *            A progress monitor
      * @return The list of marker events
+     * @since 2.0
      */
     protected @NonNull List<IMarkerEvent> getMarkerList(ITmfStateSystem ss,
             @NonNull List<List<ITmfStateInterval>> fullStates, @NonNull IProgressMonitor monitor) {
-- 
2.34.1