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:
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapterType) {
// Force loading the adapters otherwise some plugins might not load
// 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);
- 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;
BtfEvent tmfEvent = (BtfEvent) element;
- return new BtfEventPropertySource(tmfEvent);
+ return adapterType.cast(new BtfEventPropertySource(tmfEvent));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new BaseEventPropertySource(this);
+ return adapter.cast(new BaseEventPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new KernelProviderPropertySource(this);
+ return adapter.cast(new KernelProviderPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new TargetNodePropertySource(this);
+ return adapter.cast(new TargetNodePropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new TraceChannelPropertySource(this);
+ return adapter.cast(new TraceChannelPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new TraceDomainPropertySource(this);
+ return adapter.cast(new TraceDomainPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new TraceEventPropertySource(this);
+ return adapter.cast(new TraceEventPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new TraceProbeEventPropertySource(this);
+ return adapter.cast(new TraceProbeEventPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new TraceSessionPropertySource(this);
+ return adapter.cast(new TraceSessionPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IPropertySource.class) {
if (adapter == IPropertySource.class) {
- return new UstProviderPropertySource(this);
+ return adapter.cast(new UstProviderPropertySource(this));
- public Object getAdapter(Class adapter) {
+ public <T> T getAdapter(Class<T> adapter) {
- public Object getAdapter(final Class adapter) {
+ public <T> T getAdapter(final Class<T> adapter) {
if (IGotoMarker.class.equals(adapter)) {
if (fTrace == null || fEventsTable == null) {
if (IGotoMarker.class.equals(adapter)) {
if (fTrace == null || fEventsTable == null) {
+ return adapter.cast(this);
+ return adapter.cast(fEventsTable);
} else if (IPropertySheetPage.class.equals(adapter)) {
} else if (IPropertySheetPage.class.equals(adapter)) {
- return new UnsortedPropertySheetPage();
+ return adapter.cast(new UnsortedPropertySheetPage());
}
return super.getAdapter(adapter);
}
}
return super.getAdapter(adapter);
}
- public Object getAdapter(Object element, Class key) {
+ public <T> T getAdapter(Object element, Class<T> adapterType) {
ITmfEvent tmfEvent = (ITmfEvent) element;
ITmfEvent tmfEvent = (ITmfEvent) element;
- if (IPropertySource.class.equals(key)) {
- return new TmfEventPropertySource(tmfEvent);
+ if (IPropertySource.class.equals(adapterType)) {
+ return adapterType.cast(new TmfEventPropertySource(tmfEvent));
- public Object getAdapter(Class adapter) {
- return event.getAdapter(adapter);
+ public <T> T getAdapter(Class<T> adapterType) {
+ return event.getAdapter(adapterType);
- 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)) {
if (fSdPropertiesProvider != null && adapter.equals(IPropertySheetPage.class)) {
- return fSdPropertiesProvider.getPropertySheetEntry();
+ return adapter.cast(fSdPropertiesProvider.getPropertySheetEntry());