Remove warnings caused by change to getAdaptable()

getAdaptable() in 4.5 M6 has changed to use generics, making casting its
result no longer necessary.

Change-Id: Idd943216a925576bb72c784b2c5a2a4b8e8b00d2
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>

88 files changed, 139 insertions, 139 deletions

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java
index a2972590882..67a7062f656 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CActionFilter.java
@@ -30,7 +30,7 @@ public class CActionFilter implements IActionFilter {
 		ICElement element = (ICElement) target;
 		IResource resource = element.getResource();
 		if (resource != null) {
-			IActionFilter filter = (IActionFilter) resource.getAdapter(IActionFilter.class);
+			IActionFilter filter = resource.getAdapter(IActionFilter.class);
 			if (filter != null) {
 				return filter.testAttribute(resource, name, value);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java
index 726b84d9bf2..9429701bd0b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java
@@ -198,7 +198,7 @@ public abstract class BlockCommentAction extends TextEditorAction {
 		else
 			return;
 		
-		IRewriteTarget target= (IRewriteTarget)editor.getAdapter(IRewriteTarget.class);
+		IRewriteTarget target= editor.getAdapter(IRewriteTarget.class);
 		if (target != null) {
 			target.beginCompoundChange();
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java
index 5694f23b76b..bcfe8f066e4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/DeleteResConfigsHandler.java
@@ -134,7 +134,7 @@ public class DeleteResConfigsHandler extends AbstractHandler {
 				if (editor != null) {
 					IEditorInput input = editor.getEditorInput();
 					if (input != null)
-						return (IFile) input.getAdapter(IFile.class);
+						return input.getAdapter(IFile.class);
 				}
 			}
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java
index e9a85785539..10c613116ff 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ExcludeFromBuildHandler.java
@@ -153,7 +153,7 @@ public class ExcludeFromBuildHandler extends AbstractHandler {
 				if (editor != null) {
 					IEditorInput input = editor.getEditorInput();
 					if (input != null)
-						return (IFile) input.getAdapter(IFile.class);
+						return input.getAdapter(IFile.class);
 				}
 			}
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java
index 437aabee30e..6cc8b0671c1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java
@@ -73,7 +73,7 @@ public class FindWordAction extends TextEditorAction {
 		if (document == null)
 			return;
 			
-		IResource resource = (IResource)(input).getAdapter(IResource.class);
+		IResource resource = (input).getAdapter(IResource.class);
 		if (resource == null || !(resource instanceof IFile))
 			return;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java
index 99078e87d47..352fb589223 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java
@@ -77,7 +77,7 @@ public class GotoNextBookmarkAction extends TextEditorAction {
 		if (input == null)
 			return;
 
-		IResource resource = (IResource)(input).getAdapter(IResource.class);
+		IResource resource = (input).getAdapter(IResource.class);
 		if (resource == null || !(resource instanceof IFile))
 			return;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java
index e407201dda5..63609906ab1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java
@@ -115,7 +115,7 @@ public class IndentAction extends TextEditorAction {
 			Runnable runnable= new Runnable() {
 				@Override
 				public void run() {
-					IRewriteTarget target= (IRewriteTarget) getTextEditor().getAdapter(IRewriteTarget.class);
+					IRewriteTarget target= getTextEditor().getAdapter(IRewriteTarget.class);
 					if (target != null)
 						target.beginCompoundChange();
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java
index ad4ce4eba39..d549d7b8394 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java
@@ -91,7 +91,7 @@ public class SelectionConverter {
 				if (e instanceof ICElement) {
 					converted.add(e);
 				} else if (e instanceof IAdaptable) {
-					ICElement c = (ICElement) ((IAdaptable) e).getAdapter(ICElement.class);
+					ICElement c = ((IAdaptable) e).getAdapter(ICElement.class);
 					if (c != null) {
 						converted.add(c);
 					} else if (keepNonCElements)
@@ -112,7 +112,7 @@ public class SelectionConverter {
 				if (e instanceof IResource) {
 					converted.add(e);
 				} else if (e instanceof IAdaptable) {
-					IResource r = (IResource) ((IAdaptable) e).getAdapter(IResource.class);
+					IResource r = ((IAdaptable) e).getAdapter(IResource.class);
 					if (r != null) {
 						converted.add(r);
 					}
@@ -128,7 +128,7 @@ public class SelectionConverter {
 			Object next = resources.next();
 			if (next instanceof IAdaptable) {
 				IAdaptable element = (IAdaptable) next;
-				IResource resource = (IResource) element.getAdapter(IResource.class);
+				IResource resource = element.getAdapter(IResource.class);
 
 				if (resource == null) {
 					return false;
@@ -160,7 +160,7 @@ public class SelectionConverter {
 		while (adaptables.hasNext()) {
 			Object next = adaptables.next();
 			if (next instanceof IAdaptable) {
-				IResource resource = (IResource) ((IAdaptable) next).getAdapter(IResource.class);
+				IResource resource = ((IAdaptable) next).getAdapter(IResource.class);
 				if (resource == null) {
 					return null;
 				} else if (resourceIsType(resource, resourceMask)) {
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 78cfac64230..084b9cc5587 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
@@ -468,7 +468,7 @@ public class BuildConsolePage extends Page
 			if (input instanceof IResource) {
 				resource = (IResource)input;
 			} else {
-				resource = (IResource)input.getAdapter(IResource.class);
+				resource = input.getAdapter(IResource.class);
 			}
 			if (resource != null) {
 				project = resource.getProject();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java
index 3d5715460bc..c0bb54fe53c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java
@@ -60,7 +60,7 @@ public class CHDropTargetListener implements DropTargetListener {
 					return (ICElement) element;
 				}
 				if (element instanceof IAdaptable) {
-					ICElement adapter= (ICElement) ((IAdaptable) element).getAdapter(ICElement.class);
+					ICElement adapter= ((IAdaptable) element).getAdapter(ICElement.class);
 					if (adapter != null) {
 						return adapter;
 					}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
index 88993160b5e..88ffa8c4caf 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
@@ -217,7 +217,7 @@ public class CHViewPart extends ViewPart {
         createActions();
         createContextMenu();
 
-		bindingService = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
+		bindingService = PlatformUI.getWorkbench().getService(IBindingService.class);
 		if (bindingService != null) {
 			bindingManagerListener = new IBindingManagerListener() {
 				@Override
@@ -237,7 +237,7 @@ public class CHViewPart extends ViewPart {
         
         initializeActionStates();
         
-    	IContextService ctxService = (IContextService) getSite().getService(IContextService.class);
+    	IContextService ctxService = getSite().getService(IContextService.class);
     	if (ctxService != null) {
     		fContextActivation= ctxService.activateContext(CUIPlugin.CVIEWS_SCOPE);
     	}
@@ -281,7 +281,7 @@ public class CHViewPart extends ViewPart {
 	@Override
 	public void dispose() {
 		if (fContextActivation != null) {
-			IContextService ctxService = (IContextService)getSite().getService(IContextService.class);
+			IContextService ctxService = getSite().getService(IContextService.class);
 			if (ctxService != null) {
 				ctxService.deactivateContext(fContextActivation);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java
index 1567d45c24f..f6861ba5825 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java
@@ -66,7 +66,7 @@ public class BuildGroup extends CViewActionGroup {
 	    public void run() {
 	    	// Ensure we correctly save files in all referenced projects before build
 	    	Set<IProject> prjs = new HashSet<IProject>();
-	    	for (IResource resource : (List<IResource>)getSelectedResources()) {
+	    	for (IResource resource : getSelectedResources()) {
 	    		IProject project = resource.getProject();
 	    		if (project != null) {
 	    			prjs.add(project);
@@ -183,7 +183,7 @@ public class BuildGroup extends CViewActionGroup {
 			if (next instanceof IProject) {
 				project = (IProject) next;
 			} else if (next instanceof IAdaptable) {
-				IResource res = (IResource)((IAdaptable)next).getAdapter(IResource.class);
+				IResource res = ((IAdaptable)next).getAdapter(IResource.class);
 				if (res instanceof IProject) {
 					project = (IProject) res;
 				}
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 433c21f4676..3be021bae4c 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
@@ -577,7 +577,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
 		}
 		memento = null;
 
-    	IContextService ctxService = (IContextService) getSite().getService(IContextService.class);
+    	IContextService ctxService = getSite().getService(IContextService.class);
     	if (ctxService != null) {
     		fContextActivation= ctxService.activateContext(CUIPlugin.CVIEWS_SCOPE);
     	}
@@ -607,7 +607,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
 	@Override
 	public void dispose() {
 		if (fContextActivation != null) {
-			IContextService ctxService = (IContextService)getSite().getService(IContextService.class);
+			IContextService ctxService = getSite().getService(IContextService.class);
 	    	if (ctxService != null) {
 	    		ctxService.deactivateContext(fContextActivation);
 	    	}
@@ -742,7 +742,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
 				return ((IResource) o).getFullPath().makeRelative().toString();
 			} else if (o instanceof ICElement) {
 				ICElement celement = (ICElement) o;
-				IResource res = (IResource) celement.getAdapter(IResource.class);
+				IResource res = celement.getAdapter(IResource.class);
 				if (res != null) {
 					return res.getFullPath().toString();
 				} else if (celement.getElementType() == ICElement.C_VCONTAINER) {
@@ -1085,7 +1085,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
 		}
 		IEditorInput input = (IEditorInput) context.getInput();
 		if (input != null) {
-			IResource res = (IResource) input.getAdapter(IResource.class);
+			IResource res = input.getAdapter(IResource.class);
 			if (res != null) {
 				selectReveal(new StructuredSelection(res));
 				return true;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java
index 74803f4a462..962fde48f72 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java
@@ -99,7 +99,7 @@ public class GotoActionGroup extends CViewActionGroup {
 			if (selection.size() == 1) {
 				Object object = selection.getFirstElement();
 				if (object instanceof IAdaptable) {
-					IResource resource = (IResource)((IAdaptable)object).getAdapter(IResource.class);
+					IResource resource = ((IAdaptable)object).getAdapter(IResource.class);
 					if (resource instanceof IProject) {
 						enable = ((IProject) resource).isOpen();
 					} else if (resource instanceof IFolder) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
index a445f98388c..aec2b071681 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
@@ -263,7 +263,7 @@ public class MainActionGroup extends CViewActionGroup {
 		Object obj = selection.getFirstElement();
 		if (obj instanceof IAdaptable) {
 			IAdaptable element = (IAdaptable) obj;
-			IResource resource = (IResource) element.getAdapter(IResource.class);
+			IResource resource = element.getAdapter(IResource.class);
 			if (resource instanceof IFile) {
 				addBookmarkAction.selectionChanged(selection);
 				menu.add(addBookmarkAction);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java
index 2f81a177300..7cc48596956 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java
@@ -152,7 +152,7 @@ public class OpenFileGroup extends CViewActionGroup {
 			} catch (Exception e) {
 			}
 		} else if (obj instanceof IAdaptable) {
-			IResource element = (IResource)((IAdaptable)obj).getAdapter(IResource.class);
+			IResource element = ((IAdaptable)obj).getAdapter(IResource.class);
 			if (element instanceof IFile) {
 				openFileAction.selectionChanged(selection);
 				openFileAction.run();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
index 2fee3f2ecc6..2ae147ca75a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java
@@ -85,7 +85,7 @@ public class OpenProjectGroup extends CViewActionGroup {
 			if (next instanceof IProject) {
 				project = (IProject) next;
 			} else if (next instanceof IAdaptable) {
-				IResource res = (IResource) ((IAdaptable) next).getAdapter(IResource.class);
+				IResource res = ((IAdaptable) next).getAdapter(IResource.class);
 				if (res instanceof IProject) {
 					project = (IProject)res;
 				}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java
index 26ddbab5c4c..7ab6bca4b6f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TextFieldNavigationHandler.java
@@ -364,8 +364,8 @@ public class TextFieldNavigationHandler {
 
 						fSubmissions= new ArrayList<Submission>();
 
-						ICommandService commandService= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
-						IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+						ICommandService commandService= PlatformUI.getWorkbench().getAdapter(ICommandService.class);
+						IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 						if (commandService == null || bindingService == null)
 							return fSubmissions;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java
index 2e1f1b3a957..55787e673dc 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java
@@ -406,7 +406,7 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider {
 					return CDTSharedImages.getImage(CDTSharedImages.IMG_OBJS_LIBRARY);
 				case -1 :
 					IResource res = ((CPElementGroup)element).getResource();
-					IWorkbenchAdapter adapter = (IWorkbenchAdapter)res.getAdapter(IWorkbenchAdapter.class);
+					IWorkbenchAdapter adapter = res.getAdapter(IWorkbenchAdapter.class);
 					ImageDescriptor imageDescriptor = adapter.getImageDescriptor(res);
 					if (!res.exists()) {
 						imageDescriptor = new CPListImageDescriptor(imageDescriptor, CPListImageDescriptor.WARNING, SMALL_SIZE);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java
index 0c5cf9243b6..937128a2710 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java
@@ -149,7 +149,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList
 	private IProject getProject() {
 		IAdaptable adaptable = getElement();
 		if (adaptable != null) {
-			ICElement elem = (ICElement)adaptable.getAdapter(ICElement.class);
+			ICElement elem = adaptable.getAdapter(ICElement.class);
 			if (elem instanceof ICProject) {
 				return ((ICProject)elem).getProject();
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java
index edfc05f8b18..148d9fc6a9d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java
@@ -167,7 +167,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus
 	private IProject getProject() {
 		IAdaptable adaptable = getElement();
 		if (adaptable != null) {
-			IResource resource = (IResource)adaptable.getAdapter(IResource.class);
+			IResource resource = adaptable.getAdapter(IResource.class);
 			return resource.getProject();
 		}
 		return null;
@@ -176,7 +176,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus
 	protected ICElement getCElement() {
 		IAdaptable adaptable = getElement();
 		if (adaptable != null) {
-			ICElement elem = (ICElement)adaptable.getAdapter(ICElement.class);
+			ICElement elem = adaptable.getAdapter(ICElement.class);
 			return elem;
 		}
 		return null;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java
index c166352c5e1..bf6ea51aff9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java
@@ -136,7 +136,7 @@ public class FileTransferDragAdapter implements TransferDragSourceListener {
 				if (object instanceof IResource) {
 					resource = (IResource) object;
 				} else if (object instanceof IAdaptable) {
-					resource = (IResource) ((IAdaptable) object).getAdapter(IResource.class);
+					resource = ((IAdaptable) object).getAdapter(IResource.class);
 				}
 
 				if (resource != null)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java
index ce129bfb5c2..d461e4d7753 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java
@@ -114,7 +114,7 @@ public class ResourceTransferDragAdapter implements TransferDragSourceListener {
 					resource = (IResource)element;
 				} else if (element instanceof IAdaptable) {
 					IAdaptable adaptable = (IAdaptable) element;
-					resource = (IResource) adaptable.getAdapter(IResource.class);
+					resource = adaptable.getAdapter(IResource.class);
 				}
 				if (resource != null) {
 					resources.add(resource);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java
index c8c9025187a..b7ba2d60861 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java
@@ -146,7 +146,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements
 				}
 				else if (o instanceof IAdaptable) {
 					IAdaptable a = (IAdaptable) o;
-					IResource r = (IResource) a.getAdapter(IResource.class);
+					IResource r = a.getAdapter(IResource.class);
 					if (r != null) {
 						selectedResources.add(r);
 					}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java
index 494bc39b58a..5293ade7e3e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java
@@ -237,7 +237,7 @@ public final class ASTProvider {
 	private void activeEditorChanged(IWorkbenchPart editor) {
 		ITranslationUnit tu = null;
 		if (editor != null) {
-			ITranslationUnitHolder provider = (ITranslationUnitHolder) editor.getAdapter(ITranslationUnitHolder.class);
+			ITranslationUnitHolder provider = editor.getAdapter(ITranslationUnitHolder.class);
 			if (provider != null)
 				tu = provider.getTranslationUnit();
 		}
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 e514bee2bb9..e2d7f681382 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
@@ -526,7 +526,7 @@ public abstract class AbstractCModelOutlinePage extends Page
 		fTreeViewer.setInput(fInput);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(control, ICHelpContextIds.COUTLINE_VIEW);
 		
-		IHandlerService handlerService= (IHandlerService) site.getService(IHandlerService.class);
+		IHandlerService handlerService= site.getService(IHandlerService.class);
 		handlerService.activateHandler(CollapseAllHandler.COMMAND_ID, new ActionHandler(fCollapseAllAction));
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
index 40eeb77362c..fd48c8ce20a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
@@ -776,7 +776,7 @@ public class CDocumentProvider extends TextFileDocumentProvider {
 			original = input.getTranslationUnit();
 		} else if (element instanceof IAdaptable) {
 			IAdaptable adaptable= (IAdaptable) element;
-			ILocationProvider locationProvider= (ILocationProvider) adaptable.getAdapter(ILocationProvider.class);
+			ILocationProvider locationProvider= adaptable.getAdapter(ILocationProvider.class);
 			if (locationProvider instanceof ILocationProviderExtension) {
 				URI uri= ((ILocationProviderExtension) locationProvider).getURI(element);
 				original= createTranslationUnit(uri);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java
index 90254838110..c7fc670694a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java
@@ -182,7 +182,7 @@ public class CElementHyperlinkDetector extends AbstractHyperlinkDetector {
 	}
 
 	private static boolean isLanguageKeyword(ILanguage lang, String word) {
-		ICLanguageKeywords keywords= (ICLanguageKeywords) lang.getAdapter(ICLanguageKeywords.class);
+		ICLanguageKeywords keywords= lang.getAdapter(ICLanguageKeywords.class);
 		if (keywords != null) {
 			for (String keyword : keywords.getKeywords()) {
 				if (keyword.equals(word))
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java
index 28eadddbab5..05bcfdd62b5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java
@@ -120,10 +120,10 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor implements IReso
 		@Override
 		public IStorage getStorage() throws CoreException {
 			if (fStorage == null) {
-				IBinaryParser.IBinaryObject object = (IBinaryParser.IBinaryObject) fBinary
+				IBinaryParser.IBinaryObject object = fBinary
 						.getAdapter(IBinaryParser.IBinaryObject.class);
 				if (object != null) {
-					IGnuToolFactory factory = (IGnuToolFactory) object.getBinaryParser().getAdapter(
+					IGnuToolFactory factory = object.getBinaryParser().getAdapter(
 							IGnuToolFactory.class);
 					if (factory != null) {
 						Objdump objdump = factory.getObjdump(object.getPath());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java
index 8b03ce4725b..fbd83ab888f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java
@@ -83,7 +83,7 @@ public class ExternalSearchDocumentProvider extends TextFileDocumentProvider {
 		}
 		if (element instanceof IAdaptable) {
 			IAdaptable adaptable= (IAdaptable) element;
-			ILocationProvider provider = (ILocationProvider) adaptable.getAdapter(ILocationProvider.class);
+			ILocationProvider provider = adaptable.getAdapter(ILocationProvider.class);
 			if (provider != null) {
 				IPath location = provider.getPath(element);
 				if (location != null) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java
index 278f342108c..c8ce0df2f4c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java
@@ -98,7 +98,7 @@ final class SpecificContentAssistAction extends Action implements IUpdate {
 	private boolean computeEnablement(ITextEditor editor) {
 		if (editor == null)
 			return false;
-		ITextOperationTarget target= (ITextOperationTarget) editor.getAdapter(ITextOperationTarget.class);
+		ITextOperationTarget target= editor.getAdapter(ITextOperationTarget.class);
 		boolean hasContentAssist= target != null && target.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
 		if (!hasContentAssist)
 			return false;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java
index 0bbd56cbeeb..1e586201867 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistExecutor.java
@@ -63,7 +63,7 @@ public final class SpecificContentAssistExecutor {
 		}
 		
 		try {
-			ITextOperationTarget target= (ITextOperationTarget) editor.getAdapter(ITextOperationTarget.class);
+			ITextOperationTarget target= editor.getAdapter(ITextOperationTarget.class);
 			if (target != null && target.canDoOperation(ISourceViewer.CONTENTASSIST_PROPOSALS))
 				target.doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
 		} finally {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
index f90ebb3a64c..47110d3ccc4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java
@@ -313,7 +313,7 @@ public final class ToggleCommentAction extends TextEditorAction {
 
 		ITextEditor editor= getTextEditor();
 		if (fOperationTarget == null && editor != null)
-			fOperationTarget= (ITextOperationTarget) editor.getAdapter(ITextOperationTarget.class);
+			fOperationTarget= editor.getAdapter(ITextOperationTarget.class);
 
 		boolean isEnabled= (fOperationTarget != null && fOperationTarget.canDoOperation(ITextOperationTarget.PREFIX) &&
 				fOperationTarget.canDoOperation(ITextOperationTarget.STRIP_PREFIX));
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java
index 7caba73f3dc..e4fb45fdebe 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java
@@ -58,11 +58,11 @@ public class NamePatternFilter extends ViewerFilter {
 			matchName= ((ICElement) element).getElementName();
 		} else if (element instanceof IAdaptable) {
 			IAdaptable adaptable= (IAdaptable) element;
-			ICElement javaElement= (ICElement)adaptable.getAdapter(ICElement.class);
+			ICElement javaElement= adaptable.getAdapter(ICElement.class);
 			if (javaElement != null)
 				matchName= javaElement.getElementName();
 			else {
-				IResource resource= (IResource)adaptable.getAdapter(IResource.class);
+				IResource resource= adaptable.getAdapter(IResource.class);
 				if (resource != null)
 					matchName= resource.getName();
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java
index d3fc56d6fe2..f41cc466c83 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBConversions.java
@@ -82,16 +82,16 @@ public class IBConversions {
         }
         if (object instanceof IAdaptable) {
             IAdaptable adaptable = (IAdaptable) object;
-            ITranslationUnit result= (ITranslationUnit) adaptable.getAdapter(ITranslationUnit.class);
+            ITranslationUnit result= adaptable.getAdapter(ITranslationUnit.class);
             if (result != null) {
                 return result;
             }
-            IFile file= (IFile) adaptable.getAdapter(IFile.class);
+            IFile file= adaptable.getAdapter(IFile.class);
             if (file != null) {
                 return CoreModelUtil.findTranslationUnit(file);
             }
 
-            ILocationProvider locProvider= (ILocationProvider) adaptable.getAdapter(ILocationProvider.class);
+            ILocationProvider locProvider= adaptable.getAdapter(ILocationProvider.class);
             if (locProvider != null) {
             	IPath path= locProvider.getPath(locProvider);
             	if (path != null) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
index 1ac63c39584..03f993550e0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
@@ -291,7 +291,7 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget
         createActions();
         createContextMenu();
 
-		bindingService = (IBindingService) PlatformUI.getWorkbench().getService(IBindingService.class);
+		bindingService = PlatformUI.getWorkbench().getService(IBindingService.class);
 		if (bindingService != null) {
 			bindingManagerListener = new IBindingManagerListener() {
 				@Override
@@ -314,7 +314,7 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget
         restoreInput();
         fMemento= null;
 
-    	IContextService ctxService = (IContextService) getSite().getService(IContextService.class);
+    	IContextService ctxService = getSite().getService(IContextService.class);
     	if (ctxService != null) {
     		fContextActivation= ctxService.activateContext(CUIPlugin.CVIEWS_SCOPE);
     	}
@@ -326,7 +326,7 @@ public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget
 	public void dispose() {
 		putDialogSettings();
 		if (fContextActivation != null) {
-			IContextService ctxService = (IContextService)getSite().getService(IContextService.class);
+			IContextService ctxService = getSite().getService(IContextService.class);
 			if (ctxService != null) {
 				ctxService.deactivateContext(fContextActivation);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java
index 9bc26f32c5f..7517051fd8a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java
@@ -350,7 +350,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage {
 	}
 	
 	private IFile getFile() {
-		return (IFile) getElement().getAdapter(IFile.class);
+		return getElement().getAdapter(IFile.class);
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java
index 47923197afb..b801e835b45 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java
@@ -190,6 +190,6 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage {
 	}
 
 	private IProject getProject() {
-		return (IProject) getElement().getAdapter(IProject.class);
+		return getElement().getAdapter(IProject.class);
 	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java
index 316f9dd94b6..a93f8d86c7c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java
@@ -115,7 +115,7 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget {
 		addButton.addListener(SWT.Selection, new Listener() {
 			@Override
 			public void handleEvent(Event event) {
-				IProject project = (IProject) getElement().getAdapter(IProject.class);
+				IProject project = getElement().getAdapter(IProject.class);
 				ICProjectDescription description = CoreModel.getDefault().getProjectDescription(project, false);
 				ICConfigurationDescription[] configurations = description.getConfigurations();
 				ProjectContentTypeMappingDialog dialog = new ProjectContentTypeMappingDialog(fContents.getShell(), configurations);
@@ -213,7 +213,7 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget {
 
 		IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
 
-		IProject project = (IProject) getElement().getAdapter(IProject.class);
+		IProject project = getElement().getAdapter(IProject.class);
 		ICProjectDescription description = CoreModel.getDefault().getProjectDescription(project, false);
 
 		while (mappings.hasNext()) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java
index 3121c21f16d..4094fa4e24c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java
@@ -96,7 +96,7 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup {
 			if (next instanceof IProject) {
 				project= (IProject) next;
 			} else if (next instanceof IAdaptable) {
-				IResource res= (IResource)((IAdaptable)next).getAdapter(IResource.class);
+				IResource res= ((IAdaptable)next).getAdapter(IResource.class);
 				if (res instanceof IProject) {
 					project= (IProject) res;
 				}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
index 46041a8c974..c1373564fe2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
@@ -280,7 +280,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
 			if (element instanceof IResource) {
 				resource= (IResource)element;
 			} else if (element instanceof IAdaptable) {
-				resource= (IResource)((IAdaptable)element).getAdapter(IResource.class);
+				resource= ((IAdaptable)element).getAdapter(IResource.class);
 			}
 			if (resource != null) {
 				int i= elementList.indexOf(resource);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java
index 2826ff0c62c..505ff09ed98 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java
@@ -520,7 +520,7 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant {
 				selectedResources.add(o);
 			} else if (o instanceof IAdaptable) {
 				IAdaptable a = (IAdaptable) o;
-				IResource r = (IResource) a.getAdapter(IResource.class);
+				IResource r = a.getAdapter(IResource.class);
 				if (r != null) {
 					selectedResources.add(r);
 				}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java
index 83b877d3e67..c96da4319ee 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorLabelProvider.java
@@ -80,7 +80,7 @@ public class CNavigatorLabelProvider extends CViewLabelProvider implements IComm
 			return ((IResource) element).getFullPath().makeRelative().toString();
 		} else if (element instanceof ICElement) {
 			ICElement celement = (ICElement) element;
-			IResource res = (IResource) celement.getAdapter(IResource.class);
+			IResource res = celement.getAdapter(IResource.class);
 			if (res != null) {
 				return res.getFullPath().toString();
 			} else if (celement.getElementType() == ICElement.C_VCONTAINER) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java
index 27da16e8428..28d135a44d6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionProvider.java
@@ -50,7 +50,7 @@ public class CNavigatorRefactorActionProvider extends CommonActionProvider {
 		if (workbenchSite != null) {
 			final IWorkbenchPartSite partSite= workbenchSite.getSite();
 			resourceRefactorGroup= new CNavigatorRefactorActionGroup(partSite, (Tree)actionSite.getStructuredViewer().getControl());
-			IUndoContext workspaceContext= (IUndoContext) ResourcesPlugin.getWorkspace().getAdapter(IUndoContext.class);
+			IUndoContext workspaceContext= ResourcesPlugin.getWorkspace().getAdapter(IUndoContext.class);
 			undoRedoGroup = new UndoRedoActionGroup(partSite, workspaceContext, true);
 			cElementRefactorGroup= new CRefactoringActionGroup(workbenchSite.getPart());
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java
index 42539fb9db0..395de63a2de 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java
@@ -156,7 +156,7 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont
 		if (elem instanceof IProject) {
 			project= (IProject) elem;
 		} else if (elem != null) {
-			project= (IProject) elem.getAdapter(IProject.class);
+			project= elem.getAdapter(IProject.class);
 		}
 		return project;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java
index a1f39654bed..181a574a825 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java
@@ -209,7 +209,7 @@ public class CFileTypesPropertyPage extends PropertyPage {
 		if (element instanceof IProject) {
 			project = (IProject) element;
 		} else if (element instanceof IAdaptable) {
-			project= (IProject) ((IAdaptable)element).getAdapter(IProject.class);
+			project= ((IAdaptable)element).getAdapter(IProject.class);
 		}
 		return project;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
index bfdbdbf41f2..f8e65595d6f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java
@@ -266,7 +266,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 		
 		ModelElement(CompletionProposalCategory category, PreferenceModel model) {
 			fCategory= category;
-			ICommandService commandSvc= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
+			ICommandService commandSvc= PlatformUI.getWorkbench().getAdapter(ICommandService.class);
 			fCommand= commandSvc.getCommand("org.eclipse.cdt.ui.specific_content_assist.command"); //$NON-NLS-1$
 			IParameter type;
 			try {
@@ -406,7 +406,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 	}
 
 	private void createDefaultLabel(Composite composite, int h_span) {
-	    final ICommandService commandSvc= (ICommandService) PlatformUI.getWorkbench().getAdapter(ICommandService.class);
+	    final ICommandService commandSvc= PlatformUI.getWorkbench().getAdapter(ICommandService.class);
 		final Command command= commandSvc.getCommand(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
 		ParameterizedCommand pCmd= new ParameterizedCommand(command, null);
 		String key= getKeyboardShortcut(pCmd);
@@ -727,7 +727,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 	private static BindingManager fgLocalBindingManager;
 	static {
 		fgLocalBindingManager= new BindingManager(new ContextManager(), new CommandManager());
-		final IBindingService bindingService= (IBindingService)PlatformUI.getWorkbench().getService(IBindingService.class);
+		final IBindingService bindingService= PlatformUI.getWorkbench().getService(IBindingService.class);
 		final Scheme[] definedSchemes= bindingService.getDefinedSchemes();
 		if (definedSchemes != null) {
 			try {
@@ -745,7 +745,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo
 	}
 
 	private static String getKeyboardShortcut(ParameterizedCommand command) {
-		IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+		IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 		fgLocalBindingManager.setBindings(bindingService.getBindings());
 		try {
 			Scheme activeScheme= bindingService.getActiveScheme();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java
index 92f354f7b51..c59bec357a9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java
@@ -479,7 +479,7 @@ public class EditTemplateDialog extends StatusDialog {
 
 	private void initializeActions() {
 		final ArrayList<IHandlerActivation> handlerActivations= new ArrayList<IHandlerActivation>(3);
-		final IHandlerService handlerService= (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
+		final IHandlerService handlerService= PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
 		getShell().addDisposeListener(new DisposeListener() {
 			@Override
 			public void widgetDisposed(DisposeEvent e) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
index dc5f0e7c679..42905ebcf08 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
@@ -820,11 +820,11 @@ public class IncludeOrganizer {
 			IIndexName[] indexNames;
 			if (binding instanceof IMacroBinding) {
 				indexNames = IIndexName.EMPTY_ARRAY;
-	    		ILocationResolver resolver = (ILocationResolver) ast.getAdapter(ILocationResolver.class);
+	    		ILocationResolver resolver = ast.getAdapter(ILocationResolver.class);
 	    		IASTName[] declarations = resolver.getDeclarations((IMacroBinding) binding);
 	    		for (IASTName name : declarations) {
 	    			if (name instanceof IAdaptable) {
-	    				IIndexName indexName = (IIndexName) ((IAdaptable) name).getAdapter(IIndexName.class);
+	    				IIndexName indexName = ((IAdaptable) name).getAdapter(IIndexName.class);
 	    				if (indexName != null) {
 		    				indexNames = Arrays.copyOf(indexNames, indexNames.length + 1);
 		    				indexNames[indexNames.length - 1] = indexName;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java
index 795e3ad6e17..14ca88c7e2e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameInformationPopup.java
@@ -823,7 +823,7 @@ public class RenameInformationPopup implements IWidgetTokenKeeper, IWidgetTokenK
 	 * @return the keybinding for Refactor &gt; Rename
 	 */
 	private static String getOpenDialogBinding() {
-		IBindingService bindingService= (IBindingService)PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+		IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 		if (bindingService == null)
 			return ""; //$NON-NLS-1$
 		String binding= bindingService.getBestActiveBindingFormattedFor(ICEditorActionDefinitionIds.RENAME_ELEMENT);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java
index ff05f281ea7..ed39d00e953 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/TextSearchWrapper.java
@@ -69,7 +69,7 @@ public class TextSearchWrapper {
             ArrayList<IResource> resources = new ArrayList<IResource>();
             for (int i = 0; i < adaptables.length; i++) {
                 IAdaptable adaptable = adaptables[i];
-                IResource resource= (IResource) adaptable.getAdapter(IResource.class);
+                IResource resource= adaptable.getAdapter(IResource.class);
                 if (resource != null) {
                     resources.add(resource);
                 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java
index 88b9d259579..f5234f0fd72 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResult.java
@@ -89,7 +89,7 @@ public class CSearchResult extends AbstractTextSearchResult implements IEditorMa
 		} else if (input instanceof IPathEditorInput) {
 			path= ((IPathEditorInput) input).getPath();
 		} else {
-			ILocationProvider provider= (ILocationProvider) input.getAdapter(ILocationProvider.class);
+			ILocationProvider provider= input.getAdapter(ILocationProvider.class);
 			if (provider != null) {
 				path= provider.getPath(input);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java
index dfb22b4639a..b51384985d2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java
@@ -74,7 +74,7 @@ public abstract class FindInWorkingSetAction extends FindAction {
 		for (int i = 0; i < fWorkingSets.length; ++i) {
 			IAdaptable[] elements = fWorkingSets[i].getElements();
 			for (int j = 0; j < elements.length; ++j) {
-				ICElement element = (ICElement)elements[j].getAdapter(ICElement.class);
+				ICElement element = elements[j].getAdapter(ICElement.class);
 				if (element != null)
 					scope.add(element);
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java
index 18638e38e29..3467fbff019 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java
@@ -157,13 +157,13 @@ public abstract class AbstractInformationControl extends PopupDialog implements
 		super(parent, shellStyle, true, true, true, true, true, null, null);
 		if (invokingCommandId != null) {
 			IWorkbench workbench = PlatformUI.getWorkbench();
-			ICommandService commandSupport = (ICommandService)workbench.getAdapter(ICommandService.class);
+			ICommandService commandSupport = workbench.getAdapter(ICommandService.class);
 			if (commandSupport != null)	{
 				fInvokingCommand = commandSupport.getCommand(invokingCommandId);
 				if (fInvokingCommand != null && !fInvokingCommand.isDefined())
 					fInvokingCommand= null;
 				else {
-					IBindingService bindingService = (IBindingService) workbench.getService(IBindingService.class);
+					IBindingService bindingService = workbench.getService(IBindingService.class);
 					fInvokingTriggerSequence = bindingService.getBestActiveBindingFor(invokingCommandId);
 				}
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java
index 2ee273679d5..8f68c24250a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java
@@ -82,7 +82,7 @@ public class CMacroExpansionControl extends AbstractSourceViewerInformationContr
 			return;
 		}
 		if (fInput.fExplorer.getExpansionStepCount() > 1) {
-			IBindingService bindingService= (IBindingService)PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+			IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 			if (bindingService != null) {
 				String keySequence= bindingService.getBestActiveBindingFormattedFor(ITextEditorActionDefinitionIds.SHOW_INFORMATION);
 				if (keySequence != null) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java
index 888bd2050a5..28f05e3687d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java
@@ -314,8 +314,8 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo
         };
 
         IWorkbench workbench= PlatformUI.getWorkbench();
-        fHandlerService= (IHandlerService) workbench.getService(IHandlerService.class);
-        fContextService= (IContextService) workbench.getService(IContextService.class);
+        fHandlerService= workbench.getService(IHandlerService.class);
+        fContextService= workbench.getService(IContextService.class);
         fContextActivation= fContextService.activateContext(CONTEXT_ID_MACRO_EXPANSION_HOVER);
         fHandlerActivations= new ArrayList<IHandlerActivation>();
         fHandlerActivations.add(fHandlerService.activateHandler(COMMAND_ID_EXPANSION_BACK, backwardHandler));
@@ -399,7 +399,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo
 	 */
 	private String getInfoText() {
 		IWorkbench workbench= PlatformUI.getWorkbench();
-		IBindingService bindingService= (IBindingService) workbench.getService(IBindingService.class);
+		IBindingService bindingService= workbench.getService(IBindingService.class);
 		String formattedBindingBack= bindingService.getBestActiveBindingFormattedFor(COMMAND_ID_EXPANSION_BACK);
 		String formattedBindingForward= bindingService.getBestActiveBindingFormattedFor(COMMAND_ID_EXPANSION_FORWARD);
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java
index 96631839a53..aae89b6224a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java
@@ -555,7 +555,7 @@ public class ContentAssistProcessor implements IContentAssistProcessor {
 	}
 
 	private KeySequence getIterationBinding() {
-	    final IBindingService bindingSvc= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+	    final IBindingService bindingSvc= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 		TriggerSequence binding= bindingSvc.getBestActiveBindingFor(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
 		if (binding instanceof KeySequence)
 			return (KeySequence) binding;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java
index 6205757e37c..667d97969c1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java
@@ -67,7 +67,7 @@ public class KeywordCompletionProposalComputer extends ParsingBasedProposalCompu
         if(tu != null) {
         	ILanguage language = tu.getLanguage();
         	if(language != null)
-        		languageKeywords = (ICLanguageKeywords) language.getAdapter(ICLanguageKeywords.class);
+        		languageKeywords = language.getAdapter(ICLanguageKeywords.class);
         }
         	
         if(languageKeywords == null)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java
index 172ce109fa5..f3f0daec9f8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java
@@ -78,7 +78,7 @@ public class CSelectAnnotationRulerAction extends SelectMarkerRulerAction {
 		}
     	
         if (fHasCorrection) {
-            ITextOperationTarget operation= (ITextOperationTarget) fTextEditor.getAdapter(ITextOperationTarget.class);
+            ITextOperationTarget operation= fTextEditor.getAdapter(ITextOperationTarget.class);
             final int opCode= ISourceViewer.QUICK_ASSIST;
             if (operation != null && operation.canDoOperation(opCode)) {
                 fTextEditor.selectAndReveal(fPosition.getOffset(), fPosition.getLength());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java
index d67a14ca108..4563ba86666 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java
@@ -182,7 +182,7 @@ public class CorrectionCommandHandler extends AbstractHandler {
 	
 	public static String getShortCutString(String proposalId) {
 		if (proposalId != null) {
-			IBindingService bindingService= (IBindingService) PlatformUI.getWorkbench().getAdapter(IBindingService.class);
+			IBindingService bindingService= PlatformUI.getWorkbench().getAdapter(IBindingService.class);
 			if (bindingService != null) {
 				TriggerSequence[] activeBindingsFor= bindingService.getActiveBindingsFor(proposalId);
 				if (activeBindingsFor.length > 0) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java
index b454b430c19..9df36cef499 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandInstaller.java
@@ -46,8 +46,8 @@ public class CorrectionCommandInstaller {
 	
 	public void registerCommands(CEditor editor) {
 		IWorkbench workbench= PlatformUI.getWorkbench();
-		ICommandService commandService= (ICommandService) workbench.getAdapter(ICommandService.class);
-		IHandlerService handlerService= (IHandlerService) workbench.getAdapter(IHandlerService.class);
+		ICommandService commandService= workbench.getAdapter(ICommandService.class);
+		IHandlerService handlerService= workbench.getAdapter(IHandlerService.class);
 		if (commandService == null || handlerService == null) {
 			return;
 		}
@@ -71,7 +71,7 @@ public class CorrectionCommandInstaller {
 	}
 	
 	public void deregisterCommands() {
-		IHandlerService handlerService= (IHandlerService) PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
+		IHandlerService handlerService= PlatformUI.getWorkbench().getAdapter(IHandlerService.class);
 		if (handlerService != null && fCorrectionHandlerActivations != null) {
 			handlerService.deactivateHandlers(fCorrectionHandlerActivations);
 			fCorrectionHandlerActivations= null;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java
index 85ecbb6cae8..7fdb505216f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/proposals/ChangeCorrectionProposal.java
@@ -113,7 +113,7 @@ public class ChangeCorrectionProposal implements ICCompletionProposal, ICommandA
 					LinkedModeModel.closeAllModels(document);
 				}
 				if (activeEditor != null) {
-					rewriteTarget= (IRewriteTarget) activeEditor.getAdapter(IRewriteTarget.class);
+					rewriteTarget= activeEditor.getAdapter(IRewriteTarget.class);
 					if (rewriteTarget != null) {
 						rewriteTarget.beginCompoundChange();
 					}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
index 20c7adb0de4..33ace5803f5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
@@ -1783,7 +1783,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
 	}
 	
 	private ProjectionAnnotationModel getModel() {
-		return (ProjectionAnnotationModel) fEditor.getAdapter(ProjectionAnnotationModel.class);
+		return fEditor.getAdapter(ProjectionAnnotationModel.class);
 	}
 
 	private IDocument getDocument() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java
index 62f5027f6dd..e3f631d4f94 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java
@@ -63,7 +63,7 @@ public class THDropTargetListener implements DropTargetListener {
 					return (ICElement) element;
 				}
 				if (element instanceof IAdaptable) {
-					ICElement adapter= (ICElement) ((IAdaptable) element).getAdapter(ICElement.class);
+					ICElement adapter= ((IAdaptable) element).getAdapter(ICElement.class);
 					if (adapter != null) {
 						return adapter;
 					}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
index d2e3ad19811..6cbf681c730 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
@@ -239,7 +239,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
         setMessage(Messages.THViewPart_instruction);
         initializeActionStates();
         
-    	IContextService ctxService = (IContextService) getSite().getService(IContextService.class);
+    	IContextService ctxService = getSite().getService(IContextService.class);
     	if (ctxService != null) {
     		fContextActivation= ctxService.activateContext(CUIPlugin.CVIEWS_SCOPE);
     	}
@@ -250,7 +250,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
 	@Override
 	public void dispose() {
 		if (fContextActivation != null) {
-			IContextService ctxService = (IContextService)getSite().getService(IContextService.class);
+			IContextService ctxService = getSite().getService(IContextService.class);
 	    	if (ctxService != null) {
 	    		ctxService.deactivateContext(fContextActivation);
 	    	}
@@ -998,7 +998,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
 					return (ICElement) cand;
 				}
 				if (cand instanceof IAdaptable) {
-					ICElement elem= (ICElement) ((IAdaptable) cand).getAdapter(ICElement.class);
+					ICElement elem= ((IAdaptable) cand).getAdapter(ICElement.class);
 					if (elem != null) {
 						return elem;
 					}
@@ -1133,7 +1133,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
 
 	@Override
 	public IWorkbenchSiteProgressService getProgressService() {
-		return (IWorkbenchSiteProgressService) getSite().getAdapter(IWorkbenchSiteProgressService.class);	
+		return getSite().getAdapter(IWorkbenchSiteProgressService.class);	
 	}
 
 	private static class CopyTypeHierarchyAction extends CopyTreeAction {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java
index 1fb3c0f7051..b5e29e92639 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java
@@ -120,7 +120,7 @@ public abstract class AbstractResourceActionHandler extends AbstractHandler {
     if (activeWindow == null) {
       return null;
     }
-    IHandlerService service = (IHandlerService) activeWindow.getService(IHandlerService.class);
+    IHandlerService service = activeWindow.getService(IHandlerService.class);
     return service.getCurrentState();
   }
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java
index 01213d138a2..c80954f16be 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java
@@ -548,7 +548,7 @@ public class EditorUtility {
 		if (editorInput == null) {
 			return null;
 		}
-		return (ICElement) editorInput.getAdapter(ICElement.class);
+		return editorInput.getAdapter(ICElement.class);
 	}
 
 	/**
@@ -857,7 +857,7 @@ public class EditorUtility {
 		 * If <code>saveUnknownEditors</code> is <code>true</code>, save all editors
 		 * whose implementation is probably not based on file buffers.
 		 */
-		IResource resource= (IResource) input.getAdapter(IResource.class);
+		IResource resource= input.getAdapter(IResource.class);
 		if (resource == null)
 			return saveUnknownEditors;
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java
index a16ea485bc0..3a477273f40 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java
@@ -331,7 +331,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer {
     private void addAllParents(List<Object> list, Object element) {
     	if (element instanceof IAdaptable) {
     		IAdaptable adaptable = (IAdaptable) element;
-    		IWorkbenchAdapter adapter = (IWorkbenchAdapter) adaptable.getAdapter(IWorkbenchAdapter.class);
+    		IWorkbenchAdapter adapter = adaptable.getAdapter(IWorkbenchAdapter.class);
     		if (adapter != null) {
     			Object parent = adapter.getParent(element);
     			if (parent != null) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java
index 393c3ac2197..c8a98836409 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CDTContextActivator.java
@@ -133,7 +133,7 @@ public class CDTContextActivator implements IWindowListener, IPartListener2 {
 		if (page instanceof CContentOutlinePage) {
 			if (!fActivationPerOutline.containsKey(outline)){
 				// cdt outline activated for the first time
-				IContextService ctxtService = (IContextService)outline.getViewSite().getService(IContextService.class);
+				IContextService ctxtService = outline.getViewSite().getService(IContextService.class);
 				IContextActivation activateContext = ctxtService.activateContext(CUIPlugin.CVIEWS_SCOPE);
 				fActivationPerOutline.put(outline,activateContext);
 			}
@@ -142,7 +142,7 @@ public class CDTContextActivator implements IWindowListener, IPartListener2 {
 			IContextActivation activation = fActivationPerOutline.remove(outline); 
 			if (activation != null) {
 				// other outline page brought to front
-				IContextService ctxtService = (IContextService)outline.getViewSite().getService(IContextService.class);
+				IContextService ctxtService = outline.getViewSite().getService(IContextService.class);
 				ctxtService.deactivateContext(activation);
 			}
 		}
@@ -155,7 +155,7 @@ public class CDTContextActivator implements IWindowListener, IPartListener2 {
 
 		public SelectionListener(IWorkbenchPartSite site) {
 			fSite= site;
-			fCtxService= (IContextService)fSite.getService(IContextService.class);
+			fCtxService= fSite.getService(IContextService.class);
 			ISelectionProvider sp= site.getSelectionProvider();
 			
 			if (sp != null && fCtxService != null) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
index fef2ccffa29..5aa0ae3d6e3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementImageProvider.java
@@ -310,7 +310,7 @@ public class CElementImageProvider {
 	 * Returns <code>null</code> if no image could be found.
 	 */	
 	public ImageDescriptor getWorkbenchImageDescriptor(IAdaptable adaptable, int flags) {
-		IWorkbenchAdapter wbAdapter= (IWorkbenchAdapter) adaptable.getAdapter(IWorkbenchAdapter.class);
+		IWorkbenchAdapter wbAdapter= adaptable.getAdapter(IWorkbenchAdapter.class);
 		if (wbAdapter == null) {
 			return null;
 		}
@@ -331,7 +331,7 @@ public class CElementImageProvider {
 	public ImageDescriptor getBaseImageDescriptor(ICElement celement, int renderFlags) {
 		// Allow contributed languages to provide icons for their extensions to the ICElement hierarchy
 		if (celement instanceof IContributedCElement)
-		    return (ImageDescriptor)((IContributedCElement)celement).getAdapter(ImageDescriptor.class);
+		    return ((IContributedCElement)celement).getAdapter(ImageDescriptor.class);
 		
 		int type = celement.getElementType();
 		switch (type) {
@@ -389,7 +389,7 @@ public class CElementImageProvider {
 				ICProject cp= (ICProject)celement;
 				if (cp.getProject().isOpen()) {
 					IProject project= cp.getProject();
-					IWorkbenchAdapter adapter= (IWorkbenchAdapter)project.getAdapter(IWorkbenchAdapter.class);
+					IWorkbenchAdapter adapter= project.getAdapter(IWorkbenchAdapter.class);
 					if (adapter != null) {
 						ImageDescriptor result= adapter.getImageDescriptor(project);
 						if (result != null)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java
index 9ba924447e8..868b2cdd2ae 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CElementLabels.java
@@ -259,7 +259,7 @@ public class CElementLabels {
 			return BasicElementLabels.getResourceName(((IStorage) obj).getName());
 
 		} else if (obj instanceof IAdaptable) {
-			IWorkbenchAdapter wbadapter= (IWorkbenchAdapter) ((IAdaptable)obj).getAdapter(IWorkbenchAdapter.class);
+			IWorkbenchAdapter wbadapter= ((IAdaptable)obj).getAdapter(IWorkbenchAdapter.class);
 			if (wbadapter != null) {
 				return Strings.markLTR(wbadapter.getLabel(obj));
 			}
@@ -288,7 +288,7 @@ public class CElementLabels {
 			return getStyledStorageLabel((IStorage) obj);
 
 		} else if (obj instanceof IAdaptable) {
-			IWorkbenchAdapter wbadapter= (IWorkbenchAdapter) ((IAdaptable)obj).getAdapter(IWorkbenchAdapter.class);
+			IWorkbenchAdapter wbadapter= ((IAdaptable)obj).getAdapter(IWorkbenchAdapter.class);
 			if (wbadapter != null) {
 				return Strings.markLTR(new StyledString(wbadapter.getLabel(obj)));
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java
index 955ce993153..a08fde1ca2d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/WorkingSetFilter.java
@@ -82,7 +82,7 @@ public class WorkingSetFilter {
             fResourceFilter = new HashMap<IPath, Object>();
             for (int i = 0; i < input.length; i++) {
                 IAdaptable adaptable = input[i];
-                IResource res = (IResource) adaptable.getAdapter(IResource.class);
+                IResource res = adaptable.getAdapter(IResource.class);
                 if (res != null) {
                     fResourceFilter.put(res.getFullPath(), ACCEPT);
                 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
index 0c979f1f1c5..7fbd3c2465e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
@@ -179,12 +179,12 @@ public class NewClassWizardUtil {
             if (selectedElement instanceof IAdaptable) {
                 IAdaptable adaptable = (IAdaptable) selectedElement;            
                 
-                celem = (ICElement) adaptable.getAdapter(ICElement.class);
+                celem = adaptable.getAdapter(ICElement.class);
                 if (celem == null) {
-                    IResource resource = (IResource) adaptable.getAdapter(IResource.class);
+                    IResource resource = adaptable.getAdapter(IResource.class);
                     if (resource != null && resource.getType() != IResource.ROOT) {
                         while (celem == null && resource.getType() != IResource.PROJECT) {
-                            celem = (ICElement) resource.getAdapter(ICElement.class);
+                            celem = resource.getAdapter(ICElement.class);
                             resource = resource.getParent();
                         }
                         if (celem == null) {
@@ -218,7 +218,7 @@ public class NewClassWizardUtil {
         if (celem == null && part instanceof CEditor) {
             IEditorInput input = ((IEditorPart)part).getEditorInput();
             if (input != null) {
-                final IResource res = (IResource) input.getAdapter(IResource.class);
+                final IResource res = input.getAdapter(IResource.class);
                 if (res != null && res instanceof IFile) {
                     celem = CoreModel.getDefault().create((IFile)res);
                 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java
index 6ff77b5bd1a..507e8f90708 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java
@@ -314,12 +314,12 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag
     		if (selectedElement instanceof IAdaptable) {
     			IAdaptable adaptable = (IAdaptable) selectedElement;
 
-    			celem = (ICElement) adaptable.getAdapter(ICElement.class);
+    			celem = adaptable.getAdapter(ICElement.class);
     			if (celem == null) {
-    				IResource resource = (IResource) adaptable.getAdapter(IResource.class);
+    				IResource resource = adaptable.getAdapter(IResource.class);
     				if (resource != null && resource.getType() != IResource.ROOT) {
     					while (celem == null && resource.getType() != IResource.PROJECT) {
-    						celem = (ICElement) resource.getAdapter(ICElement.class);
+    						celem = resource.getAdapter(ICElement.class);
     						resource = resource.getParent();
     					}
     					if (celem == null) {
@@ -345,7 +345,7 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag
     		if (celem == null && part instanceof CEditor) {
 		    	IEditorInput input = ((IEditorPart)part).getEditorInput();
 		    	if (input != null) {
-					final IResource res = (IResource) input.getAdapter(IResource.class);
+					final IResource res = input.getAdapter(IResource.class);
 					if (res != null && res instanceof IFile) {
 					    celem = CoreModel.getDefault().create((IFile)res);
 					}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java
index 32e45d059bd..555624aa007 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPage.java
@@ -200,7 +200,7 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag
 				if (oldItem instanceof IResource) {
 					oldResource= (IResource)oldItem;
 				} else {
-					oldResource= (IResource)oldItem.getAdapter(IResource.class);
+					oldResource= oldItem.getAdapter(IResource.class);
 				}
 				if (oldResource != null && oldResource.isAccessible() == false) {
 					IProject project= oldResource.getProject();
@@ -256,7 +256,7 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag
 		if (child == null)
 			return;
 		if (child instanceof IAdaptable) {
-			IResource resource= (IResource)((IAdaptable)child).getAdapter(IResource.class);
+			IResource resource= ((IAdaptable)child).getAdapter(IResource.class);
 			if (resource != null && !resource.isAccessible())
 				return;
 		}
@@ -308,7 +308,7 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag
 						elements= SelectionConverter.getStructuredSelection(part).toArray();
 						for (int i= 0; i < elements.length; i++) {
 							if (elements[i] instanceof IResource) {
-								ICElement ce= (ICElement)((IResource)elements[i]).getAdapter(ICElement.class);
+								ICElement ce= ((IResource)elements[i]).getAdapter(ICElement.class);
 								if (ce != null && ce.exists() &&  ce.getCProject().isOnSourceRoot((IResource)elements[i]))
 									elements[i]= ce;
 							}
@@ -348,7 +348,7 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag
 						setSubtreeChecked(element, true, true);
 						
 					if (element instanceof IAdaptable) {
-						IResource resource= (IResource) ((IAdaptable)element).getAdapter(IResource.class);
+						IResource resource= ((IAdaptable)element).getAdapter(IResource.class);
 						if (resource != null && !resource.isAccessible())
 							continue;
 					}
@@ -391,7 +391,7 @@ public class CElementWorkingSetPage extends WizardPage implements IWorkingSetPag
 	private void setSubtreeChecked(Object parent, boolean state, boolean checkExpandedState) {
 		if (!(parent instanceof IAdaptable))
 			return;
-		IContainer container= (IContainer)((IAdaptable)parent).getAdapter(IContainer.class);
+		IContainer container= ((IAdaptable)parent).getAdapter(IContainer.class);
 		if ((!fTree.getExpandedState(parent) && checkExpandedState) || (container != null && !container.isAccessible()))
 			return;
 		
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationsPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationsPage.java
index d846f47c8c3..64e7a4d9c02 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationsPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetConfigurationsPage.java
@@ -71,7 +71,7 @@ public class WorkingSetConfigurationsPage extends PropertyPage {
 
 	private IWorkingSetProxy.ISnapshot getWorkingSet(WorkspaceSnapshot workspace) {
 		IWorkingSetProxy.ISnapshot result = null;
-		IWorkingSet realWorkingSet = (IWorkingSet) getElement().getAdapter(IWorkingSet.class);
+		IWorkingSet realWorkingSet = getElement().getAdapter(IWorkingSet.class);
 
 		if (realWorkingSet != null) {
 			result = workspace.getWorkingSet(realWorkingSet.getName());
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java
index d7e52ff79fd..2bd2cbb9e5f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetPropertyTester.java
@@ -53,7 +53,7 @@ public class WorkingSetPropertyTester extends PropertyTester {
 		if (object instanceof IWorkingSet) {
 			result = (IWorkingSet) object;
 		} else if (object instanceof IAdaptable) {
-			result = (IWorkingSet) ((IAdaptable) object).getAdapter(IWorkingSet.class);
+			result = ((IAdaptable) object).getAdapter(IWorkingSet.class);
 		}
 		
 		return result;
@@ -66,7 +66,7 @@ public class WorkingSetPropertyTester extends PropertyTester {
 			IAdaptable[] members = workingSet.getElements();
 			
 			for (IAdaptable next : members) {
-				IProject project = (IProject) next.getAdapter(IProject.class);
+				IProject project = next.getAdapter(IProject.class);
 				
 				if ((project != null) && CoreModel.hasCNature(project)) {
 					result = true;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java
index eebf7fb78bb..50242e80208 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetProxy.java
@@ -76,7 +76,7 @@ public class WorkingSetProxy implements IWorkingSetProxy {
 		IWorkingSet resolvedWS = resolve();
 		if (resolvedWS != null) {
 			for (IAdaptable next : resolvedWS.getElements()) {
-				IProject proj = (IProject) next.getAdapter(IProject.class);
+				IProject proj = next.getAdapter(IProject.class);
 
 				if (proj != null) {
 					result.add(proj);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java
index 2b8ffa2a240..9f00db17dbe 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CDTUITools.java
@@ -138,7 +138,7 @@ public final class CDTUITools {
 		if (tu != null)
 			return tu;
 
-		return (ICElement)editorInput.getAdapter(ICElement.class);
+		return editorInput.getAdapter(ICElement.class);
 	}
 
 	/**
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java
index 58485bb8556..fbe048e0e06 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java
@@ -280,8 +280,8 @@ public class CElementSorter extends ViewerSorter {
 		@SuppressWarnings("unchecked")
 		final Comparator<Object> comparator = getComparator();
 		if (cat1 == PROJECTS) {
-			IWorkbenchAdapter a1= (IWorkbenchAdapter)((IAdaptable)e1).getAdapter(IWorkbenchAdapter.class);
-			IWorkbenchAdapter a2= (IWorkbenchAdapter)((IAdaptable)e2).getAdapter(IWorkbenchAdapter.class);
+			IWorkbenchAdapter a1= ((IAdaptable)e1).getAdapter(IWorkbenchAdapter.class);
+			IWorkbenchAdapter a2= ((IAdaptable)e2).getAdapter(IWorkbenchAdapter.class);
 			return comparator.compare(a1.getLabel(e1), a2.getLabel(e2));
 		}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java
index b9f57b438b7..7095e00b069 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigActionBase.java
@@ -256,7 +256,7 @@ public class ChangeBuildConfigActionBase {
 						IWorkbenchPart part = page.getActivePart();
 						if (part instanceof IEditorPart) {
 							IEditorPart epart = (IEditorPart) part;
-							IResource resource = (IResource) epart.getEditorInput().getAdapter(IResource.class);
+							IResource resource = epart.getEditorInput().getAdapter(IResource.class);
 							if (resource != null)
 							{
 								IProject project = resource.getProject();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java
index 241d3bce7a6..3c2af09949f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java
@@ -352,7 +352,7 @@ public class GenerateActionGroup extends ActionGroup implements ISelectionChange
 	}
 
 	private void installQuickAccessAction() {
-		fHandlerService= (IHandlerService)fSite.getService(IHandlerService.class);
+		fHandlerService= fSite.getService(IHandlerService.class);
 		if (fHandlerService != null) {
 			IHandler handler= new CDTQuickMenuCreator(fEditor) {
 				@Override
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java
index 8f3dc9501ec..e6cddd23c73 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java
@@ -175,7 +175,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements
 		if (element instanceof IResource) {
 			return (IResource)element;
 		}
-		return (IResource)element.getAdapter(IResource.class);
+		return element.getAdapter(IResource.class);
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java
index 9295a7bb229..6236451d1e7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java
@@ -73,7 +73,7 @@ public class IndexerOptionPropertyPage extends PropertyPage implements ICOptionC
 		if (elem instanceof IProject) {
 			project= (IProject) elem;
 		} else if (elem != null) {
-			project= (IProject) elem.getAdapter(IProject.class);
+			project= elem.getAdapter(IProject.class);
 		}
 		return project;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
index 19ab697da28..d845a82577a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
@@ -1261,7 +1261,7 @@ implements
 		else if (el instanceof IResource)
 			internalElement = (IResource)el;
 		else
-		    internalElement = (IResource) el.getAdapter(IResource.class);
+		    internalElement = el.getAdapter(IResource.class);
 		if (internalElement == null) return false;
 		isProject = internalElement instanceof IProject;
 		isFolder  = internalElement instanceof IFolder;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java
index 4318a4c3c64..66f7bed64a9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java
@@ -70,7 +70,7 @@ public class Page_head_general extends PropertyPage implements ICOptionContainer
 		if (elem instanceof IProject) {
 			project= (IProject) elem;
 		} else if (elem != null) {
-			project= (IProject) elem.getAdapter(IProject.class);
+			project= elem.getAdapter(IProject.class);
 		}
 		return project;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java
index 1a40c7ecf6d..f4e6ebfc60d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/AsmSourceViewerConfiguration.java
@@ -181,7 +181,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration
 			IAsmLanguage asmLang= (IAsmLanguage)language;
 			scanner = new AsmCodeScanner(getTokenStoreFactory(), asmLang);
 		} else if (language != null) {
-			ILanguageUI languageUI = (ILanguageUI)language.getAdapter(ILanguageUI.class);
+			ILanguageUI languageUI = language.getAdapter(ILanguageUI.class);
 			if (languageUI != null)
 				scanner = languageUI.getCodeScanner();
 		}
@@ -347,7 +347,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration
 				IPath path = ((IPathEditorInput)input).getPath();
 				contentType = CCorePlugin.getContentType(path.lastSegment());
 			} else {
-				ILocationProvider locationProvider = (ILocationProvider)input.getAdapter(ILocationProvider.class);
+				ILocationProvider locationProvider = input.getAdapter(ILocationProvider.class);
 				if (locationProvider != null) {
 					IPath path = locationProvider.getPath(input);
 					contentType = CCorePlugin.getContentType(path.lastSegment());
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 aae8aa838b9..4db59d10ee7 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
@@ -393,12 +393,12 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
 		RuleBasedScanner scanner= null;
 		
 		if(language != null) {
-			ICLanguageKeywords keywords = (ICLanguageKeywords) language.getAdapter(ICLanguageKeywords.class);
+			ICLanguageKeywords keywords = language.getAdapter(ICLanguageKeywords.class);
 			if(keywords != null) {
 				scanner = new CCodeScanner(getTokenStoreFactory(), keywords);
 			}
 			else {
-				ILanguageUI languageUI = (ILanguageUI)language.getAdapter(ILanguageUI.class);
+				ILanguageUI languageUI = language.getAdapter(ILanguageUI.class);
 				if (languageUI != null)
 					scanner = languageUI.getCodeScanner();
 			}
@@ -958,7 +958,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
 				IPath path = ((IPathEditorInput)input).getPath();
 				contentType = CCorePlugin.getContentType(path.lastSegment());
 			} else {
-				ILocationProvider locationProvider = (ILocationProvider)input.getAdapter(ILocationProvider.class);
+				ILocationProvider locationProvider = input.getAdapter(ILocationProvider.class);
 				if (locationProvider != null) {
 					IPath path = locationProvider.getPath(input);
 					if (path != null) {