Fixed bug 460417: Fix compiler problems from generified IAdaptable#getAdapter(..)

29 files changed, 207 insertions, 153 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
index e56f6d3b1..a39b75c56 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
@@ -623,7 +623,7 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
 	 */
 	ViewContextService(IWorkbenchWindow window) {
 		fWindow = window;
-		fContextService = (IContextService) PlatformUI.getWorkbench().getAdapter(IContextService.class);
+		fContextService = PlatformUI.getWorkbench().getAdapter(IContextService.class);
         fDebugContextService = DebugUITools.getDebugContextManager().getContextService(fWindow);
 		loadContextToViewExtensions();
         applyUserViewBindings();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java
index cdd141032..b6cfeb3c2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.Platform;
+
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointContainer;
 import org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointOrganizer;
@@ -29,6 +30,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
+
 import org.eclipse.debug.ui.IDebugUIConstants;
 
 /**
@@ -660,7 +662,7 @@ public class BreakpointContainer extends ElementContentProvider implements IAdap
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
 	@Override
-	public Object getAdapter(Class adapter) {
+	public <T> T getAdapter(Class<T> adapter) {
 		return Platform.getAdapterManager().getAdapter(this, adapter);
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
index 7a0c9dd2e..1aededf79 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
@@ -43,7 +43,7 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
             IBreakpointContainer container = (IBreakpointContainer) object;
             IAdaptable category = container.getCategory();
             if (category != null) {
-	            IWorkbenchAdapter adapter = (IWorkbenchAdapter) category.getAdapter(IWorkbenchAdapter.class);
+	            IWorkbenchAdapter adapter = category.getAdapter(IWorkbenchAdapter.class);
 	            if (adapter != null) {
 	                return adapter.getImageDescriptor(category);
 	            }
@@ -62,7 +62,7 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
             IBreakpointContainer container = (IBreakpointContainer) object;
             IAdaptable category = container.getCategory();
             if (category != null) {
-	            IWorkbenchAdapter adapter = (IWorkbenchAdapter) category.getAdapter(IWorkbenchAdapter.class);
+	            IWorkbenchAdapter adapter = category.getAdapter(IWorkbenchAdapter.class);
 	            if (adapter != null) {
 	                return adapter.getLabel(category);
 	            }
@@ -88,7 +88,7 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
         if (object instanceof IBreakpointContainer) {
             IBreakpointContainer container = (IBreakpointContainer) object;
             IAdaptable category = container.getCategory();
-            IWorkbenchAdapter2 adapter = (IWorkbenchAdapter2) category.getAdapter(IWorkbenchAdapter2.class);
+            IWorkbenchAdapter2 adapter = category.getAdapter(IWorkbenchAdapter2.class);
             if (adapter != null) {
                 return adapter.getForeground(category);
             }
@@ -104,7 +104,7 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
         if (object instanceof IBreakpointContainer) {
             IBreakpointContainer container = (IBreakpointContainer) object;
             IAdaptable category = container.getCategory();
-            IWorkbenchAdapter2 adapter = (IWorkbenchAdapter2) category.getAdapter(IWorkbenchAdapter2.class);
+            IWorkbenchAdapter2 adapter = category.getAdapter(IWorkbenchAdapter2.class);
             if (adapter != null) {
                 return adapter.getBackground(category);
             }
@@ -120,7 +120,7 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
         if (object instanceof IBreakpointContainer) {
             IBreakpointContainer container = (IBreakpointContainer) object;
             IAdaptable category = container.getCategory();
-            IWorkbenchAdapter2 adapter = (IWorkbenchAdapter2) category.getAdapter(IWorkbenchAdapter2.class);
+            IWorkbenchAdapter2 adapter = category.getAdapter(IWorkbenchAdapter2.class);
             if (adapter != null) {
                 return adapter.getFont(category);
             }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java
index 41af99aa5..3ff9bc666 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java
@@ -51,7 +51,7 @@ public class BreakpointPersistableElementAdapter implements IPersistableElement
         IMarker marker = fBreakpoint.getMarker();
         if (marker != null) {
             IResource resource = marker.getResource();
-            IPersistableElement pe = (IPersistableElement) resource.getAdapter(IPersistableElement.class);
+            IPersistableElement pe = resource.getAdapter(IPersistableElement.class);
             if (pe != null) {
                 long id = marker.getId();
                 String longString = Long.toString(id);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java
index 2f419f2df..f90031689 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java
@@ -34,7 +34,7 @@ public class BreakpointTypeOrganizer extends AbstractBreakpointOrganizerDelegate
      */
     @Override
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
-        IBreakpointTypeCategory category = (IBreakpointTypeCategory) breakpoint.getAdapter(IBreakpointTypeCategory.class);
+        IBreakpointTypeCategory category = breakpoint.getAdapter(IBreakpointTypeCategory.class);
         if (category != null) {
             return new IAdaptable[]{category};
         }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java
index bce1bbffe..972e41ed2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java
@@ -61,7 +61,7 @@ public class WorkingSetBreakpointOrganizer extends AbstractBreakpointOrganizerDe
             if (!IDebugUIConstants.BREAKPOINT_WORKINGSET_ID.equals(workingSets[i].getId())) {
 		        IAdaptable[] elements = workingSets[i].getElements();
 		        for (int j = 0; j < elements.length; j++) {
-		            IResource resource = (IResource) elements[j].getAdapter(IResource.class);
+		            IResource resource = elements[j].getAdapter(IResource.class);
 		            if (resource != null) {
 		                if (parents.contains(resource)) {
 		                	result.add(new WorkingSetCategory(workingSets[i]));
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
index 31276641a..4052537dd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@ import java.io.IOException;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
+
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IDebugEventSetListener;
@@ -24,14 +25,17 @@ import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IStreamsProxy;
 import org.eclipse.debug.core.model.IStreamsProxy2;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
+
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.debug.ui.contexts.DebugContextEvent;
 import org.eclipse.debug.ui.contexts.IDebugContextListener;
+
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeSelection;
+
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.console.IConsole;
 import org.eclipse.ui.console.IConsoleConstants;
@@ -161,19 +165,20 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
      */
-    @Override
-	public Object getAdapter(Class required) {
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T getAdapter(Class<T> required) {
         if (IShowInSource.class.equals(required)) {
-            return this;
+			return (T) this;
         }
         if (IShowInTargetList.class.equals(required)) {
-            return this; 
+			return (T) this;
         }
         //CONTEXTLAUNCHING
         if(ILaunchConfiguration.class.equals(required)) {
         	ILaunch launch = getProcess().getLaunch();
         	if(launch != null) {
-        		return launch.getLaunchConfiguration();
+				return (T) launch.getLaunchConfiguration();
         	}
         	return null;
         }
@@ -189,7 +194,7 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
         if (process == null) {
             return null;
         } 
-        IDebugTarget target = (IDebugTarget)process.getAdapter(IDebugTarget.class);
+        IDebugTarget target = process.getAdapter(IDebugTarget.class);
         ISelection selection = null;
         if (target == null) {
             selection = new TreeSelection(new TreePath(new Object[]{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
index 874c04be6..7a6671672 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
@@ -206,7 +206,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
 	    if (target instanceof IExpression) {
 	        return (IExpression)target;
 	    } else if (target instanceof IAdaptable) {
-	        return (IExpression)((IAdaptable)target).getAdapter(IExpression.class);
+	        return ((IAdaptable)target).getAdapter(IExpression.class);
 	    }
 	    return null;
 	}
@@ -500,7 +500,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
      * @return factory or <code>null</code>
      */
     private IWatchExpressionFactoryAdapter getFactory(IVariable variable) {
-        return (IWatchExpressionFactoryAdapter) variable.getAdapter(IWatchExpressionFactoryAdapter.class);      
+        return variable.getAdapter(IWatchExpressionFactoryAdapter.class);      
     }
 
     /**
@@ -511,7 +511,7 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
      */
     private IWatchExpressionFactoryAdapter2 getFactory2(Object element) {
         if (element instanceof IAdaptable) {
-            return (IWatchExpressionFactoryAdapter2)((IAdaptable)element).getAdapter(IWatchExpressionFactoryAdapter2.class);
+            return ((IAdaptable)element).getAdapter(IWatchExpressionFactoryAdapter2.class);
         }
         return null;
     }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
index f75f7a5cb..997f2a89f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@ package org.eclipse.debug.internal.ui.views.launch;
 
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+
 import org.eclipse.ui.IPropertyListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchPartSite;
@@ -122,7 +123,7 @@ class BreadcrumbWorkbenchPart implements IWorkbenchPart {
      * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
      */
     @Override
-	public Object getAdapter(Class adapter) {
+	public <T> T getAdapter(Class<T> adapter) {
         return null;
     }
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
index 6475b0969..d0158505c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -14,6 +14,7 @@
 package org.eclipse.debug.internal.ui.views.launch;
 
 import org.eclipse.core.runtime.IAdapterFactory;
+
 import org.eclipse.debug.core.IExpressionManager;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchManager;
@@ -85,6 +86,7 @@ import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousLabelAdapt
 import org.eclipse.debug.internal.ui.viewers.update.DefaultModelProxyFactory;
 import org.eclipse.debug.internal.ui.viewers.update.DefaultModelSelectionPolicyFactory;
 import org.eclipse.debug.internal.ui.views.memory.renderings.MemorySegment;
+
 import org.eclipse.debug.ui.sourcelookup.ISourceDisplay;
 
 /**
@@ -146,98 +148,99 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
      */
-    @Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
         if (adapterType.isInstance(adaptableObject)) {
-			return adaptableObject;
+			return (T) adaptableObject;
 		}
         
         if (adapterType.equals(IAsynchronousContentAdapter.class)) {
             if (adaptableObject instanceof IMemoryBlockRetrieval) {
-            	return fgAsyncMemoryRetrieval;
+				return (T) fgAsyncMemoryRetrieval;
             }
             if (adaptableObject instanceof IMemoryBlock) {
-            	return fgAsyncMemoryBlock;
+				return (T) fgAsyncMemoryBlock;
             }
         }
         
         if (adapterType.equals(IElementContentProvider.class)) {
             if (adaptableObject instanceof ILaunchManager) {
-                return fgCPLaunchManger;
+				return (T) fgCPLaunchManger;
             }
             if (adaptableObject instanceof ILaunch) {
-                return fgCPLaunch;
+				return (T) fgCPLaunch;
             }
             if (adaptableObject instanceof IProcess) {
-                return fgCPProcess;
+				return (T) fgCPProcess;
             }
             if (adaptableObject instanceof IDebugTarget) {
-            	return fgCPTarget;
+				return (T) fgCPTarget;
             }
             if (adaptableObject instanceof IMemoryBlockRetrieval)
             {
-            	return fgCPMemoryRetrieval;
+				return (T) fgCPMemoryRetrieval;
             }
             if (adaptableObject instanceof IThread) {
-            	return fgCPThread;
+				return (T) fgCPThread;
             }
             if (adaptableObject instanceof IStackFrame) {
-            	return fgCPFrame;
+				return (T) fgCPFrame;
             }
             if (adaptableObject instanceof IVariable) {
-            	return fgCPVariable;
+				return (T) fgCPVariable;
             }
             if (adaptableObject instanceof IExpressionManager) {
-            	return fgCPExpressionManager;
+				return (T) fgCPExpressionManager;
             }           
             if (adaptableObject instanceof IExpression) {
-            	return fgCPExpression;
+				return (T) fgCPExpression;
             }
             if (adaptableObject instanceof IRegisterGroup) {
-            	return fgCPRegisterGroup;
+				return (T) fgCPRegisterGroup;
             }
             if (adaptableObject instanceof IMemoryBlock) {
-            	return fgCPMemoryBlock;
+				return (T) fgCPMemoryBlock;
             }            
             if (adaptableObject instanceof DefaultBreakpointsViewInput) {
-            	return fgCPBreakpointManager;
+				return (T) fgCPBreakpointManager;
             }
             if (adaptableObject instanceof IBreakpoint) {
-            	return fgCPBreakpoint;
+				return (T) fgCPBreakpoint;
             }
         }        
         
         if (adapterType.equals(IAsynchronousLabelAdapter.class)) {
         	if (adaptableObject instanceof IMemoryBlock) {
-        		return fgMemoryBlockLabelAdapter;
+				return (T) fgMemoryBlockLabelAdapter;
         	}
         	
         	if (adaptableObject instanceof MemorySegment) {
-        		return fgTableRenderingLineLabelAdapter;
+				return (T) fgTableRenderingLineLabelAdapter;
         	}
-        	return fgDebugLabelAdapter;
+			return (T) fgDebugLabelAdapter;
         }
         
         if (adapterType.equals(IElementLabelProvider.class)) {
         	if (adaptableObject instanceof IVariable) {
-        		return fgLPVariable;
+				return (T) fgLPVariable;
         	}
         	if (adaptableObject instanceof IExpression) {
-        		return fgLPExpression;
+				return (T) fgLPExpression;
         	}
         	if (adaptableObject instanceof IRegisterGroup) {
-        		return fgLPRegisterGroup;
+				return (T) fgLPRegisterGroup;
         	}
         	if (adaptableObject instanceof IMemoryBlock) {
-        		return fgLPMemoryBlock;
+				return (T) fgLPMemoryBlock;
         	} 
         	if (adaptableObject instanceof IBreakpoint) {
-        		return fgLPBreakpoint;
+				return (T) fgLPBreakpoint;
         	}
         	if (adaptableObject instanceof IBreakpointContainer) {
-        		return fgLPBreakpointContainer;
+				return (T) fgLPBreakpointContainer;
         	}     	
-        	return fgLPDebugElement;
+			return (T) fgLPDebugElement;
         }        
         
         if (adapterType.equals(IModelProxyFactory.class)) {
@@ -249,72 +252,72 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
         			adaptableObject instanceof DefaultBreakpointsViewInput ||
         			adaptableObject instanceof IBreakpoint ||
         			adaptableObject instanceof IBreakpointContainer) {
-				return fgModelProxyFactoryAdapter;
+				return (T) fgModelProxyFactoryAdapter;
 			}
         }
         
         if (adapterType.equals(ISourceDisplay.class)) {
         	if (adaptableObject instanceof IStackFrame) {
-        		return fgStackFrameSourceDisplayAdapter;
+				return (T) fgStackFrameSourceDisplayAdapter;
         	}
         }
         
         if (adapterType.equals(IModelSelectionPolicyFactory.class)) {
         	if (adaptableObject instanceof IDebugElement) {
-        		return fgModelSelectionPolicyFactoryAdapter;
+				return (T) fgModelSelectionPolicyFactoryAdapter;
         	}
         }
         
         if (adapterType.equals(IColumnPresentationFactory.class)) {
             if (adaptableObject instanceof IStackFrame || adaptableObject instanceof IExpressionManager) {
-                return fgVariableColumnFactory;
+				return (T) fgVariableColumnFactory;
             }
         }   
         
         if (adapterType.equals(IElementMementoProvider.class)) {
         	if (adaptableObject instanceof IStackFrame) {
-        		return fgMPFrame;
+				return (T) fgMPFrame;
         	}
         	if (adaptableObject instanceof IVariable) {
-        		return fgMPVariable;
+				return (T) fgMPVariable;
         	}
         	if (adaptableObject instanceof IRegisterGroup) {
-        		return fgMPRegisterGroup;
+				return (T) fgMPRegisterGroup;
         	}
         	if (adaptableObject instanceof IExpression) {
-        		return fgMPExpression;
+				return (T) fgMPExpression;
         	}
         	if (adaptableObject instanceof IExpressionManager) {
-        		return fgMPExpressionManager;
+				return (T) fgMPExpressionManager;
         	}
         	if (adaptableObject instanceof IMemoryBlockRetrieval) {
-        		return fgMPMemory;
+				return (T) fgMPMemory;
         	}
         	if (adaptableObject instanceof IBreakpoint) {
-        		return fgMPBreakpoint;
+				return (T) fgMPBreakpoint;
         	}
         	if (adaptableObject instanceof IBreakpointContainer) {
-        		return fgMPBreakpointContainer;
+				return (T) fgMPBreakpointContainer;
         	}
         	if (adaptableObject instanceof DefaultBreakpointsViewInput) {
-        		return fgMPBreakpointManagerInput;
+				return (T) fgMPBreakpointManagerInput;
         	}
         }
         
         if (adapterType.equals(IElementEditor.class)) {
         	if (adaptableObject instanceof IVariable) {
-        		return fgEEVariable;
+				return (T) fgEEVariable;
         	}
             if (adaptableObject instanceof IWatchExpression) {
-                return fgEEWatchExpression;
+				return (T) fgEEWatchExpression;
             }
         }
         
         if (adapterType.equals(IViewerInputProvider.class)) {
         	if (adaptableObject instanceof IStackFrame) {
-        		return fgStackFrameViewerInputProvider;
+				return (T) fgStackFrameViewerInputProvider;
         	} else {
-        	    return fgDefaultViewerInputProvider;
+				return (T) fgDefaultViewerInputProvider;
         	}
         }         
         
@@ -325,7 +328,7 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
      * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
      */
     @Override
-	public Class[] getAdapterList() {
+	public Class<?>[] getAdapterList() {
         return new Class[] {
         		IAsynchronousLabelAdapter.class,
         		IAsynchronousContentAdapter.class,
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
index 570fe9ebb..1d08d4f88 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
@@ -1386,7 +1386,7 @@ public class LaunchView extends AbstractDebugView
 				Object object = selection.getFirstElement();
 				if (object instanceof IAdaptable) {
 					IAdaptable adaptable = (IAdaptable) object;
-					IShowInSource show = (IShowInSource) adaptable.getAdapter(IShowInSource.class);
+					IShowInSource show = adaptable.getAdapter(IShowInSource.class);
 					if (show != null) {
 						return show.getShowInContext();
 					}
@@ -1407,7 +1407,7 @@ public class LaunchView extends AbstractDebugView
 				Object object = selection.getFirstElement();
 				if (object instanceof IAdaptable) {
 					IAdaptable adaptable = (IAdaptable) object;
-					IShowInTargetList show = (IShowInTargetList) adaptable.getAdapter(IShowInTargetList.class);
+					IShowInTargetList show = adaptable.getAdapter(IShowInTargetList.class);
 					if (show != null) {
 						return show.getShowInTargetIds();
 					}
@@ -1524,7 +1524,7 @@ public class LaunchView extends AbstractDebugView
     @Override
 	public synchronized void viewerUpdatesBegin() {
         IWorkbenchSiteProgressService progressService = 
-            (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class);
+            getSite().getAdapter(IWorkbenchSiteProgressService.class);
         if (progressService != null) {
             progressService.incrementBusy();
         }
@@ -1536,7 +1536,7 @@ public class LaunchView extends AbstractDebugView
     @Override
 	public synchronized void viewerUpdatesComplete() {
         IWorkbenchSiteProgressService progressService = 
-            (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class);
+            getSite().getAdapter(IWorkbenchSiteProgressService.class);
         if (progressService != null) {
             progressService.decrementBusy();
         }       
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
index 38e1906d9..6756edd30 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
@@ -516,7 +516,7 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 			}
 
 			// ask decorator to decorate to ensure consistent label
-			ILabelDecorator decorator = (ILabelDecorator) fMemoryBlocks[i].getAdapter(ILabelDecorator.class);
+			ILabelDecorator decorator = fMemoryBlocks[i].getAdapter(ILabelDecorator.class);
 			if (decorator != null)
 				text = decorator.decorateText(text, fMemoryBlocks[i]);
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
index 2957f11e4..c14df2012 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewUtil.java
@@ -78,13 +78,13 @@ public class MemoryViewUtil {
 		if (!(elem instanceof IAdaptable))
 			return false;
 
-		IMemoryBlockRetrieval memRetrieval = (IMemoryBlockRetrieval) ((IAdaptable) elem).getAdapter(IMemoryBlockRetrieval.class);
+		IMemoryBlockRetrieval memRetrieval = ((IAdaptable) elem).getAdapter(IMemoryBlockRetrieval.class);
 
 		IDebugTarget debugTarget = null;
 		if (elem instanceof IDebugElement) {
 			debugTarget = ((IDebugElement) elem).getDebugTarget();
 		} else {
-			debugTarget = (IDebugTarget) ((IAdaptable) elem).getAdapter(IDebugTarget.class);
+			debugTarget = ((IAdaptable) elem).getAdapter(IDebugTarget.class);
 		}
 
 		if (memRetrieval == null) {
@@ -197,7 +197,7 @@ public class MemoryViewUtil {
 		// check if the object can adapt to a memory block retrieval
 		if (object instanceof IAdaptable) {
 			IAdaptable adaptable = (IAdaptable) object;
-			retrieval = (IMemoryBlockRetrieval) adaptable.getAdapter(IMemoryBlockRetrieval.class);
+			retrieval = adaptable.getAdapter(IMemoryBlockRetrieval.class);
 		}
 
 		// if cannot adapt and the object itself is already an
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java
index 6eaed8d30..89b298b34 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RetargetAddMemoryBlockAction.java
@@ -93,7 +93,7 @@ public class RetargetAddMemoryBlockAction extends AddMemoryBlockAction {
 		if (standardMemRetrieval instanceof IAddMemoryBlocksTarget) {
 			target = (IAddMemoryBlocksTarget) standardMemRetrieval;
 		} else if (standardMemRetrieval instanceof IAdaptable) {
-			target = (IAddMemoryBlocksTarget) ((IAdaptable) standardMemRetrieval).getAdapter(IAddMemoryBlocksTarget.class);
+			target = ((IAdaptable) standardMemRetrieval).getAdapter(IAddMemoryBlocksTarget.class);
 		}
 		return target;
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
index 8a07ecf15..26cc15d23 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
@@ -444,7 +444,7 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 	 * @return the decorated label for the specified <code>IMemoryBlock</code>
 	 */
 	private String decorateLabel(final IMemoryBlock memBlk, String label) {
-		ILabelDecorator decorator = (ILabelDecorator) memBlk.getAdapter(ILabelDecorator.class);
+		ILabelDecorator decorator = memBlk.getAdapter(ILabelDecorator.class);
 		if (decorator != null) {
 			label = decorator.decorateText(label, memBlk);
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java
index 3d568e8c1..32ea601cb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -97,7 +97,7 @@ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy
 	private void notifyRendering(IModelDelta node, IModelProxy proxy) {
 		if (getTableViewer() != null)
 		{
-			IModelChangedListener listener = (IModelChangedListener)getTableViewer().getRendering().getAdapter(IModelChangedListener.class);
+			IModelChangedListener listener = getTableViewer().getRendering().getAdapter(IModelChangedListener.class);
 			if (listener != null)
 				listener.modelChanged(node, proxy);
 		}
@@ -114,7 +114,7 @@ public class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy
 				{
 					if ((delta.getFlags() & IModelDelta.CONTENT) != 0)
 					{
-						TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor)rendering.getAdapter(TableRenderingContentDescriptor.class);
+						TableRenderingContentDescriptor descriptor = rendering.getAdapter(TableRenderingContentDescriptor.class);
 						
 						if (descriptor != null)
 						{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
index 3c5d3292c..7c3b7fc94 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
@@ -95,7 +95,7 @@ public class CopyTableRenderingToClipboardAction extends Action
 				IMemoryBlock memBlock = fRendering.getMemoryBlock();
 				if (memBlock instanceof IMemoryBlockExtension)
 				{
-					TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor)fRendering.getAdapter(TableRenderingContentDescriptor.class);
+					TableRenderingContentDescriptor descriptor = fRendering.getAdapter(TableRenderingContentDescriptor.class);
 					if (descriptor == null)
 						{
 						try {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java
index ed3705a13..d610df637 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/FormatTableRenderingDialog.java
@@ -410,7 +410,7 @@ public class FormatTableRenderingDialog extends TrayDialog
 		private int getDefaultRowSize()
 		{
 			int size = -1;
-			IPersistableDebugElement elmt = (IPersistableDebugElement)fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
+			IPersistableDebugElement elmt = fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
 			if (elmt != null)
 			{
 				if (elmt.supportsProperty(fRendering, IDebugPreferenceConstants.PREF_ROW_SIZE_BY_MODEL))
@@ -425,7 +425,7 @@ public class FormatTableRenderingDialog extends TrayDialog
 		private int getDefaultColumnSize()
 		{
 			int size = -1;
-			IPersistableDebugElement elmt = (IPersistableDebugElement)fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
+			IPersistableDebugElement elmt = fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
 			if (elmt != null)
 			{
 				if (elmt.supportsProperty(fRendering, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL))
@@ -465,7 +465,7 @@ public class FormatTableRenderingDialog extends TrayDialog
 			int columnSize = fColumnSizes[fColumnControl.getSelectionIndex()];
 			int rowSize = fRowSizes[fRowControl.getSelectionIndex()];
 			
-			IPersistableDebugElement elmt = (IPersistableDebugElement)fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
+			IPersistableDebugElement elmt = fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
 			
 			if (elmt != null && elmt.supportsProperty(fRendering, IDebugPreferenceConstants.PREF_ROW_SIZE_BY_MODEL)
 				&& elmt.supportsProperty(fRendering, IDebugPreferenceConstants.PREF_COL_SIZE_BY_MODEL))
@@ -549,7 +549,7 @@ public class FormatTableRenderingDialog extends TrayDialog
 		
 		private int getDefaultFromPersistableElement(String propertyId) {
 			int defaultValue = -1;
-			IPersistableDebugElement elmt = (IPersistableDebugElement)fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
+			IPersistableDebugElement elmt = fRendering.getMemoryBlock().getAdapter(IPersistableDebugElement.class);
 			if (elmt != null)
 			{
 				try {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
index 71ebac1d2..ef3f1e9a6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
@@ -113,7 +113,7 @@ public class PrintTableRenderingAction extends Action
 			charsPerByte = 4;
 		
 		int addressSizeInBytes = 0;
-		TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor)fRendering.getAdapter(TableRenderingContentDescriptor.class);
+		TableRenderingContentDescriptor descriptor = fRendering.getAdapter(TableRenderingContentDescriptor.class);
 		if (descriptor == null)
 		{
 			// special for address column
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java
index 62bd36369..90182653e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentInput.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -13,10 +13,12 @@ package org.eclipse.debug.internal.ui.views.memory.renderings;
 import java.math.BigInteger;
 
 import org.eclipse.core.runtime.PlatformObject;
+
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
 import org.eclipse.debug.internal.ui.memory.provisional.AbstractAsyncTableRendering;
+
 import org.eclipse.debug.ui.memory.AbstractTableRendering;
 import org.eclipse.debug.ui.memory.IMemoryRendering;
 
@@ -105,10 +107,11 @@ public class TableRenderingContentInput extends PlatformObject {
 	
 	public void updateContentBaseAddress() throws DebugException {
 		IMemoryBlock memoryBlock = fRendering.getMemoryBlock();
-		if (memoryBlock instanceof IMemoryBlockExtension)
+		if (memoryBlock instanceof IMemoryBlockExtension) {
 			fMemoryBlockBaseAddress = ((IMemoryBlockExtension)memoryBlock).getBigBaseAddress();
-		else
+		} else {
 			fMemoryBlockBaseAddress = BigInteger.valueOf(memoryBlock.getStartAddress());
+		}
 	}
 	
 	/**
@@ -123,16 +126,18 @@ public class TableRenderingContentInput extends PlatformObject {
 				if(memoryBlock instanceof IMemoryBlockExtension)
 				{
 					BigInteger startAddress = ((IMemoryBlockExtension)memoryBlock).getMemoryBlockStartAddress();
-					if (startAddress != null)
+					if (startAddress != null) {
 						fStartAddress =  startAddress;
+					}
 				}
 			} catch (DebugException e) {
 				// default to 0 if we have trouble getting the start address
 				fStartAddress =  BigInteger.valueOf(0);			
 			}
 			
-			if (fStartAddress == null)
+			if (fStartAddress == null) {
 				fStartAddress =  BigInteger.valueOf(0);
+			}
 		}
 		return fStartAddress; 
 	}
@@ -150,8 +155,9 @@ public class TableRenderingContentInput extends PlatformObject {
 				BigInteger endAddress;
 				try {
 					endAddress = ((IMemoryBlockExtension)memoryBlock).getMemoryBlockEndAddress();
-					if (endAddress != null)
+					if (endAddress != null) {
 						fEndAddress = endAddress;
+					}
 				} catch (DebugException e) {
 					fEndAddress = null;
 				}
@@ -172,8 +178,9 @@ public class TableRenderingContentInput extends PlatformObject {
 				}
 			}
 			
-			if (fEndAddress == null)
+			if (fEndAddress == null) {
 				fEndAddress = BigInteger.valueOf(Integer.MAX_VALUE);
+			}
 		}
 		return fEndAddress;
 	}
@@ -188,17 +195,20 @@ public class TableRenderingContentInput extends PlatformObject {
 		fNumLines = numLines;
 	}
 	
+	@SuppressWarnings("unchecked")
 	@Override
-	public Object getAdapter(Class adapter) {
+	public <T> T getAdapter(Class<T> adapter) {
 		if (adapter == AbstractTableRendering.class)
 		{
-			if (fRendering instanceof AbstractTableRendering)
-				return fRendering;
+			if (fRendering instanceof AbstractTableRendering) {
+				return (T) fRendering;
+			}
 		}
 		if (adapter == AbstractAsyncTableRendering.class)
 		{
-			if (fRendering instanceof AbstractAsyncTableRendering)
-				return fRendering;
+			if (fRendering instanceof AbstractAsyncTableRendering) {
+				return (T) fRendering;
+			}
 		}
 		
 		return super.getAdapter(adapter);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
index 51d14a938..5848db937 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2010 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -94,10 +94,11 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 			if (newInput instanceof TableRenderingContentInput)
 			{
 				fInput = (TableRenderingContentInput)newInput;
-				if (fInput.getMemoryBlock() instanceof IMemoryBlockExtension)
+				if (fInput.getMemoryBlock() instanceof IMemoryBlockExtension) {
 					loadContentForExtendedMemoryBlock();
-				else
+				} else {
 					loadContentForSimpleMemoryBlock();
+				}
 				
 				// tell rendering to display table if the loading is successful
 				getTableRendering(fInput).displayTable();
@@ -131,8 +132,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 			}
 		}
 		
-		if (lineCache.isEmpty())
+		if (lineCache.isEmpty()) {
 			return lineCache.toArray();
+		}
 		
 		// check to see if the row size has changed
 		TableRenderingLine line = lineCache.get(0);
@@ -187,8 +189,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 	public void loadContentForExtendedMemoryBlock() throws DebugException {
 		
 		// do not load if number of lines needed is < 0
-		if (fInput.getNumLines() <= 0)
+		if (fInput.getNumLines() <= 0) {
 			return;
+		}
 		
 		// calculate top buffered address
 		BigInteger loadAddress = fInput.getLoadAddress();
@@ -221,8 +224,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		
 		if (isDynamicLoad())
 		{
-			if (bufferStart.compareTo(mbStart) < 0)
+			if (bufferStart.compareTo(mbStart) < 0) {
 				bufferStart = mbStart;
+			}
 			
 			if (bufferEnd.compareTo(mbEnd) > 0)
 			{
@@ -238,13 +242,15 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 				
 				// if after adjusting buffer start, it goes before the memory block start 
 				// address, adjust it back
-				if (bufferStart.compareTo(mbStart) < 0)
+				if (bufferStart.compareTo(mbStart) < 0) {
 					bufferStart = mbStart;
+				}
 			}
 			
 			// buffer end must be greater than buffer start
-			if (bufferEnd.compareTo(bufferStart) <= 0)
+			if (bufferEnd.compareTo(bufferStart) <= 0) {
 				throw new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.TableRenderingContentProvider_1, null));
+			}
 			
 			int numLines = bufferEnd.subtract(bufferStart).divide(BigInteger.valueOf(addressableUnitsPerLine)).intValue()+1;		
 			// get stoarage to fit the memory view tab size
@@ -252,8 +258,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		}
 		else
 		{
-			if (bufferStart.compareTo(mbStart) < 0)
+			if (bufferStart.compareTo(mbStart) < 0) {
 				bufferStart = mbStart;
+			}
 			
 			if (bufferEnd.compareTo(mbEnd) > 0)
 			{
@@ -261,19 +268,22 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 				bufferEnd = mbEnd;
 				
 				// after adjusting buffer start, check if it's smaller than memory block's start address
-				if (bufferStart.compareTo(mbStart) < 0)
+				if (bufferStart.compareTo(mbStart) < 0) {
 					bufferStart = mbStart;
+				}
 			}
 			
 			// buffer end must be greater than buffer start
-			if (bufferEnd.compareTo(bufferStart) <= 0)
+			if (bufferEnd.compareTo(bufferStart) <= 0) {
 				throw new DebugException(DebugUIPlugin.newErrorStatus(DebugUIMessages.TableRenderingContentProvider_2, null));
+			}
 			
 			int numLines = fInput.getNumLines();	
 			int bufferNumLines = bufferEnd.subtract(bufferStart).divide(BigInteger.valueOf(addressableUnitsPerLine)).intValue()+1;
 			
-			if (bufferNumLines < numLines)
+			if (bufferNumLines < numLines) {
 				numLines = bufferNumLines;
+			}
 			
 			// get stoarage to fit the memory view tab size
 			getMemoryToFitTable(bufferStart, numLines, fInput.isUpdateDelta());
@@ -300,8 +310,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		// is already terminated
 		IDebugTarget target = fInput.getMemoryBlock().getDebugTarget();
 		
-		if (target.isDisconnected() || target.isTerminated())
+		if (target.isDisconnected() || target.isTerminated()) {
 			return;
+		}
 		
 		DebugException dbgEvt = null;
 		
@@ -544,10 +555,11 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 			
 			if (manageDelta)
 			{
-				if (oldLine != null)
+				if (oldLine != null) {
 					newLine.isMonitored = true;
-				else
+				} else {
 					newLine.isMonitored = false;
+				}
 			}
 			else
 			{
@@ -631,17 +643,20 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 			// only do this if it's visible
 			// still need to clear content cache if the rendering
 			// is not visible
-			if (isUpdateManagedByMB())
+			if (isUpdateManagedByMB()) {
 				return;
+			}
 		}
 		
 		// do nothing if the debug event did not come from a debug element comes from non-debug element
-		if (!(event.getSource() instanceof IDebugElement))
+		if (!(event.getSource() instanceof IDebugElement)) {
 			return;
+		}
 		
 		// do not try to recover if the content input has not been created
-		if (fInput == null)
+		if (fInput == null) {
 			return;
+		}
 		
 		IDebugElement src = (IDebugElement)event.getSource();
 		
@@ -686,8 +701,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		takeContentSnapshot();
 		
 		//do not handle event if the rendering is not visible
-		if (!getTableRendering(fInput).isVisible())
-			 return;
+		if (!getTableRendering(fInput).isVisible()) {
+			return;
+		}
 		
 		getTableRendering(fInput).refresh();
 		
@@ -709,8 +725,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		}
 		
 		//do not handle event if the rendering is not visible
-		if (!getTableRendering(fInput).isVisible())
-			 return;
+		if (!getTableRendering(fInput).isVisible()) {
+			return;
+		}
 		
 		// use existing lines as cache is the rendering is not currently displaying
 		// error.  Otherwise, leave contentCache empty as we do not have updated
@@ -809,8 +826,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 			TableRenderingLine first = lineCache.firstElement();
 			TableRenderingLine last = lineCache.lastElement();
 			
-			if (first == null ||last == null)
+			if (first == null ||last == null) {
 				return true;
+			}
 			
 			BigInteger startAddress = new BigInteger(first.getAddress(), 16);
 			BigInteger lastAddress = new BigInteger(last.getAddress(), 16);
@@ -847,13 +865,15 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 			managedMB = (IMemoryRenderingUpdater)memoryBlock;
 		}
 		
-		if (managedMB == null)
-			managedMB = (IMemoryRenderingUpdater)memoryBlock.getAdapter(IMemoryRenderingUpdater.class);
+		if (managedMB == null) {
+			managedMB = memoryBlock.getAdapter(IMemoryRenderingUpdater.class);
+		}
 		
 		// do not handle event if if the memory block wants to do its
 		// own update
-		if (managedMB != null && managedMB.supportsManagedUpdate(getTableRendering(fInput)))
+		if (managedMB != null && managedMB.supportsManagedUpdate(getTableRendering(fInput))) {
 			return true;
+		}
 		
 		return false;
 	}
@@ -875,8 +895,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 	
 	private void reorganizeLines(Vector<TableRenderingLine> lines, int numBytesPerLine) throws DebugException
 	{
-		if (lines == null || lines.isEmpty())
+		if (lines == null || lines.isEmpty()) {
 			return;
+		}
 		
 		Object[] objs = lines.toArray();
 		
@@ -912,8 +933,9 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 	{
 		// if content cache is empty, do nothing
 		if (contentCache == null || contentCache.isEmpty()
-			|| fContentCacheInBytes.length == 0 || fContentCacheStartAddress == null)
+			|| fContentCacheInBytes.length == 0 || fContentCacheStartAddress == null) {
 			return;
+		}
 		
 		MemoryByte[] bytes = fContentCacheInBytes;
 		TableRenderingLine[] convertedLines = convertBytesToLines(bytes, bytesPerLine, new BigInteger(fContentCacheStartAddress, 16));
@@ -984,6 +1006,6 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 	
 	private AbstractTableRendering getTableRendering(TableRenderingContentInput input)
 	{
-		return (AbstractTableRendering)input.getAdapter(AbstractTableRendering.class);
+		return input.getAdapter(AbstractTableRendering.class);
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java
index 5623ba8ef..3718c163c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,7 +35,7 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv
 	
 	public TableRenderingLabelProvider(AbstractTableRendering rendering){
 		super(rendering);
-		fTablePresentation = (IMemoryBlockTablePresentation)rendering.getAdapter(IMemoryBlockTablePresentation.class);
+		fTablePresentation = rendering.getAdapter(IMemoryBlockTablePresentation.class);
 	}
 	
 	
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java
index 40f059d7b..c3ab9d8e3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,9 +39,9 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i
 
 	public TableRenderingLabelProviderEx(AbstractTableRendering rendering) {
 		super(rendering);
-		fLabelProvider = (ILabelProvider) rendering.getAdapter(ILabelProvider.class);
-		fColorProvider = (IColorProvider) rendering.getAdapter(IColorProvider.class);
-		fFontProvider = (IFontProvider) rendering.getAdapter(IFontProvider.class);
+		fLabelProvider = rendering.getAdapter(ILabelProvider.class);
+		fColorProvider = rendering.getAdapter(IColorProvider.class);
+		fFontProvider = rendering.getAdapter(IFontProvider.class);
 	}
 
 	/*
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java
index 6cf038350..998e8e508 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2013 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -264,7 +264,7 @@ public class TableRenderingModel extends AbstractVirtualContentTableModel implem
 
 		clearCache();
 
-		TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor) rendering.getAdapter(TableRenderingContentDescriptor.class);
+		TableRenderingContentDescriptor descriptor = rendering.getAdapter(TableRenderingContentDescriptor.class);
 		boolean alignAddress = true;
 		if (descriptor != null && !descriptor.isAlignAddressToBoundary()) {
 			alignAddress = descriptor.isAlignAddressToBoundary();
@@ -301,7 +301,7 @@ public class TableRenderingModel extends AbstractVirtualContentTableModel implem
 
 		int addressableSize = rendering.getAddressableSize();
 
-		TableRenderingContentDescriptor descriptor = (TableRenderingContentDescriptor) rendering.getAdapter(TableRenderingContentDescriptor.class);
+		TableRenderingContentDescriptor descriptor = rendering.getAdapter(TableRenderingContentDescriptor.class);
 		boolean alignAddress = true;
 		if (descriptor != null && !descriptor.isAlignAddressToBoundary()) {
 			alignAddress = descriptor.isAlignAddressToBoundary();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java
index ae7f4c411..578910e77 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java
@@ -131,7 +131,7 @@ public class ModulesView extends VariablesView {
 		if (context instanceof IAdaptable) {
 			IAdaptable adaptable = (IAdaptable) context;
 			if (adaptable.getAdapter(IHelpContextIdProvider.class) != null) {
-				IHelpContextIdProvider provider = (IHelpContextIdProvider) adaptable
+				IHelpContextIdProvider provider = adaptable
 						.getAdapter(IHelpContextIdProvider.class);
 				String helpId = provider.getHelpContextId(IDebugHelpContextIds.MODULES_VIEW);
 				if (helpId != null) {
@@ -164,7 +164,7 @@ public class ModulesView extends VariablesView {
 		if (context instanceof IAdaptable) {
 			IAdaptable adaptable = (IAdaptable) context;
 			if (adaptable.getAdapter(ILabelProvider.class) != null) {
-				ILabelProvider provider = (ILabelProvider) adaptable
+				ILabelProvider provider = adaptable
 						.getAdapter(ILabelProvider.class);
 				String label = provider.getText(this);
 				if (label != null)
@@ -179,7 +179,7 @@ public class ModulesView extends VariablesView {
 		if (context instanceof IAdaptable) {
 			IAdaptable adaptable = (IAdaptable) context;
 			if (adaptable.getAdapter(ILabelProvider.class) != null) {
-				ILabelProvider provider = (ILabelProvider) adaptable
+				ILabelProvider provider = adaptable
 						.getAdapter(ILabelProvider.class);
 				Image image = provider.getImage(this);
 				if (image != null)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
index 33a0952fb..67be772b6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -128,7 +128,7 @@ public class IndexedValuePartition implements IIndexedValue {
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
 	@Override
-	public Object getAdapter(Class adapter) {
+	public <T> T getAdapter(Class<T> adapter) {
 		return fValue.getAdapter(adapter);
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java
index 93ec5fd68..4b9cd843e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java
@@ -123,7 +123,7 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I
 	}
 	
 	protected StructuredViewer getStructuredViewer() {
-		IDebugView view = (IDebugView)getView().getAdapter(IDebugView.class);
+		IDebugView view = getView().getAdapter(IDebugView.class);
 		if (view != null) {
 			Viewer viewer = view.getViewer();
 			if (viewer instanceof StructuredViewer) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
index 4e295beb6..1e43e7e4a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
@@ -1516,7 +1516,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis
 	public synchronized void viewerUpdatesBegin() {
 		fTriggerDetailsJob.cancel();
         IWorkbenchSiteProgressService progressService = 
-            (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class);
+            getSite().getAdapter(IWorkbenchSiteProgressService.class);
         if (progressService != null) {
             progressService.incrementBusy();
         }
@@ -1531,7 +1531,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis
 			fTriggerDetailsJob.schedule();
 		}
         IWorkbenchSiteProgressService progressService = 
-            (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class);
+            getSite().getAdapter(IWorkbenchSiteProgressService.class);
         if (progressService != null) {
             progressService.decrementBusy();
         }       
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
index 51e753bb3..823db6fdd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2006, 2013 IBM Corporation and others.
+ *  Copyright (c) 2006, 2015 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -17,13 +17,16 @@ import java.util.Iterator;
 import java.util.ResourceBundle;
 
 import org.eclipse.core.commands.operations.IUndoContext;
+
 import org.eclipse.core.resources.IMarker;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.IDebugElement;
@@ -42,11 +45,13 @@ import org.eclipse.debug.internal.ui.actions.variables.details.DetailPaneWordWra
 import org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointContainer;
 import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants;
 import org.eclipse.debug.internal.ui.views.variables.IndexedValuePartition;
+
 import org.eclipse.debug.ui.IDebugModelPresentation;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.debug.ui.IDebugView;
 import org.eclipse.debug.ui.IDetailPane2;
 import org.eclipse.debug.ui.IValueDetailListener;
+
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -56,6 +61,7 @@ import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.action.StatusLineContributionItem;
 import org.eclipse.jface.commands.ActionHandler;
 import org.eclipse.jface.resource.JFaceResources;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.DocumentEvent;
@@ -69,12 +75,14 @@ import org.eclipse.jface.text.IUndoManagerExtension;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jface.text.source.SourceViewerConfiguration;
+
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.DisposeEvent;
@@ -90,6 +98,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
+
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchCommandConstants;
 import org.eclipse.ui.PlatformUI;
@@ -102,6 +111,7 @@ import org.eclipse.ui.operations.OperationHistoryActionHandler;
 import org.eclipse.ui.operations.RedoActionHandler;
 import org.eclipse.ui.operations.UndoActionHandler;
 import org.eclipse.ui.progress.WorkbenchJob;
+
 import org.eclipse.ui.texteditor.FindReplaceAction;
 import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
@@ -212,7 +222,7 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 					IBreakpointContainer c = (IBreakpointContainer) element;
 		            IAdaptable category = c.getCategory();
 		            if (category != null) {
-			            IWorkbenchAdapter adapter = (IWorkbenchAdapter) category.getAdapter(IWorkbenchAdapter.class);
+			            IWorkbenchAdapter adapter = category.getAdapter(IWorkbenchAdapter.class);
 			            if (adapter != null) {
 			                message = adapter.getLabel(category);
 			            } else {
@@ -739,13 +749,14 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
-	public Object getAdapter(Class required) {
+	public <T> T getAdapter(Class<T> required) {
 		if (IFindReplaceTarget.class.equals(required)) {
-			return fSourceViewer.getFindReplaceTarget();
+			return (T) fSourceViewer.getFindReplaceTarget();
 		}
 		if (ITextViewer.class.equals(required)) {
-			return fSourceViewer;
+			return (T) fSourceViewer;
 		}
 		return null;
 	}