Update usage of IAdaptable#getAdapter
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Mon, 9 Mar 2015 19:50:46 +0000 (15:50 -0400)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Tue, 30 Jun 2015 15:06:10 +0000 (11:06 -0400)
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>
17 files changed:
btf/org.eclipse.tracecompass.btf.core/src/org/eclipse/tracecompass/btf/core/event/BtfEvent.java
btf/org.eclipse.tracecompass.btf.ui/src/org/eclipse/tracecompass/btf/ui/BtfEventAdapterFactory.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/BaseEventComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/KernelProviderComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceChannelComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceControlComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceDomainComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceEventComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceProbeEventComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TraceSessionComponent.java
lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/UstProviderComponent.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEditorInput.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/editors/TmfEventsEditor.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventAdapterFactory.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/events/TmfEventsCache.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/uml2sd/SDView.java

index 0e968504bb18c9e5cb007d1d809122907145ad07..7cad4742cc58d46a6aa2ca7fc0b4f7a021b7b0fa 100644 (file)
@@ -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);
     }
 
     /**
index 58b3e2aa96bf22bca4155190d244922e04917f0a..9260edf277a99a2b290a0a25f2d883f8abc71b3b 100644 (file)
@@ -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;
     }
index 71253d204916fccd33c53ed563cb0a5ea3e822c4..c6ed88459909dace67db20088a828d469dc07d18 100644 (file)
@@ -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;
     }
index 76370b5d879eb64c7f5ac286431de2eac96fb574..2992cb304c95549a9349cca2aade49653f31d027 100644 (file)
@@ -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;
     }
index 8991cde3c9ab6152ae9674248e601d1c4c5d83cb..d8bd840a22de8c680d2f4f65ee445b62e66220ad 100644 (file)
@@ -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;
     }
index bfdf766a947333b55c505196a49c9b0123b98424..ee35e8b0ac8ff2716f51e1936f225a8321e22b0e 100644 (file)
@@ -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;
     }
index f1ddf76e8a626fda5568240d2e08fd17f0847b75..b66988853f5185ccd5b2b9dcad9170161a22942e 100644 (file)
@@ -327,7 +327,7 @@ public class TraceControlComponent implements ITraceControlComponent {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         return null;
     }
 }
index 70cb15461ec0ccb0e6241939f906f2eff85aa5c2..3f2cc4ab9c9b42925988405f42e6cbb8d63ec836 100644 (file)
@@ -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;
     }
index c38c3d93abdf02f3063e45d202eacd92305ffe67..52910fa28296d77c3b4f79eaca2282c400cef475 100644 (file)
@@ -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;
     }
index 1ad06857a4d27764357ce283ac7b5aab5a7695d0..a9e4ba3f56f51de3e1964f99f1edbfd9cf511e0c 100644 (file)
@@ -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;
     }
index 5a6fa47add7a1ea023e243f75558e017f4a1a81e..749a30b86242bfbb8879a8452825e72413e8255d 100644 (file)
@@ -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;
     }
index 0d167ea56769e11ba4cbaba6a998df0a3451f8db..b1b297b3a15e77704f24930079da35f8cc857c43 100644 (file)
@@ -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;
     }
index 8c5314deaa6a80bce358e024ee8120739139207d..a436ba02e469aac9dff778e45a4f4996133bfa1c 100644 (file)
@@ -44,7 +44,7 @@ public class TmfEditorInput implements IEditorInput {
     }
 
     @Override
-    public Object getAdapter(Class adapter) {
+    public <T> T getAdapter(Class<T> adapter) {
         return null;
     }
 
index df52bb9a05ba355307de792f0774d56ae0a70d3b..c18248c945ea499f8223e9d2c79214467bd60441 100644 (file)
@@ -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);
     }
index 390faeb8a8ea688539924ed8bc165107dece714b..210cebcbddbae49f8d174b2441863ac4a95a2913 100644 (file)
@@ -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;
     }
index fa02209bd91c965fdcca52952bde0d5e894d8b21..7736b388de599181d352917ac7da98744f4a3293 100644 (file)
@@ -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
index 5ed8736d456546b9c1841cb744848f230e602cff..79aab0851f7d0d9916b3242c5d297451c61a4191 100644 (file)
@@ -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;
This page took 0.032808 seconds and 5 git commands to generate.