diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
index befcb5936be..c7734f7395a 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java
index b6e15a553cc..de04e50a72d 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ext/CElementHandle.java
@@ -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;
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java
index 2cdf226499a..1a9ac2621ba 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java
@@ -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;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java
index 847f664ecab..87daa0a4759 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/PreprocessorMacro.java
@@ -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;
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java
index ee573c3d9c7..747afcf1b53 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMASTAdapter.java
@@ -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);
 		}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java
index 18169181436..5443901ac6e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java
@@ -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;
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java
index 0f1958f41a8..621518c21e5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java
@@ -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;
 	}
 
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
index 28b024b7643..e34cebe666a 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java
index 228598fce21..a7f55008f43 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryObject.java
@@ -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);
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java
index 5d5cb968e29..5aa51174460 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryObject.java
@@ -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);
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java
index 31d627c7a62..431d8cd2f61 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java
index 0b883e130fe..bea02454e95 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfParser.java
@@ -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);
 	}
 }
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java
index 685161eb085..3a8a1bc11cb 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject.java
@@ -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);
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java
index 4eba12c12b7..7deedfd77ea 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryObject64.java
@@ -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);
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java
index c4ae5a97d9c..49859456d22 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java
index 8a8b0cff044..4745caa6b01 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java
index 3913eff1eb3..084cfbba26f 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java
index 2a39d1e177e..147d3508de2 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java
index ee355976529..81f9e35922a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java
@@ -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;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java
index b2d80cd3231..c46b045f116 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java
@@ -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());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
index 084b9cc5587..c9c11c36991 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
@@ -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;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePageParticipant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePageParticipant.java
index 80cdc119e30..13d57a41c09 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePageParticipant.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePageParticipant.java
@@ -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;
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java
index bb534dd6122..9a0805784c8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java
@@ -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;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
index 3be021bae4c..502930e32b1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
@@ -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);
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java
index 6b7aee0aaf9..7801040d1d6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java
@@ -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;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java
index 1abcb898a93..59ea3888bce 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java
@@ -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;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
index e2d7f681382..84734f68efc 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
@@ -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;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java
index 4e9bfd3aa23..d10da081ff3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java
@@ -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;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java
index aef58c84802..698daa096d3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameProcessorDelegate.java
@@ -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);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java
index 3978d7235a6..16c138ad10f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java
@@ -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));
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java
index 70c721300ea..a36ce34c3ff 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/Checks.java
@@ -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++) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java
index 49156b798a3..17bb02c851f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java
@@ -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;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java
index 27c09fe4c26..fc521232870 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/PendingUpdateAdapter.java
@@ -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;
     }
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java
index bac02d388c6..edb97d1fc1f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java
@@ -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;
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java
index ca17cbfdeee..f65a76d66ad 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java
@@ -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() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java
index 4db59d10ee7..f5ad8891917 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java
@@ -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;