Bug 461762 - [cleanup] clean up org.eclipse.ui.ide and update to Java

1.7 - part 1

Fixed all "unnecessary cast" warnings.

Change-Id: I4ee20dc489eb03ab30049e6f75ac6cfd42a5ab0f
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

34 files changed, 56 insertions, 82 deletions

diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/ResourceWorkingSetFilter.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/ResourceWorkingSetFilter.java
index 60a58a193a1..308cfab4b80 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/ResourceWorkingSetFilter.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/ResourceWorkingSetFilter.java
@@ -62,7 +62,7 @@ public class ResourceWorkingSetFilter extends ViewerFilter {
             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) {
             return isEnclosed(resource);
@@ -93,8 +93,7 @@ public class ResourceWorkingSetFilter extends ViewerFilter {
 
         for (int i = 0; i < workingSetElements.length; i++) {
             IAdaptable workingSetElement = workingSetElements[i];
-            IContainmentAdapter containmentAdapter = (IContainmentAdapter) workingSetElement
-                    .getAdapter(IContainmentAdapter.class);
+            IContainmentAdapter containmentAdapter = workingSetElement.getAdapter(IContainmentAdapter.class);
 
             // if there is no IContainmentAdapter defined for the working
             // set element type fall back to using resource based
@@ -139,8 +138,7 @@ public class ResourceWorkingSetFilter extends ViewerFilter {
         if (workingSetElement instanceof IResource) {
             workingSetResource = (IResource) workingSetElement;
         } else {
-            workingSetResource = (IResource) workingSetElement
-                    .getAdapter(IResource.class);
+            workingSetResource = workingSetElement.getAdapter(IResource.class);
         }
         if (workingSetResource != null) {
             IPath resourcePath = workingSetResource.getFullPath();
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddBookmarkAction.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddBookmarkAction.java
index ee927a73159..21540864704 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddBookmarkAction.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddBookmarkAction.java
@@ -125,7 +125,7 @@ public class AddBookmarkAction extends SelectionListenerAction {
 		if (getSelectedResources().isEmpty())
 			return;
 
-		IResource resource= (IResource)getSelectedResources().get(0);
+		IResource resource= getSelectedResources().get(0);
 		if (resource != null) {
 			if (promptForName) {
 				BookmarkPropertiesDialog dialog= new BookmarkPropertiesDialog(shellProvider.getShell());
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddTaskAction.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddTaskAction.java
index 3d1471b99c6..e2cd907ee8d 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddTaskAction.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/AddTaskAction.java
@@ -95,8 +95,7 @@ public class AddTaskAction extends SelectionListenerAction {
 			resource = (IResource) element;
 		}
         if (element instanceof IAdaptable) {
-			resource = (IResource) ((IAdaptable) element)
-                    .getAdapter(IResource.class);
+			resource = ((IAdaptable) element).getAdapter(IResource.class);
 		}
 
         if (resource != null && resource instanceof IProject) {
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java
index 207f793438f..7011d82c2ad 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/CloseResourceAction.java
@@ -370,11 +370,11 @@ public class CloseResourceAction extends WorkspaceAction implements
 		}
 		// here we can only guess how the input might be related to a resource
 
-		Object adapter = Util.getAdapter(input, IFile.class);
+		IFile adapter = Util.getAdapter(input, IFile.class);
 		if (adapter != null) {
-			return (IResource) adapter;
+			return adapter;
 		}
-		return (IResource) Util.getAdapter(input, IResource.class);
+		return Util.getAdapter(input, IResource.class);
 	}
 
 	private static boolean belongsTo(List<IResource> roots, IResource leaf) {
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java
index 7bc39e4c21b..f2368804ab5 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/actions/OpenWithMenu.java
@@ -303,8 +303,7 @@ public class OpenWithMenu extends ContributionItem {
         if (this.file instanceof IFile) {
             return (IFile) this.file;
         }
-        IResource resource = (IResource) this.file
-                .getAdapter(IResource.class);
+        IResource resource = this.file.getAdapter(IResource.class);
         if (resource instanceof IFile) {
             return (IFile) resource;
         }
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFileCreationPage.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFileCreationPage.java
index 28f200958ab..05da71f9633 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFileCreationPage.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFileCreationPage.java
@@ -703,8 +703,7 @@ public class WizardNewFileCreationPage extends WizardPage implements Listener {
 				if (object instanceof IResource) {
 					selectedResource = (IResource) object;
 				} else if (object instanceof IAdaptable) {
-					selectedResource = (IResource) ((IAdaptable) object)
-							.getAdapter(IResource.class);
+					selectedResource = ((IAdaptable) object).getAdapter(IResource.class);
 				}
 				if (selectedResource != null) {
 					if (selectedResource.getType() == IResource.FILE) {
diff --git a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFolderMainPage.java b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFolderMainPage.java
index 4397a1e9b52..c3cdd5ac6ed 100644
--- a/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFolderMainPage.java
+++ b/bundles/org.eclipse.ui.ide/extensions/org/eclipse/ui/dialogs/WizardNewFolderMainPage.java
@@ -707,8 +707,7 @@ public class WizardNewFolderMainPage extends WizardPage implements Listener {
 			if (next instanceof IResource) {
 				selectedResource = (IResource) next;
 			} else if (next instanceof IAdaptable) {
-				selectedResource = (IResource) ((IAdaptable) next)
-						.getAdapter(IResource.class);
+				selectedResource = ((IAdaptable) next).getAdapter(IResource.class);
 			}
 			if (selectedResource != null) {
 				if (selectedResource.getType() == IResource.FILE) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java
index 2c3cefe1a5a..4aa1db2cde8 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/IDE.java
@@ -292,7 +292,7 @@ public final class IDE {
 		if (editor instanceof IGotoMarker) {
 			gotoMarker = (IGotoMarker) editor;
 		} else {
-			gotoMarker = (IGotoMarker) editor.getAdapter(IGotoMarker.class);
+			gotoMarker = editor.getAdapter(IGotoMarker.class);
 		}
 		if (gotoMarker != null) {
 			gotoMarker.gotoMarker(marker);
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/AbstractWorkspaceOperation.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/AbstractWorkspaceOperation.java
index a74a027d099..79f42075e99 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/AbstractWorkspaceOperation.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/AbstractWorkspaceOperation.java
@@ -739,7 +739,7 @@ public abstract class AbstractWorkspaceOperation extends AbstractOperation
 	 */
 	protected Shell getShell(IAdaptable uiInfo) {
 		if (uiInfo != null) {
-			Shell shell = (Shell) uiInfo.getAdapter(Shell.class);
+			Shell shell = uiInfo.getAdapter(Shell.class);
 			if (shell != null) {
 				return shell;
 			}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java
index 963d2238a62..77a28653afb 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/ide/undo/WorkspaceUndoUtil.java
@@ -1029,7 +1029,7 @@ public class WorkspaceUndoUtil {
 	 */
 	public static Shell getShell(IAdaptable uiInfo) {
 		if (uiInfo != null) {
-			Shell shell = (Shell) uiInfo.getAdapter(Shell.class);
+			Shell shell = uiInfo.getAdapter(Shell.class);
 			if (shell != null) {
 				return shell;
 			}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/DefaultContributorResourceAdapter.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/DefaultContributorResourceAdapter.java
index 9324931982d..b8b923eafbf 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/DefaultContributorResourceAdapter.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/DefaultContributorResourceAdapter.java
@@ -49,12 +49,12 @@ public class DefaultContributorResourceAdapter implements
      */
     @Override
 	public IResource getAdaptedResource(IAdaptable adaptable) {
-        return (IResource) adaptable.getAdapter(IResource.class);
+        return adaptable.getAdapter(IResource.class);
     }
 
     @Override
 	public ResourceMapping getAdaptedResourceMapping(IAdaptable adaptable) {
-        return (ResourceMapping) adaptable.getAdapter(ResourceMapping.class);
+        return adaptable.getAdapter(ResourceMapping.class);
     }
 }
 
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/ProjectPropertyDialogAction.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/ProjectPropertyDialogAction.java
index 2c0e33f663a..1dce5eccda5 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/ProjectPropertyDialogAction.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/ProjectPropertyDialogAction.java
@@ -116,8 +116,7 @@ public class ProjectPropertyDialogAction extends PartEventAction implements
         if (!(selection instanceof IAdaptable)) {
 			return null;
 		}
-        IResource resource = (IResource) ((IAdaptable) selection)
-                .getAdapter(IResource.class);
+        IResource resource = ((IAdaptable) selection).getAdapter(IResource.class);
         if (resource == null) {
 			return null;
 		}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java
index 64178ffcf0b..4807a97c12a 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/actions/QuickMenuAction.java
@@ -77,8 +77,7 @@ public abstract class QuickMenuAction extends Action {
      */
     public String getShortCutString() {
 		final IWorkbench workbench = PlatformUI.getWorkbench();
-		final IBindingService bindingService = (IBindingService) workbench
-				.getAdapter(IBindingService.class);
+		final IBindingService bindingService = workbench.getAdapter(IBindingService.class);
 		final TriggerSequence[] activeBindings = bindingService
 				.getActiveBindingsFor(getActionDefinitionId());
 		if (activeBindings.length > 0) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/OpenResourceDialog.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/OpenResourceDialog.java
index e4501df1062..23c1b4ebf90 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/OpenResourceDialog.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/OpenResourceDialog.java
@@ -127,7 +127,7 @@ public class OpenResourceDialog extends FilteredResourcesSelectionDialog {
 					}
 				}
 				private IShowInTarget getShowInTarget(IWorkbenchPart targetPart) {
-					return (IShowInTarget) org.eclipse.ui.internal.util.Util.getAdapter(targetPart, IShowInTarget.class);
+					return org.eclipse.ui.internal.util.Util.getAdapter(targetPart, IShowInTarget.class);
 				}
 			};
 			action.setId(targetId);
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectLinkedResourcePage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectLinkedResourcePage.java
index 3f28580f925..84039eace19 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectLinkedResourcePage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ProjectLinkedResourcePage.java
@@ -63,7 +63,7 @@ public class ProjectLinkedResourcePage extends PropertyPage implements
 
 		IAdaptable adaptable = getElement();
 		 if (adaptable.getAdapter(IProject.class) != null) {
-			 IProject project = (IProject) adaptable.getAdapter(IProject.class);
+			 IProject project = adaptable.getAdapter(IProject.class);
 			 pathVariablesGroup.setResource(project);
 			 linkedResourceEditor.setProject(project);
 		 }
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterPage.java
index 93086531ad3..90897042b65 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterPage.java
@@ -40,8 +40,7 @@ public class ResourceFilterPage extends PropertyPage {
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
 				IIDEHelpContextIds.RESOURCE_FILTER_PROPERTY_PAGE);
 
-		IResource resource = (IResource) getElement().getAdapter(
-				IResource.class);
+		IResource resource = getElement().getAdapter(IResource.class);
 		IContainer container = resource instanceof IContainer ? (IContainer) resource
 				: null;
 		groupWidget.setContainer(container);
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java
index c6555c442a2..136869dabaf 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceInfoPage.java
@@ -338,8 +338,7 @@ public class ResourceInfoPage extends PropertyPage {
 	}
 
 	protected void editLinkLocation() {
-		IResource resource = (IResource) getElement().getAdapter(
-				IResource.class);
+		IResource resource = getElement().getAdapter(IResource.class);
 		String locationFormat = resource.getPathVariableManager().convertFromUserEditableFormat(locationValue.getText(), true);
 		IPath location = Path.fromOSString(locationFormat);
 
@@ -358,8 +357,7 @@ public class ResourceInfoPage extends PropertyPage {
 	}
 
 	private void refreshLinkLocation() {
-		IResource resource = (IResource) getElement().getAdapter(
-				IResource.class);
+		IResource resource = getElement().getAdapter(IResource.class);
 
 		String userEditableFormat = resource.getPathVariableManager().convertToUserEditableFormat(newResourceLocation.toOSString(), true);
 		locationValue.setText(userEditableFormat);
@@ -395,8 +393,7 @@ public class ResourceInfoPage extends PropertyPage {
 				IIDEHelpContextIds.RESOURCE_INFO_PROPERTY_PAGE);
 
 		// layout the page
-		IResource resource = (IResource) getElement().getAdapter(
-				IResource.class);
+		IResource resource = getElement().getAdapter(IResource.class);
 
 		if (resource == null) {
 			Label label = new Label(parent, SWT.NONE);
@@ -857,8 +854,7 @@ public class ResourceInfoPage extends PropertyPage {
 	@Override
 	protected void performDefaults() {
 
-		IResource resource = (IResource) getElement().getAdapter(
-				IResource.class);
+		IResource resource = getElement().getAdapter(IResource.class);
 
 		if (resource == null)
 			return;
@@ -1100,8 +1096,7 @@ public class ResourceInfoPage extends PropertyPage {
 	@Override
 	public boolean performOk() {
 
-		IResource resource = (IResource) getElement().getAdapter(
-				IResource.class);
+		IResource resource = getElement().getAdapter(IResource.class);
 
 		if (resource == null)
 			return true;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java
index 58229d4168b..967832234b1 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceWorkingSetPage.java
@@ -115,7 +115,7 @@ public class ResourceWorkingSetPage extends WizardPage implements
             if (elements[i] instanceof IResource) {
 				resource = (IResource) elements[i];
 			} else {
-				resource = (IResource) elements[i].getAdapter(IResource.class);
+				resource = elements[i].getAdapter(IResource.class);
 			}
 
             if (resource != null) {
@@ -430,8 +430,7 @@ public class ResourceWorkingSetPage extends WizardPage implements
                     if (item instanceof IContainer) {
                         container = (IContainer) item;
                     } else {
-                        container = (IContainer) item
-                                .getAdapter(IContainer.class);
+                        container = item.getAdapter(IContainer.class);
                     }
                     if (container != null) {
                         setSubtreeChecked(container, true, true);
@@ -439,7 +438,7 @@ public class ResourceWorkingSetPage extends WizardPage implements
                     if (item instanceof IResource) {
                         resource = (IResource) item;
                     } else {
-                        resource = (IResource) item.getAdapter(IResource.class);
+                        resource = item.getAdapter(IResource.class);
                     }
                     if (resource != null && resource.isAccessible() == false) {
                         IProject project = resource.getProject();
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/handlers/ShowInSystemExplorerHandler.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/handlers/ShowInSystemExplorerHandler.java
index 352b129885f..c6937f95aeb 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/handlers/ShowInSystemExplorerHandler.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/handlers/ShowInSystemExplorerHandler.java
@@ -126,7 +126,7 @@ public class ShowInSystemExplorerHandler extends AbstractHandler {
 
 		Object selectedObject = ((IStructuredSelection) selection)
 				.getFirstElement();
-		IResource item = (IResource) org.eclipse.ui.internal.util.Util
+		IResource item = org.eclipse.ui.internal.util.Util
 				.getAdapter(selectedObject, IResource.class);
 		return item;
 	}
@@ -140,7 +140,7 @@ public class ShowInSystemExplorerHandler extends AbstractHandler {
 		if (input instanceof IFileEditorInput) {
 			return ((IFileEditorInput)input).getFile();
 		}
-		return (IResource) input.getAdapter(IResource.class);
+		return input.getAdapter(IResource.class);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkbenchResource.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkbenchResource.java
index a05990ff88f..04ac01bc6a9 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkbenchResource.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/model/WorkbenchResource.java
@@ -71,7 +71,7 @@ public abstract class WorkbenchResource extends WorkbenchAdapter implements
             return (IResource) o;
         }
         if (o instanceof IAdaptable) {
-            return (IResource) ((IAdaptable) o).getAdapter(IResource.class);
+            return ((IAdaptable) o).getAdapter(IResource.class);
         }
         return null;
     }
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
index 0149898f04d..75a3c5b3040 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
@@ -1305,7 +1305,7 @@ public class ExtendedMarkersView extends ViewPart {
 	private void setPrimarySortField(MarkerField field, TreeColumn column) {
 		builder.setPrimarySortField(field);
 
-		IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService) getViewSite()
+		IWorkbenchSiteProgressService service = getViewSite()
 				.getAdapter(IWorkbenchSiteProgressService.class);
 		builder.refreshContents(service);
 		updateDirectionIndicator(column, field);
@@ -1731,7 +1731,7 @@ public class ExtendedMarkersView extends ViewPart {
 	 * @since 3.7
 	 */
 	protected IUndoContext getUndoContext() {
-		return (IUndoContext)ResourcesPlugin.getWorkspace().getAdapter(IUndoContext.class);
+		return ResourcesPlugin.getWorkspace().getAdapter(IUndoContext.class);
 	}
 
 	/**
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java
index 22adbcbdcf4..60dfc319361 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerFieldFilterGroup.java
@@ -263,8 +263,7 @@ class MarkerFieldFilterGroup {
 		List result = new ArrayList(elements.length);
 
 		for (int idx = 0; idx < elements.length; idx++) {
-			IResource next = (IResource) elements[idx]
-					.getAdapter(IResource.class);
+			IResource next = elements[idx].getAdapter(IResource.class);
 
 			if (next != null) {
 				result.add(next);
@@ -524,7 +523,7 @@ class MarkerFieldFilterGroup {
 		clone.id = id;
 		for (int i = 0; i < fieldFilters.length; i++) {
 			try {
-				clone.fieldFilters[i] = (MarkerFieldFilter) fieldFilters[i]
+				clone.fieldFilters[i] = fieldFilters[i]
 						.getClass().newInstance();
 				fieldFilters[i].populateWorkingCopy(clone.fieldFilters[i]);
 			} catch (InstantiationException e) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java
index b82089029a2..f7f2aa39154 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerResourceUtil.java
@@ -360,21 +360,19 @@ class MarkerResourceUtil {
 	static Object adapt2ResourceElement(Object object) {
 		IResource resource = null;
 		if (object instanceof IAdaptable) {
-			Object adapter = Util.getAdapter(object,
-					ITaskListResourceAdapter.class);
+			ITaskListResourceAdapter adapter = Util.getAdapter(object, ITaskListResourceAdapter.class);
 			if (adapter != null) {
-				resource = ((ITaskListResourceAdapter) adapter)
-						.getAffectedResource((IAdaptable) object);
+				resource = adapter.getAffectedResource((IAdaptable) object);
 			}
 		}
 		if (resource == null) {
-			resource = (IResource) Util.getAdapter(object, IResource.class);
+			resource = Util.getAdapter(object, IResource.class);
 		}
 		if (resource == null) {
-			resource = (IResource) Util.getAdapter(object, IFile.class);
+			resource = Util.getAdapter(object, IFile.class);
 		}
 		if (resource == null) {
-			Object mapping = Util.getAdapter(object, ResourceMapping.class);
+			ResourceMapping mapping = Util.getAdapter(object, ResourceMapping.class);
 			if (mapping != null) {
 				return mapping;
 			}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeFrame.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeFrame.java
index 9a7ac88f0f7..b643dc9284b 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeFrame.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/framelist/TreeFrame.java
@@ -187,8 +187,7 @@ public class TreeFrame extends Frame {
     private void saveElements(Object[] elements, IMemento memento) {
         for (int i = 0; i < elements.length; i++) {
             if (elements[i] instanceof IAdaptable) {
-                IPersistableElement persistable = (IPersistableElement) ((IAdaptable) elements[i])
-                        .getAdapter(IPersistableElement.class);
+                IPersistableElement persistable = ((IAdaptable) elements[i]).getAdapter(IPersistableElement.class);
                 if (persistable != null) {
                     IMemento elementMem = memento.createChild(TAG_ELEMENT);
                     elementMem.putString(TAG_FACTORY_ID, persistable
@@ -209,8 +208,7 @@ public class TreeFrame extends Frame {
 			return;
 		}
 
-        IPersistableElement persistable = (IPersistableElement) ((IAdaptable) input)
-                .getAdapter(IPersistableElement.class);
+        IPersistableElement persistable = ((IAdaptable) input).getAdapter(IPersistableElement.class);
         if (persistable != null) {
             IMemento frameMemento = memento.createChild(TAG_FRAME_INPUT);
 
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/MainActionGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/MainActionGroup.java
index 52cc5415a05..60d5c53cb24 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/MainActionGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/MainActionGroup.java
@@ -221,7 +221,7 @@ public class MainActionGroup extends ResourceNavigatorActionGroup {
         workingSetGroup.setWorkingSet(navigator.getWorkingSet());
         sortAndFilterGroup = new SortAndFilterActionGroup(navigator);
         workspaceGroup = new WorkspaceActionGroup(navigator);
-        IUndoContext workspaceContext= (IUndoContext)ResourcesPlugin.getWorkspace().getAdapter(IUndoContext.class);
+        IUndoContext workspaceContext= ResourcesPlugin.getWorkspace().getAdapter(IUndoContext.class);
 		undoRedoGroup= new UndoRedoActionGroup(getNavigator().getSite(), workspaceContext, true);
 
     }
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java
index fcb9649036c..7a091a8c8ed 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/NavigatorDropAdapter.java
@@ -161,7 +161,7 @@ public class NavigatorDropAdapter extends PluginDropAdapter implements IOverwrit
                 }
                 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/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourceNavigator.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourceNavigator.java
index faf97660761..3d3d621c283 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourceNavigator.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourceNavigator.java
@@ -290,8 +290,7 @@ public class ResourceNavigator extends ViewPart implements ISetSelectionTarget,
                     resource = (IResource) o;
                 } else {
                     if (o instanceof IAdaptable) {
-                        resource = (IResource) ((IAdaptable) o)
-                                .getAdapter(IResource.class);
+                        resource = ((IAdaptable) o).getAdapter(IResource.class);
                     }
                 }
                 if (resource != null) {
@@ -621,7 +620,7 @@ public class ResourceNavigator extends ViewPart implements ISetSelectionTarget,
             if (input instanceof IResource) {
                 resource = (IResource) input;
             } else {
-                resource = (IResource) input.getAdapter(IResource.class);
+                resource = input.getAdapter(IResource.class);
             }
             if (resource != null) {
                 switch (resource.getType()) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourcePatternFilter.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourcePatternFilter.java
index b20db91a1e6..6b6fe181e18 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourcePatternFilter.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ResourcePatternFilter.java
@@ -132,7 +132,7 @@ public class ResourcePatternFilter extends ViewerFilter {
             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) {
             String name = resource.getName();
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ShowInNavigatorAction.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ShowInNavigatorAction.java
index 4e6d29745f5..033a1a7e0c1 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ShowInNavigatorAction.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/ShowInNavigatorAction.java
@@ -72,8 +72,7 @@ public class ShowInNavigatorAction extends SelectionProviderAction {
                 IResource resource = ((IMarker) o).getResource();
                 v.add(resource);
             } else if (o instanceof IAdaptable) {
-                IResource resource = (IResource) ((IAdaptable) o)
-                        .getAdapter(IResource.class);
+                IResource resource = ((IAdaptable) o).getAdapter(IResource.class);
                 if (resource != null) {
                     v.add(resource);
                 }
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/WorkspaceActionGroup.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/WorkspaceActionGroup.java
index 9cbbaeeff9f..35869fe46d6 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/WorkspaceActionGroup.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/navigator/WorkspaceActionGroup.java
@@ -121,8 +121,7 @@ public class WorkspaceActionGroup extends ResourceNavigatorActionGroup {
             if (next instanceof IProject) {
 				project = (IProject) next;
 			} else if (next instanceof IAdaptable) {
-				project = (IProject) ((IAdaptable) next)
-                        .getAdapter(IProject.class);
+				project = ((IAdaptable) next).getAdapter(IProject.class);
 			}
 
             if (project == null) {
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/properties/FilePropertySource.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/properties/FilePropertySource.java
index 1c162ffd378..1cc39a6b85d 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/properties/FilePropertySource.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/properties/FilePropertySource.java
@@ -74,7 +74,7 @@ public class FilePropertySource extends ResourcePropertySource {
 		}
 
         if (key.equals(IResourcePropertyConstants.P_SIZE_RES)) {
-			return IDEResourceInfoUtils.getSizeString((IFile) element);
+			return IDEResourceInfoUtils.getSizeString(element);
 		}
         return null;
     }
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java
index 462d4fed9e1..c66ace9c844 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/DefaultTaskListResourceAdapter.java
@@ -47,9 +47,9 @@ class DefaultTaskListResourceAdapter implements ITaskListResourceAdapter {
     @Override
 	public IResource getAffectedResource(IAdaptable adaptable) {
 
-        IResource resource = (IResource) adaptable.getAdapter(IResource.class);
+        IResource resource = adaptable.getAdapter(IResource.class);
         if (resource == null) {
-			return (IFile) adaptable.getAdapter(IFile.class);
+			return adaptable.getAdapter(IFile.class);
 		} else {
 			return resource;
 		}
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TasksFilter.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TasksFilter.java
index 35e3daf8a41..adebe56b86f 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TasksFilter.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/tasklist/TasksFilter.java
@@ -192,8 +192,7 @@ class TasksFilter extends ViewerFilter implements Cloneable {
         }
         for (int i = 0; i < workingSetElements.length; i++) {
             IAdaptable workingSetElement = workingSetElements[i];
-            IContainmentAdapter containmentAdapter = (IContainmentAdapter) workingSetElement
-                    .getAdapter(IContainmentAdapter.class);
+            IContainmentAdapter containmentAdapter = workingSetElement.getAdapter(IContainmentAdapter.class);
 
             // if there is no IContainmentAdapter defined for the working
             // set element type fall back to using resource based
@@ -237,8 +236,7 @@ class TasksFilter extends ViewerFilter implements Cloneable {
         if (workingSetElement instanceof IResource) {
             workingSetResource = (IResource) workingSetElement;
         } else {
-            workingSetResource = (IResource) workingSetElement
-                    .getAdapter(IResource.class);
+            workingSetResource = workingSetElement.getAdapter(IResource.class);
         }
         if (workingSetResource != null) {
             IPath resourcePath = workingSetResource.getFullPath();
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/newresource/BasicNewResourceWizard.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/newresource/BasicNewResourceWizard.java
index 008b501ed89..cdedc1d9e43 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/newresource/BasicNewResourceWizard.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/wizards/newresource/BasicNewResourceWizard.java
@@ -164,8 +164,7 @@ public abstract class BasicNewResourceWizard extends Wizard implements
             if (part instanceof ISetSelectionTarget) {
 				target = (ISetSelectionTarget) part;
 			} else {
-				target = (ISetSelectionTarget) part
-                        .getAdapter(ISetSelectionTarget.class);
+				target = part.getAdapter(ISetSelectionTarget.class);
 			}
 
             if (target != null) {