From e58fe1d517e6ba7c821888674b65544ea9853d23 Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Date: Mon, 9 Mar 2015 15:50:46 -0400
Subject: [PATCH] Update usage of IAdaptable#getAdapter

Generics were added to the APIs of IAdaptable and related
classes. Update our usage of these methods, as suggested in
http://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg11590.html

Change-Id: I8fb374869567b5c2b7421b4773998c60e9fcc468
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/43472
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---
 .../org/eclipse/tracecompass/btf/core/event/BtfEvent.java | 5 +++--
 .../tracecompass/btf/ui/BtfEventAdapterFactory.java       | 6 +++---
 .../control/ui/views/model/impl/BaseEventComponent.java   | 4 ++--
 .../ui/views/model/impl/KernelProviderComponent.java      | 4 ++--
 .../control/ui/views/model/impl/TargetNodeComponent.java  | 4 ++--
 .../ui/views/model/impl/TraceChannelComponent.java        | 4 ++--
 .../ui/views/model/impl/TraceControlComponent.java        | 2 +-
 .../control/ui/views/model/impl/TraceDomainComponent.java | 4 ++--
 .../control/ui/views/model/impl/TraceEventComponent.java  | 4 ++--
 .../ui/views/model/impl/TraceProbeEventComponent.java     | 4 ++--
 .../ui/views/model/impl/TraceSessionComponent.java        | 4 ++--
 .../control/ui/views/model/impl/UstProviderComponent.java | 4 ++--
 .../tracecompass/tmf/ui/editors/TmfEditorInput.java       | 2 +-
 .../tracecompass/tmf/ui/editors/TmfEventsEditor.java      | 8 ++++----
 .../tmf/ui/viewers/events/TmfEventAdapterFactory.java     | 6 +++---
 .../tmf/ui/viewers/events/TmfEventsCache.java             | 4 ++--
 .../eclipse/tracecompass/tmf/ui/views/uml2sd/SDView.java  | 6 +++---
 17 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java b/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java
