mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Generify getAdapter methods.

Browse source 
Not all instances handled but the patch is big enough already. Drop the
useless casts thanks to the generification too.

Change-Id: I608c93a317135a8738ad770de71d9c3cda24791a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
This commit is contained in:
Alexander Kurtakov 2015-11-14 00:04:50 +02:00
parent e0616d97b0
commit 728a032bde
36 changed files with 121 additions and 196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
View file

@ -372,13 +372,13 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
}
}
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(IProject.class)) {
return getProject();
return (T) getProject();
} else if (adapter.equals(IResource.class)) {
return container;
return (T) container;
}
return super.getAdapter(adapter);
}

3
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java
View file

@ -78,8 +78,7 @@ abstract class CElementHandle implements ICElementHandle, ISourceReference {
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return null;
}

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java
View file

@ -62,10 +62,10 @@ public abstract class CompositeIndexBinding implements IIndexBinding {
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.isInstance(rbinding)) {
return rbinding;
return (T) rbinding;
}
return null;
}

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java
View file

@ -76,8 +76,7 @@ abstract class PreprocessorMacro implements IMacroBinding {
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class clazz) {
public <T> T getAdapter(Class<T> clazz) {
return null;
}

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java
View file

@ -305,8 +305,7 @@ public class PDOMASTAdapter {
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return fDelegate.getAdapter(adapter);
}
@ -376,8 +375,7 @@ public class PDOMASTAdapter {
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return fDelegate.getAdapter(adapter);
}
@ -477,8 +475,7 @@ public class PDOMASTAdapter {
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return fDelegate.getAdapter(adapter);
}

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java
View file

@ -95,8 +95,7 @@ final class PDOMCParameter extends PDOMNamedNode implements IParameter, IPDOMBin
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return null;
}

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java
View file

@ -166,8 +166,7 @@ class PDOMCPPParameter extends PDOMNamedNode implements ICPPParameter, IPDOMBind
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return null;
}

15
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
View file

