timing: Add default implementations of deprecated methods

This adds default implementation in the interface for
ISegmentStoreDensityViewerDataListener so that implementations do not
have to override deprecated methods.

Change-Id: I54ddb3c13c62a3ae554d48636d01995da7f3d3f7
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/97590
Reviewed-by: Hudson CI
Reviewed-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Tested-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java
index 0f58ebb5cc4a2d314311c1d2f66bee48b10840ed..9be7937409712698c98be1be67309d5bd6723575 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java
@@ -14,7 +14,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -66,17 +65,6 @@ public class CallGraphDensityViewTest extends AggregationTreeTest {
     private static final String CALLGRAPHDENSITY_ID = CallGraphDensityView.ID;
 
     private final @NonNull ISegmentStoreDensityViewerDataListener fSyncListener = new ISegmentStoreDensityViewerDataListener() {
-        @Deprecated
-        @Override
-        public void dataChanged(List<ISegment> newData) {
-            fLatch.countDown();
-        }
-
-        @Deprecated
-        @Override
-        public void dataSelectionChanged(@Nullable List<@NonNull ISegment> newSelectionData) {
-            // do nothing
-        }
 
         @Override
         public void viewDataChanged(@NonNull Iterable<? extends @NonNull ISegment> newData) {

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityView.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityView.java
index c6056bbd1b9362f918ead0b967ae7b568ed6545c..acfedf622fe471c509ca2bb51954effa34bc7713 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityView.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/AbstractSegmentStoreDensityView.java
@@ -9,8 +9,6 @@
 
 package org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density;
 
-import java.util.List;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.action.Action;
@@ -55,18 +53,6 @@ public abstract class AbstractSegmentStoreDensityView extends TmfView {
      * Used to keep the table in sync with the density viewer.
      */
     private final class DataChangedListener implements ISegmentStoreDensityViewerDataListener {
-        @Deprecated
-        @Override
-        public void dataChanged(List<ISegment> data) {
-            updateTableModel(data);
-        }
-
-        private void updateTableModel(@Nullable List<ISegment> data) {
-            final AbstractSegmentStoreTableViewer viewer = fTableViewer;
-            if (viewer != null && data != null) {
-                viewer.updateModel(data);
-            }
-        }
 
         private void updateTableModel(@Nullable Iterable<? extends ISegment> data) {
             final AbstractSegmentStoreTableViewer viewer = fTableViewer;
@@ -75,12 +61,6 @@ public abstract class AbstractSegmentStoreDensityView extends TmfView {
             }
         }
 
-        @Deprecated
-        @Override
-        public void dataSelectionChanged(@Nullable List<ISegment> data) {
-            updateTableModel(data);
-        }
-
         @Override
         public void viewDataChanged(@NonNull Iterable<? extends @NonNull ISegment> newData) {
             updateTableModel(newData);

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/ISegmentStoreDensityViewerDataListener.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/ISegmentStoreDensityViewerDataListener.java
index 49e0cb08819ee2fe9b1310a548a22e8af1f1ffcc..bf25abf5a5a1746a6b2141b40e1d78e82dd50979 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/ISegmentStoreDensityViewerDataListener.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/density/ISegmentStoreDensityViewerDataListener.java
@@ -27,7 +27,9 @@ public interface ISegmentStoreDensityViewerDataListener {
      * @deprecated Use {@link #viewDataChanged(Iterable)} instead
      */
     @Deprecated
-    void dataChanged(List<ISegment> newData);
+    default void dataChanged(List<ISegment> newData) {
+        // do nothing
+    }
 
     /**
      * Notification that the selection of the data changed in the viewer.
@@ -37,7 +39,9 @@ public interface ISegmentStoreDensityViewerDataListener {
      * @deprecated Use {@link #selectedDataChanged(Iterable)} instead
      */
     @Deprecated
-    void dataSelectionChanged(@Nullable List<ISegment> newSelectionData);
+    default void dataSelectionChanged(@Nullable List<ISegment> newSelectionData) {
+        // do nothing
+    }
 
     /**
      * Notification that the data changed in the viewer.