[dataprovider] Revert deprecated method in ISeriesModel Since it is not really useful to change the name of getXAxis and getData, we will keep the new names for future change Change-Id: Ibec5991dc19e91be44088a34d1ca50ba89fb9310 Signed-off-by: Simon Delisle <simon.delisle@ericsson.com> Reviewed-on: https://git.eclipse.org/r/143068 Tested-by: CI Bot Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/InputOutputDataProviderTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/InputOutputDataProviderTest.java
index 8696305..6164e56 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/InputOutputDataProviderTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/inputoutput/InputOutputDataProviderTest.java

@@ -117,7 +117,7 @@
             assertEquals(1, data.size());
             ISeriesModel ySeries = data.values().iterator().next();
             double[] expected = test.getActivity();
-            double[] actual = ySeries.getYValues();
+            double[] actual = ySeries.getData();
             for (int i = 0; i < expected.length; i++) {
                 assertTrue(String.format("No actual value at position %d for %s", i, test), actual.length > i);
                 assertEquals(String.format("Value at position %d for %s", i, test), expected[i], actual[i], 0.001);

diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlXyDataProviderTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlXyDataProviderTest.java
index 949c70a..d221a8e 100644
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlXyDataProviderTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/core/tests/module/XmlXyDataProviderTest.java

@@ -192,7 +192,7 @@
             assertNotNull(row);
 
             String[] expectedData = split[1].split(",");
-            double[] actualData = row.getYValues();
+            double[] actualData = row.getData();
             for (int j = 0; j < expectedData.length; j++) {
                 assertTrue("Presence of data at position " + j + " for row " + rowName, actualData.length > j);
                 double expectedValue = Double.parseDouble(expectedData[j]);

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/SeriesModel.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/SeriesModel.java
index 444ae1f..86a752f 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/SeriesModel.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/SeriesModel.java

@@ -157,16 +157,6 @@
     }
 
     @Override
-    public long[] getXValues() {
-        return fXValues;
-    }
-
-    @Override
-    public double[] getYValues() {
-        return fYValues;
-    }
-
-    @Override
     public TmfXYAxis getXAxisDescription() {
         return fXAxis;
     }
@@ -182,13 +172,11 @@
     }
 
     @Override
-    @Deprecated
     public long[] getXAxis() {
         return fXValues;
     }
 
     @Override
-    @Deprecated
     public double[] getData() {
         return fYValues;
     }
@@ -212,8 +200,8 @@
         SeriesModel other = (SeriesModel) obj;
         return fName.equals(other.getName())
                 && fId == other.getId()
-                && Arrays.equals(fXValues, other.getXValues())
-                && Arrays.equals(fYValues, other.getYValues())
+                && Arrays.equals(fXValues, other.getXAxis())
+                && Arrays.equals(fYValues, other.getData())
                 && fXAxis.equals(other.getXAxisDescription())
                 && fYAxis.equals(other.getYAxisDescription());
     }

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ISeriesModel.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ISeriesModel.java
index 35796df..9bbda6b 100644
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ISeriesModel.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/model/xy/ISeriesModel.java

@@ -80,26 +80,6 @@
     }
 
     /**
-     * Get the X values
-     *
-     * @return The x values
-     * @since 5.0
-     */
-    default long[] getXValues() {
-        return getXAxis();
-    }
-
-    /**
-     * Get the y values
-     *
-     * @return An array of y values
-     * @since 5.0
-     */
-    default double[] getYValues() {
-        return getData();
-    }
-
-    /**
      * Get the display type
      *
      * @return Type of display (eg. line, scatter, ...)
@@ -113,18 +93,14 @@
      * Get the X values
      *
      * @return The x values
-     * @deprecated Use getXValues instead
      */
-    @Deprecated
     long[] getXAxis();
 
     /**
      * Get the y values
      *
      * @return An array of y values
-     * @deprecated Use getYValues instead
      */
-    @Deprecated
     double[] getData();
 
     /**

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java
index b8cfee0..e790936 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXAxisChartViewer.java

@@ -423,14 +423,14 @@
                         long delta = getWindowEndTime() - getWindowStartTime();
                         if (delta > 0) {
                             for (ISeriesModel entry : seriesValues.getData().values()) {
-                                double[] extractXValuesToDisplay = extractXValuesToDisplay(entry.getXValues());
+                                double[] extractXValuesToDisplay = extractXValuesToDisplay(entry.getXAxis());
                                 List<Double> dimmedX = new ArrayList<>(extractXValuesToDisplay.length);
                                 List<Double> dimmedY = new ArrayList<>(extractXValuesToDisplay.length);
                                 List<Double> brightX = new ArrayList<>(extractXValuesToDisplay.length);
                                 List<Double> brightY = new ArrayList<>(extractXValuesToDisplay.length);
 
                                 int[] propertiesArray = entry.getProperties();
-                                double[] data = entry.getYValues();
+                                double[] data = entry.getData();
                                 for (int i = 0; i < extractXValuesToDisplay.length; i++) {
                                     double value = data[i];
                                     /*