@ -322,20 +322,15 @@ public class CygwinPEBinaryObject extends PEBinaryObject {
}
}
/*
* (non-Javadoc)
*
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter == Addr2line.class) {
return getAddr2line(false);
return (T) getAddr2line(false);
} else if (adapter == CPPFilt.class) {
return getCPPFilt();
return (T) getCPPFilt();
} else if (adapter == CygPath.class) {
return getCygPath();
return (T) getCygPath();
}
return super.getAdapter(adapter);
}

12
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java
View file

@ -102,22 +102,22 @@ public class PEBinaryObject extends BinaryObjectAdapter {
return info;
}
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(PE.class)) {
try {
if (header != null) {
return new PE(getPath().toOSString(), header.getObjectDataOffset());
return (T) new PE(getPath().toOSString(), header.getObjectDataOffset());
}
return new PE(getPath().toOSString());
return (T) new PE(getPath().toOSString());
} catch (IOException e) {
}
}
if (adapter.equals(ISymbolReader.class)) {
PE pe = (PE)getAdapter(PE.class);
PE pe = getAdapter(PE.class);
if (pe != null) {
return pe.getSymbolReader();
return (T) pe.getSymbolReader();
}
}
return super.getAdapter(adapter);

14
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java
View file

@ -198,23 +198,19 @@ public class ElfBinaryObject extends BinaryObjectAdapter {
}
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(Elf.class)) {
try {
return new Elf(getPath().toOSString());
return (T) new Elf(getPath().toOSString());
} catch (IOException e) {
}
}
if (adapter.equals(ISymbolReader.class)) {
Elf elf = (Elf)getAdapter(Elf.class);
Elf elf = getAdapter(Elf.class);
if (elf != null) {
return elf.getSymbolReader();
return (T) elf.getSymbolReader();
}
}
return super.getAdapter(adapter);

13
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java
View file

@ -206,18 +206,13 @@ public class GNUElfBinaryObject extends ElfBinaryObject {
}
}
/*
* (non-Javadoc)
*
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter == Addr2line.class) {
return getAddr2line(false);
return (T) getAddr2line(false);
} else if (adapter == CPPFilt.class) {
return getCPPFilt();
return (T) getCPPFilt();
}
return super.getAdapter(adapter);
}

10
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java
View file

@ -75,19 +75,15 @@ public class GNUElfParser extends ElfParser {
return new DefaultGnuToolFactory(this);
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(IGnuToolFactory.class)) {
if (toolFactory == null) {
toolFactory = createGNUToolFactory();
}
return toolFactory;
return (T) toolFactory;
}
// TODO Auto-generated method stub
return super.getAdapter(adapter);
}
}

13
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java
View file

@ -394,22 +394,19 @@ public class MachOBinaryObject extends BinaryObjectAdapter {
return false;
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(MachO.class)) {
try {
return new MachO(getPath().toOSString());
return (T) new MachO(getPath().toOSString());
} catch (IOException e) {
}
}
if (adapter.equals(ISymbolReader.class)) {
MachO macho = (MachO)getAdapter(MachO.class);
MachO macho = getAdapter(MachO.class);
if (macho != null) {
return macho.getSymbolReader();
return (T) macho.getSymbolReader();
}
}
return super.getAdapter(adapter);

13
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java
View file

@ -410,22 +410,19 @@ public class MachOBinaryObject64 extends BinaryObjectAdapter {
return false;
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(MachO64.class)) {
try {
return new MachO64(getPath().toOSString());
return (T) new MachO64(getPath().toOSString());
} catch (IOException e) {
}
}
if (adapter.equals(ISymbolReader.class)) {
MachO64 macho = (MachO64)getAdapter(MachO64.class);
MachO64 macho = getAdapter(MachO64.class);
if (macho != null) {
return macho.getSymbolReader();
return (T) macho.getSymbolReader();
}
}
return super.getAdapter(adapter);

13
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java
View file

@ -310,18 +310,13 @@ public class SOMBinaryObject extends BinaryObjectAdapter {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter == Addr2line.class) {
return getAddr2line(false);
return (T) getAddr2line(false);
} else if (adapter == CPPFilt.class) {
return getCPPFilt();
return (T) getCPPFilt();
}
return super.getAdapter(adapter);
}

9
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java
View file

@ -157,17 +157,14 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser {
return new DefaultGnuToolFactory(this);
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(IGnuToolFactory.class)) {
if (toolFactory == null) {
toolFactory = createGNUToolFactory();
}
return toolFactory;
return (T) toolFactory;
}
return super.getAdapter(adapter);
}

11
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java
View file

@ -173,19 +173,14 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser {
return new DefaultGnuToolFactory(this);
}
/*
* (non-Javadoc)
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(IGnuToolFactory.class)) {
if (toolFactory == null) {
toolFactory = createGNUToolFactory();
}
return toolFactory;
return (T) toolFactory;
}
return super.getAdapter(adapter);
}

13
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java
View file

@ -302,18 +302,13 @@ public class XCOFFBinaryObject extends BinaryObjectAdapter {
return null;
}
/*
* (non-Javadoc)
*
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter == Addr2line.class) {
return getAddr2line();
return (T) getAddr2line();
} else if (adapter == CPPFilt.class) {
return getCPPFilt();
return (T) getCPPFilt();
}
return super.getAdapter(adapter);
}

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java
View file

@ -25,14 +25,11 @@ public class CProjectAdapterFactory implements IAdapterFactory {
private static final Class<?>[] ADAPTERS = { IProject.class };
/*
* @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> T getAdapter(Object adaptableObject, Class<T> adapterType) {
if (IProject.class.equals(adapterType)) {
return ((ICProject)adaptableObject).getProject();
return (T) ((ICProject)adaptableObject).getProject();
}
return null;
}

17
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java
View file

@ -38,24 +38,21 @@ public class ResourceAdapterFactory implements IAdapterFactory {
return PROPERTIES;
}
/**
* @see IAdapterFactory#getAdapter
*/
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Object element, Class key) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Object element, Class<T> key) {
if (ICElement.class.equals(key)) {
//try {
if (element instanceof IFile) {
return celementFactory.create((IFile)element);
return (T) celementFactory.create((IFile)element);
} else if (element instanceof IFolder) {
return celementFactory.create((IFolder)element);
return (T) celementFactory.create((IFolder)element);
} else if (element instanceof IProject) {
return celementFactory.create((IProject)element);
return (T) celementFactory.create((IProject)element);
} else if (element instanceof IWorkspaceRoot) {
return CoreModel.create((IWorkspaceRoot)element);
return (T) CoreModel.create((IWorkspaceRoot)element);
} else if (element instanceof IResource) {
return celementFactory.create((IResource)element);
return (T) celementFactory.create((IResource)element);
}
//} catch (CoreException e) {
// CUIPlugin.getDefault().getLog().log(e.getStatus());

11
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
View file

@ -531,17 +531,14 @@ public class BuildConsolePage extends Page
getViewer().refresh();
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class required) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> required) {
if (IFindReplaceTarget.class.equals(required)) {
return getViewer().getFindReplaceTarget();
return (T) getViewer().getFindReplaceTarget();
}
if (Widget.class.equals(required)) {
return getViewer().getTextWidget();
return (T) getViewer().getTextWidget();
}
// if (IShowInSource.class.equals(required)) {
// return this;

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePageParticipant.java
View file

@ -22,7 +22,7 @@ public class BuildConsolePageParticipant implements IConsolePageParticipant {
private BuildConsole console;
@Override
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return null;
}

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java
View file

@ -48,7 +48,7 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction {
public void run(IStructuredSelection selection) {
if (!selection.isEmpty()) {
Object selectedObject= selection.getFirstElement();
ICElement elem= (ICElement) getAdapter(selectedObject, ICElement.class);
ICElement elem= getAdapter(selectedObject, ICElement.class);
if (elem != null) {
CallHierarchyUI.open(getSite().getWorkbenchWindow(), elem);
}
@ -67,7 +67,7 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction {
}
Object selectedObject= selection.getFirstElement();
ICElement elem= (ICElement) getAdapter(selectedObject, ICElement.class);
ICElement elem= getAdapter(selectedObject, ICElement.class);
if (elem != null) {
setEnabled(isValidElement(elem));
} else {
@ -88,10 +88,10 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction {
return false;
}
@SuppressWarnings("rawtypes")
private Object getAdapter(Object object, Class desiredClass) {
@SuppressWarnings("unchecked")
private <T> T getAdapter(Object object, Class<T> desiredClass) {
if (desiredClass.isInstance(object)) {
return object;
return (T) object;
}
if (object instanceof IAdaptable) {
IAdaptable adaptable= (IAdaptable) object;

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
View file

@ -320,15 +320,15 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
/**
* Answer the property defined by key.
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class key) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> key) {
if (key.equals(ISelectionProvider.class)) {
return viewer;
return (T) viewer;
} else if (key == IShowInSource.class) {
return getShowInSource();
return (T) getShowInSource();
} else if (key == IShowInTarget.class) {
return this;
return (T) this;
}
return super.getAdapter(key);
}

11
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java
View file

@ -36,17 +36,14 @@ public class IncludeRefContainer extends CElementGrouping {
fCProject = cproject;
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter == IWorkbenchAdapter.class) {
return this;
return (T) this;
}
if (adapter == ICProject.class) {
return fCProject;
return (T) fCProject;
}
return null;
}

11
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java
View file

@ -40,17 +40,14 @@ public class LibraryRefContainer extends CElementGrouping {
fCProject = cproject;
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@SuppressWarnings("rawtypes")
@Override
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter == IWorkbenchAdapter.class) {
return this;
return (T) this;
}
if (adapter == ICProject.class) {
return fCProject;
return (T) fCProject;
}
return null;
}

13
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
View file

@ -316,17 +316,14 @@ public abstract class AbstractCModelOutlinePage extends Page
fOpenIncludeAction= new OpenIncludeAction(this);
}
/*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class key) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> key) {
if (key == IShowInSource.class) {
return getShowInSource();
return (T) getShowInSource();
}
if (key == IShowInTargetList.class) {
return new IShowInTargetList() {
return (T) new IShowInTargetList() {
@Override
public String[] getShowInTargetIds() {
return new String[] { ProjectExplorer.VIEW_ID };
@ -334,7 +331,7 @@ public abstract class AbstractCModelOutlinePage extends Page
};
}
if (key == IShowInTarget.class) {
return getShowInTarget();
return (T) getShowInTarget();
}
return null;
}

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java
View file

@ -48,7 +48,7 @@ public class OpenIncludeBrowserAction extends SelectionDispatchAction {
public void run(IStructuredSelection selection) {
if (!selection.isEmpty()) {
Object selectedObject= selection.getFirstElement();
ICElement elem= (ICElement) getAdapter(selectedObject, ICElement.class);
ICElement elem= getAdapter(selectedObject, ICElement.class);
if (elem != null) {
IncludeBrowserUI.open(getSite().getWorkbenchWindow(), elem);
}
@ -67,7 +67,7 @@ public class OpenIncludeBrowserAction extends SelectionDispatchAction {
}
Object selectedObject= selection.getFirstElement();
ICElement elem= (ICElement) getAdapter(selectedObject, ICElement.class);
ICElement elem= getAdapter(selectedObject, ICElement.class);
if (elem != null) {
setEnabled(isValidElement(elem));
}
@ -83,10 +83,10 @@ public class OpenIncludeBrowserAction extends SelectionDispatchAction {
return false;
}
@SuppressWarnings("rawtypes")
private Object getAdapter(Object object, Class desiredClass) {
@SuppressWarnings("unchecked")
private <T> T getAdapter(Object object, Class<T> desiredClass) {
if (desiredClass.isInstance(object)) {
return object;
return (T) object;
}
if (object instanceof IAdaptable) {
IAdaptable adaptable= (IAdaptable) object;

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java
View file

@ -286,10 +286,9 @@ public abstract class CRenameProcessorDelegate {
result.addWarning(msg);
}
if (context != null) {
ResourceChangeChecker checker = (ResourceChangeChecker) context.getChecker(ResourceChangeChecker.class);
ResourceChangeChecker checker = context.getChecker(ResourceChangeChecker.class);
IResourceChangeDescriptionFactory deltaFactory = checker.getDeltaFactory();
ValidateEditChecker editChecker=
(ValidateEditChecker) context.getChecker(ValidateEditChecker.class);
ValidateEditChecker editChecker = context.getChecker(ValidateEditChecker.class);
for (IFile changedFile : fileset) {
deltaFactory.change(changedFile);
editChecker.addFile(changedFile);

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java
View file

@ -170,7 +170,7 @@ public class HeaderFileReferenceAdjuster {
progress = SubMonitor.convert(progress.newChild(9), workingCopies.length + affectedFiles.size());
List<Change> changes = new ArrayList<>();
ValidateEditChecker checker= (ValidateEditChecker) context.getChecker(ValidateEditChecker.class);
ValidateEditChecker checker= context.getChecker(ValidateEditChecker.class);
for (ITranslationUnit tu : workingCopies) {
addFileChange(tu, changes, checker, progress.newChild(1));
}

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java
View file

@ -185,7 +185,7 @@ public class Checks {
}
public static void addModifiedFilesToChecker(IFile[] filesToModify, CheckConditionsContext context) {
ResourceChangeChecker checker= (ResourceChangeChecker) context.getChecker(ResourceChangeChecker.class);
ResourceChangeChecker checker= context.getChecker(ResourceChangeChecker.class);
IResourceChangeDescriptionFactory deltaFactory= checker.getDeltaFactory();
for (int i= 0; i < filesToModify.length; i++) {

10
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java
View file

@ -48,7 +48,7 @@ public class OpenTypeHierarchyAction extends SelectionDispatchAction {
public void run(IStructuredSelection selection) {
if (!selection.isEmpty()) {
Object selectedObject= selection.getFirstElement();
ICElement elem= (ICElement) getAdapter(selectedObject, ICElement.class);
ICElement elem= getAdapter(selectedObject, ICElement.class);
if (elem != null) {
TypeHierarchyUI.open(elem, getSite().getWorkbenchWindow());
}
@ -67,7 +67,7 @@ public class OpenTypeHierarchyAction extends SelectionDispatchAction {
}
Object selectedObject= selection.getFirstElement();
ICElement elem= (ICElement) getAdapter(selectedObject, ICElement.class);
ICElement elem= getAdapter(selectedObject, ICElement.class);
if (elem != null) {
setEnabled(TypeHierarchyUI.isValidInput(elem));
}
@ -76,10 +76,10 @@ public class OpenTypeHierarchyAction extends SelectionDispatchAction {
}
}
@SuppressWarnings("rawtypes")
private Object getAdapter(Object object, Class desiredClass) {
@SuppressWarnings("unchecked")
private <T> T getAdapter(Object object, Class<T> desiredClass) {
if (desiredClass.isInstance(object)) {
return object;
return (T) object;
}
if (object instanceof IAdaptable) {
IAdaptable adaptable= (IAdaptable) object;

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java
View file

@ -45,14 +45,11 @@ public class PendingUpdateAdapter implements IWorkbenchAdapter, IAdaptable {
//No initial behavior
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> adapter) {
if (adapter == IWorkbenchAdapter.class)
return this;
return (T) this;
return null;
}

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java
View file

@ -74,14 +74,11 @@ public abstract class CElementGrouping extends WorkbenchAdapter implements IAdap
return super.getImageDescriptor(object);
}
/*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(Class)
*/
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class clas) {
@SuppressWarnings("unchecked")
public <T> T getAdapter(Class<T> clas) {
if (clas == IWorkbenchAdapter.class)
return this;
return (T) this;
return null;
}

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java
View file

@ -377,8 +377,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab {
}
@Override
@SuppressWarnings("rawtypes")
public Object getAdapter(Class adapter) {
public <T> T getAdapter(Class<T> adapter) {
return f.getAdapter(adapter);
}
public boolean isRoot() {

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java
View file

@ -204,7 +204,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
scanner = new CPreprocessorScanner(getTokenStoreFactory(), keywords);
}
if (scanner == null) {
keywords = (ICLanguageKeywords) GPPLanguage.getDefault().getAdapter(ICLanguageKeywords.class);
keywords = GPPLanguage.getDefault().getAdapter(ICLanguageKeywords.class);
scanner= new CPreprocessorScanner(getTokenStoreFactory(), keywords);
}
fPreprocessorScanner= scanner;