From ecf21ca88283b7b83cb9c4d5c6cf11f6b7439cc3 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 15 Apr 2015 13:54:53 -0400 Subject: [PATCH] Move to new getAdapter() signature using generics Change-Id: If51cc778c1b7e7dfea7a6fb3b7f39acea56aa330 Signed-off-by: Marc Khouzam --- .../ui/CSourceNotFoundDescriptionFactory.java | 11 ++++---- .../ui/DebugTextHoverAdapterFactory.java | 15 +++++------ .../ui/SuspendResumeAdapterFactory.java | 25 +++++++++--------- .../RetargettableActionAdapterFactory.java | 15 +++++------ .../DisassemblyBackendDsfFactory.java | 13 +++++----- .../ui/disassembly/DisassemblyPart.java | 26 +++++++++---------- .../disassembly/util/StorageEditorInput.java | 5 ++-- .../detail/NumberFormatDetailPane.java | 10 +++---- .../ui/viewmodel/SimpleMapPersistable.java | 7 ++--- .../breakpoints/BreakpointVMContext.java | 10 +++---- .../expression/ExpressionManagerVMNode.java | 5 ++-- .../expression/SingleExpressionVMNode.java | 13 +++++----- .../modules/detail/ModuleDetailPane.java | 10 +++---- .../register/RegisterVMProvider.java | 12 ++++----- .../dsf/ui/viewmodel/AbstractVMContext.java | 16 ++++++------ .../viewmodel/datamodel/AbstractDMVMNode.java | 12 ++++----- 16 files changed, 99 insertions(+), 106 deletions(-) diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java index 939da161d57..310a546e153 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2014 Nokia and others. + * Copyright (c) 2010, 2015 Nokia and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,13 +40,13 @@ import com.ibm.icu.text.MessageFormat; public class CSourceNotFoundDescriptionFactory implements IAdapterFactory { @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Object adaptableObject, Class adapterType) { + @SuppressWarnings("unchecked") + public T getAdapter(Object adaptableObject, Class adapterType) { if (adapterType.equals(ICSourceNotFoundDescription.class) && adaptableObject instanceof IFrameDMContext) { final IFrameDMContext frameDMC = (IFrameDMContext) adaptableObject; - return new ICSourceNotFoundDescription() { + return (T)new ICSourceNotFoundDescription() { @Override public String getDescription() { @@ -84,8 +84,7 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory { } @Override - @SuppressWarnings("rawtypes") - public Class[] getAdapterList() { + public Class[] getAdapterList() { return new Class[] { ICSourceNotFoundDescription.class }; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java index 0ae330638a2..7b8d2377d75 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Wind River Systems, Inc. and others. + * Copyright (c) 2010, 2015 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,28 +28,27 @@ public class DebugTextHoverAdapterFactory implements IAdapterFactory { private static final Class[] TYPES = { ICEditorTextHover.class }; private static final Object fDebugTextHover= new DsfDebugTextHover(); - @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Object adaptableObject, Class adapterType) { + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Object adaptableObject, Class adapterType) { if (adaptableObject instanceof IDMVMContext) { IDMContext dmc = ((IDMVMContext) adaptableObject).getDMContext(); // try session specific hover - Object sessionHover = dmc.getAdapter(adapterType); + T sessionHover = dmc.getAdapter(adapterType); if (sessionHover != null) { return sessionHover; } // use default IFrameDMContext frameDmc = DMContexts.getAncestorOfType(dmc, IFrameDMContext.class); if (frameDmc != null) { - return fDebugTextHover; + return (T)fDebugTextHover; } } return null; } @Override - @SuppressWarnings("rawtypes") - public Class[] getAdapterList() { + public Class[] getAdapterList() { return TYPES; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java index 935c243fed1..02c1ad3238b 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Wind River Systems and others. + * Copyright (c) 2009, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -43,17 +43,17 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory { fResumeAtLine = new ResumeAtLine(execCtx); } - @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Class adapter) { if (adapter.isInstance(fRunToLine)) { - return fRunToLine; + return (T)fRunToLine; } if (adapter.isInstance(fMoveToLine)) { - return fMoveToLine; + return (T)fMoveToLine; } if (adapter.isInstance(fResumeAtLine)) { - return fResumeAtLine; + return (T)fResumeAtLine; } return null; } @@ -73,9 +73,9 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory { public void suspend() throws DebugException {} } - @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Object adaptableObject, Class adapterType) { + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Object adaptableObject, Class adapterType) { if (ISuspendResume.class.equals(adapterType)) { if (adaptableObject instanceof IDMVMContext) { IExecutionDMContext execDmc = DMContexts.getAncestorOfType( @@ -84,7 +84,7 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory { // It only makes sense to RunToLine, MoveToLine or // ResumeAtLine if we are dealing with a thread, not a container if (execDmc != null && !(execDmc instanceof IContainerDMContext)) { - return new SuspendResume(execDmc); + return (T)new SuspendResume(execDmc); } } } @@ -92,8 +92,7 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory { } @Override - @SuppressWarnings("rawtypes") - public Class[] getAdapterList() { + public Class[] getAdapterList() { return new Class[] { ISuspendResume.class }; } } \ No newline at end of file diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java index da7e2ebc45e..9339b74e8bf 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Ericsson and others. + * Copyright (c) 2010, 2015 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -26,16 +26,16 @@ public class RetargettableActionAdapterFactory implements IAdapterFactory { * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Object adaptableObject, Class adapterType) { + @SuppressWarnings("unchecked") + public T getAdapter(Object adaptableObject, Class adapterType) { if (adapterType == IRunToLineTarget.class) { - return new DisassemblyRunToLineAdapter(); + return (T)new DisassemblyRunToLineAdapter(); } if (adapterType == IMoveToLineTarget.class) { - return new DisassemblyMoveToLineAdapter(); + return (T)new DisassemblyMoveToLineAdapter(); } if (adapterType == IResumeAtLineTarget.class) { - return new DisassemblyResumeAtLineAdapter(); + return (T)new DisassemblyResumeAtLineAdapter(); } return null; } @@ -44,8 +44,7 @@ public class RetargettableActionAdapterFactory implements IAdapterFactory { * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ @Override - @SuppressWarnings("rawtypes") - public Class[] getAdapterList() { + public Class[] getAdapterList() { return new Class[]{ IRunToLineTarget.class, IResumeAtLineTarget.class, IMoveToLineTarget.class }; } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java index db9047a2e18..c4329cc582a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Freescale Semiconductor, Inc. and others. + * Copyright (c) 2010, 2015 Freescale Semiconductor, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,8 +24,8 @@ public class DisassemblyBackendDsfFactory implements IAdapterFactory { private static final Class[] ADAPTERS = { IDisassemblyBackend.class }; @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Object adaptableObject, Class adapterType) { + @SuppressWarnings("unchecked") + public T getAdapter(Object adaptableObject, Class adapterType) { if (IDisassemblyBackend.class.equals(adapterType)) { if (adaptableObject instanceof IAdaptable && DisassemblyBackendDsf.supportsDebugContext_((IAdaptable)adaptableObject)) { String sessionId = ((IDMVMContext) adaptableObject).getDMContext().getSessionId(); @@ -33,20 +33,19 @@ public class DisassemblyBackendDsfFactory implements IAdapterFactory { if (session.isActive()) { IAdapterFactory factory = (IAdapterFactory) session.getModelAdapter(IAdapterFactory.class); if (factory != null) { - Object adapter = factory.getAdapter(adaptableObject, adapterType); + T adapter = factory.getAdapter(adaptableObject, adapterType); if (adapter != null) return adapter; } } - return new DisassemblyBackendDsf(); + return (T)new DisassemblyBackendDsf(); } } return null; } @Override - @SuppressWarnings("rawtypes") - public Class[] getAdapterList() { + public Class[] getAdapterList() { return ADAPTERS; } } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java index 9be5d9f5a14..7815db091c7 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2014 Wind River Systems and others. + * Copyright (c) 2007, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -537,26 +537,26 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem /* * @see IAdaptable#getAdapter(java.lang.Class) */ - @SuppressWarnings("rawtypes") + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class required) { + public T getAdapter(Class required) { if (IVerticalRulerInfo.class.equals(required)) { if (fVerticalRuler != null) { - return fVerticalRuler; + return (T)fVerticalRuler; } } else if (IDisassemblyPart.class.equals(required)) { - return this; + return (T)this; } else if (IFindReplaceTarget.class.equals(required)) { if (fFindReplaceTarget == null) { fFindReplaceTarget = (fViewer == null ? null : fViewer.getFindReplaceTarget()); } - return fFindReplaceTarget; + return (T)fFindReplaceTarget; } else if (ITextOperationTarget.class.equals(required)) { - return (fViewer == null ? null : fViewer.getTextOperationTarget()); + return (fViewer == null ? null : (T)fViewer.getTextOperationTarget()); } else if (Control.class.equals(required)) { - return fViewer != null ? fViewer.getTextWidget() : null; + return fViewer != null ? (T)fViewer.getTextWidget() : null; } else if (IGotoMarker.class.equals(required)) { - return new IGotoMarker() { + return (T)new IGotoMarker() { @Override public void gotoMarker(IMarker marker) { DisassemblyPart.this.gotoMarker(marker); @@ -564,7 +564,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem } else if (IColumnSupport.class.equals(required)) { if (fColumnSupport == null) fColumnSupport= createColumnSupport(); - return fColumnSupport; + return (T)fColumnSupport; } return super.getAdapter(required); @@ -577,7 +577,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem */ private void addRulerContributionActions(IMenuManager menu) { // store directly in generic editor preferences - final IColumnSupport support= (IColumnSupport) getAdapter(IColumnSupport.class); + final IColumnSupport support= getAdapter(IColumnSupport.class); IPreferenceStore store= DsfUIPlugin.getDefault().getPreferenceStore(); final RulerColumnPreferenceAdapter adapter= new RulerColumnPreferenceAdapter(store, PREFERENCE_RULER_CONTRIBUTIONS); List descriptors= RulerColumnRegistry.getDefault().getColumnDescriptors(); @@ -608,7 +608,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem * @param ruler the composite ruler to add contributions to */ protected void updateContributedRulerColumns(CompositeRuler ruler) { - IColumnSupport support= (IColumnSupport)getAdapter(IColumnSupport.class); + IColumnSupport support= getAdapter(IColumnSupport.class); if (support == null) return; @@ -689,7 +689,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem fPCHistorySizeMax = store.getInt(property); } else if (PREFERENCE_RULER_CONTRIBUTIONS.equals(property)) { String[] difference= StringSetSerializer.getDifference((String) event.getOldValue(), (String) event.getNewValue()); - IColumnSupport support= (IColumnSupport) getAdapter(IColumnSupport.class); + IColumnSupport support= getAdapter(IColumnSupport.class); for (int i= 0; i < difference.length; i++) { RulerColumnDescriptor desc= RulerColumnRegistry.getDefault().getColumnDescriptor(difference[i]); if (desc != null && support.isColumnSupported(desc)) { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java index 8a4f99a6e59..8b50a886371 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 Wind River Systems and others. + * Copyright (c) 2007, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -108,8 +108,7 @@ abstract public class StorageEditorInput implements IStorageEditorInput { } @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java index 2310126e280..dbdead74feb 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 IBM Corporation and others. + * Copyright (c) 2006, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -724,13 +724,13 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class required) { + @SuppressWarnings("unchecked") + public T getAdapter(Class required) { if (IFindReplaceTarget.class.equals(required)) { - return fTextViewer.getFindReplaceTarget(); + return (T)fTextViewer.getFindReplaceTarget(); } if (ITextViewer.class.equals(required)) { - return fTextViewer; + return (T)fTextViewer; } return null; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SimpleMapPersistable.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SimpleMapPersistable.java index 534c50a27b4..90ab29bb8cd 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SimpleMapPersistable.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SimpleMapPersistable.java @@ -1,5 +1,5 @@ /***************************************************************** - * Copyright (c) 2011, 2014 Wind River Systems and others. + * Copyright (c) 2011, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -138,10 +138,11 @@ public class SimpleMapPersistable implements IPersistableElement, IAdaptable return SimpleMapPersistableFactory.getFactoryId(); } + @SuppressWarnings("unchecked") @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { + public T getAdapter(Class adapter) { if (adapter.isInstance(this)) { - return this; + return (T)this; } return null; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMContext.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMContext.java index b1ffbabfd09..79d3923183b 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMContext.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 Wind River Systems and others. + * Copyright (c) 2008, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,11 +29,11 @@ public class BreakpointVMContext extends AbstractVMContext { return fBreakpoint; } - @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Class adapter) { if (adapter.isInstance(fBreakpoint)) { - return fBreakpoint; + return (T)fBreakpoint; } return super.getAdapter(adapter); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java index 7061cbe5d13..cf00b8ca1bf 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Wind River Systems and others. + * Copyright (c) 2006, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,8 +73,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode } @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return super.getAdapter(adapter); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java index 0670698dbe6..577735e355a 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Wind River Systems, Inc. and others. + * Copyright (c) 2009, 2015 Wind River Systems, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -54,16 +54,16 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa public IDMContext getDMContext() { return fDmc; } - @SuppressWarnings("rawtypes") + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { - Object superAdapter = super.getAdapter(adapter); + public T getAdapter(Class adapter) { + T superAdapter = super.getAdapter(adapter); if (superAdapter != null) { return superAdapter; } else { // Delegate to the Data Model to find the context. if (adapter.isInstance(fDmc)) { - return fDmc; + return (T)fDmc; } else { return fDmc.getAdapter(adapter); } @@ -121,9 +121,8 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa public String getModelIdentifier() { return null; } - @SuppressWarnings("rawtypes") @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } @Override diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java index 5ba3f503d80..10f5839b853 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 IBM Corporation and others. + * Copyright (c) 2006, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -181,11 +181,11 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap return false; } - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class adapter) { + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Class adapter) { if (ITextViewer.class.equals(adapter)) { - return fSourceViewer; + return (T)fSourceViewer; } return null; } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java index 0a46c53358f..a526f6ab45c 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2014 Wind River Systems and others. + * Copyright (c) 2006, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -236,16 +236,16 @@ public class RegisterVMProvider extends AbstractElementVMProvider * The IAdaptable implementation. If the adapter is the DM context, * return the context, otherwise delegate to IDMContext.getAdapter(). */ - @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { - Object superAdapter = super.getAdapter(adapter); + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Class adapter) { + T superAdapter = super.getAdapter(adapter); if (superAdapter != null) { return superAdapter; } else { // Delegate to the Data Model to find the context. if (adapter.isInstance(fDMContext)) { - return fDMContext; + return (T)fDMContext; } else { return fDMContext.getAdapter(adapter); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java index 7b00920f9f1..3c0704e9954 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Wind River Systems and others. + * Copyright (c) 2006, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -41,23 +41,23 @@ abstract public class AbstractVMContext implements IVMContext { @Override public IVMNode getVMNode() { return fNode; } - @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Class adapter) { // If the context implements the given adapter directly, it always takes // precedence. if (adapter.isInstance(this)) { - return this; + return (T)this; } IVMProvider vmProvider = getVMNode().getVMProvider(); IVMAdapter vmAdapter = vmProvider.getVMAdapter(); if (adapter.isInstance(vmAdapter)) { - return vmAdapter; + return (T)vmAdapter; } else if (adapter.isInstance(vmProvider)) { - return vmProvider; + return (T)vmProvider; } else if (adapter.isInstance(getVMNode())) { - return getVMNode(); + return (T)getVMNode(); } return Platform.getAdapterManager().getAdapter(this, adapter); } diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java index 76acabc022a..a07c56ee95c 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Wind River Systems and others. + * Copyright (c) 2006, 2015 Wind River Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -66,16 +66,16 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode * The IAdaptable implementation. If the adapter is the DM context, * return the context, otherwise delegate to IDMContext.getAdapter(). */ - @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { - Object superAdapter = super.getAdapter(adapter); + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Class adapter) { + T superAdapter = super.getAdapter(adapter); if (superAdapter != null) { return superAdapter; } else { // Delegate to the Data Model to find the context. if (adapter.isInstance(fDmc)) { - return fDmc; + return (T)fDmc; } else { return fDmc.getAdapter(adapter); }