index 0e968504bb..7cad4742cc 100644
--- a/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java
+++ b/btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java
@@ -76,9 +76,10 @@ public class BtfEvent extends TmfEvent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapterType) {
         // Force loading the adapters otherwise some plugins might not load
-        return Platform.getAdapterManager().loadAdapter(this, adapter.getName());
+        Object adatper = Platform.getAdapterManager().loadAdapter(this, adapterType.getName());
+        return adapterType.cast(adatper);
     }
 
     /**
diff --git a/btf/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventAdapterFactory.java b/btf/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventAdapterFactory.java
index 58b3e2aa96..9260edf277 100644
--- a/btf/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventAdapterFactory.java
+++ b/btf/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventAdapterFactory.java
@@ -32,10 +32,10 @@ public class BtfEventAdapterFactory implements IAdapterFactory {
     }
 
     @Override
-    public Object getAdapter(Object element, Class key) {
-        if (element instanceof BtfEvent && IPropertySource.class.equals(key)) {
+    public <T> T getAdapter(Object element, Class<T> adapterType) {
+        if (element instanceof BtfEvent && IPropertySource.class.equals(adapterType)) {
             BtfEvent tmfEvent = (BtfEvent) element;
-            return new BtfEventPropertySource(tmfEvent);
+            return adapterType.cast(new BtfEventPropertySource(tmfEvent));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java
index 71253d2049..c6ed884599 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java
@@ -138,9 +138,9 @@ public class BaseEventComponent extends TraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new BaseEventPropertySource(this);
+            return adapter.cast(new BaseEventPropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java
index 76370b5d87..2992cb304c 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java
@@ -72,9 +72,9 @@ public class KernelProviderComponent extends TraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new KernelProviderPropertySource(this);
+            return adapter.cast(new KernelProviderPropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java
index 8991cde3c9..d8bd840a22 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java
@@ -181,9 +181,9 @@ public class TargetNodeComponent extends TraceControlComponent implements IRemot
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new TargetNodePropertySource(this);
+            return adapter.cast(new TargetNodePropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java
index bfdf766a94..ee35e8b0ac 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java
@@ -244,9 +244,9 @@ public class TraceChannelComponent extends TraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new TraceChannelPropertySource(this);
+            return adapter.cast(new TraceChannelPropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java
index f1ddf76e8a..b66988853f 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java
@@ -327,7 +327,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         return null;
     }
 }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java
index 70cb15461e..3f2cc4ab9c 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java
@@ -84,9 +84,9 @@ public class TraceDomainComponent extends TraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new TraceDomainPropertySource(this);
+            return adapter.cast(new TraceDomainPropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java
index c38c3d93ab..52910fa282 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java
@@ -200,9 +200,9 @@ public class TraceEventComponent extends TraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new TraceEventPropertySource(this);
+            return adapter.cast(new TraceEventPropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java
index 1ad06857a4..a9e4ba3f56 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java
@@ -65,9 +65,9 @@ public class TraceProbeEventComponent extends TraceEventComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new TraceProbeEventPropertySource(this);
+            return adapter.cast(new TraceProbeEventPropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java
index 5a6fa47add..749a30b862 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java
@@ -220,9 +220,9 @@ public class TraceSessionComponent extends TraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new TraceSessionPropertySource(this);
+            return adapter.cast(new TraceSessionPropertySource(this));
         }
         return null;
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java
index 0d167ea567..b1b297b3a1 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java
@@ -94,9 +94,9 @@ public class UstProviderComponent extends TraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         if (adapter == IPropertySource.class) {
-            return new UstProviderPropertySource(this);
+            return adapter.cast(new UstProviderPropertySource(this));
         }
         return null;
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEditorInput.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEditorInput.java
index 8c5314deaa..a436ba02e4 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEditorInput.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEditorInput.java
@@ -44,7 +44,7 @@ public class TmfEditorInput implements IEditorInput {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         return null;
     }
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java
index df52bb9a05..c18248c945 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java
@@ -411,14 +411,14 @@ public class TmfEventsEditor extends TmfEditor implements ITmfTraceEditor, IReus
     }
 
     @Override
-    public Object getAdapter(final Class adapter) {
+    public <T> T getAdapter(final Class<T> adapter) {
         if (IGotoMarker.class.equals(adapter)) {
             if (fTrace == null || fEventsTable == null) {
-                return this;
+                return adapter.cast(this);
             }
-            return fEventsTable;
+            return adapter.cast(fEventsTable);
         } else if (IPropertySheetPage.class.equals(adapter)) {
-            return new UnsortedPropertySheetPage();
+            return adapter.cast(new UnsortedPropertySheetPage());
         }
         return super.getAdapter(adapter);
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventAdapterFactory.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventAdapterFactory.java
index 390faeb8a8..210cebcbdd 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventAdapterFactory.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventAdapterFactory.java
@@ -29,10 +29,10 @@ public class TmfEventAdapterFactory implements IAdapterFactory {
     }
 
     @Override
-    public Object getAdapter(Object element, Class key) {
+    public <T> T getAdapter(Object element, Class<T> adapterType) {
         ITmfEvent tmfEvent = (ITmfEvent) element;
-        if (IPropertySource.class.equals(key)) {
-            return new TmfEventPropertySource(tmfEvent);
+        if (IPropertySource.class.equals(adapterType)) {
+            return adapterType.cast(new TmfEventPropertySource(tmfEvent));
         }
         return null;
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java
index fa02209bd9..7736b388de 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java
@@ -83,8 +83,8 @@ public class TmfEventsCache {
         }
 
         @Override
-        public Object getAdapter(Class adapter) {
-            return event.getAdapter(adapter);
+        public <T> T getAdapter(Class<T> adapterType) {
+            return event.getAdapter(adapterType);
         }
 
         @Override
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/SDView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/SDView.java
index 5ed8736d45..79aab0851f 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/SDView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/SDView.java
@@ -1146,10 +1146,10 @@ public class SDView extends ViewPart implements IPartListener {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
-        Object obj = super.getAdapter(adapter);
+    public <T> T getAdapter(Class<T> adapter) {
+        T obj = super.getAdapter(adapter);
         if (fSdPropertiesProvider != null && adapter.equals(IPropertySheetPage.class)) {
-            return fSdPropertiesProvider.getPropertySheetEntry();
+            return adapter.cast(fSdPropertiesProvider.getPropertySheetEntry());
         }
 
         return obj;
-- 
2.34.1