Bug 560077 - Deprecate and remove dataviewers.chart and
dataviewers.piechart bundles
Add back old swtchart to dataviewer feature.
Mark all dataviewers chart API as deprecated for removal.
Change-Id: Idfda11add72366f206333b9804db655afd12e17d
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/157624
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml b/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml
index 216eea8..7abcafe 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml
+++ b/profiling/org.eclipse.linuxtools.dataviewers-feature/feature.xml
@@ -36,6 +36,7 @@
<import plugin="org.eclipse.cdt.core"/>
<import plugin="org.eclipse.core.resources" version="3.4.2" match="greaterOrEqual"/>
<import plugin="com.ibm.icu"/>
+ <import plugin="org.swtchart"/>
<import plugin="org.eclipse.swtchart"/>
</requires>
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
index 0bc979e..d73f5d5 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/ChartAction.java
@@ -25,7 +25,9 @@
* An action that open a chart dialog from an <code>AbstractSTViewer</code>.
*
* @see AbstractSTViewer
+ * @deprecated Functionality to be moved to Eclipse.org SWTChart project.
*/
+@Deprecated
public class ChartAction extends Action {
/** The dialog */
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java
index 3e9d850..35c77a9 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/actions/SaveChartAction.java
@@ -42,7 +42,9 @@
* An action to save any {@link Composite} (typically a {@link Chart}) as an image (jpeg/jpg, bmp, png).
*
* @since 6.0
+ * @deprecated Use org.eclipse.swtchart.extensions.charts.InteractiveChart and its builtin safe functionality.
*/
+@Deprecated
public class SaveChartAction extends Action {
private static final String[] EXTENSIONS =
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java
index e304cbf..3e7150a 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/ChartFactory.java
@@ -33,7 +33,10 @@
/**
* A utility class that handles the charts creation (pie chart and bar chart)
+ *
+ * @deprecated Functionality to be moved to Eclipse.org SWTChart project.
*/
+@Deprecated
public final class ChartFactory {
private ChartFactory() {}
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
index 2091897..38e2e28 100755
--- a/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/dataviewers/charts/provider/IChartField.java
@@ -16,7 +16,9 @@
/**
* The interface used by the charts to get a <code>Number</code> data from a field.
+ *
*/
+@Deprecated
public interface IChartField extends ISTDataViewersField {
/**
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java
index 4ae832f..061023e 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChart.java
@@ -26,6 +26,12 @@
import org.swtchart.ISeries;
import org.swtchart.ITitle;
+/**
+ * @deprecated To be contributed to Eclipse.org SWTChart and removed in Linux Tools major release once in swtchart proper.
+ *
+ * @see <a href="https://github.com/eclipse/swtchart/issues/114">https://github.com/eclipse/swtchart/issues/114</a>
+ */
+@Deprecated
public class PieChart extends Chart {
protected List<RGB> colorList = new ArrayList<>();
diff --git a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java
index b47f787..4cf3976 100644
--- a/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java
+++ b/profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/dataviewers/piechart/PieChartPaintListener.java
@@ -27,6 +27,12 @@
import org.swtchart.ITitle;
import org.swtchart.Range;
+/**
+ * @deprecated To be contributed to Eclipse.org SWTChart and removed in Linux Tools major release once in swtchart proper.
+ *
+ * @see <a href="https://github.com/eclipse/swtchart/issues/114">https://github.com/eclipse/swtchart/issues/114</a>
+ */
+@Deprecated
public class PieChartPaintListener implements PaintListener {
private PieChart chart;