diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
index 05f676f5c53..77b79b3e27c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/CSourceNotFoundDescriptionFactory.java
@@ -35,6 +35,7 @@ import com.ibm.icu.text.MessageFormat;
  */
 public class CSourceNotFoundDescriptionFactory implements IAdapterFactory {
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (adapterType.equals(ICSourceNotFoundDescription.class) &&
@@ -43,6 +44,7 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory {
 			final IFrameDMContext frameDMC = (IFrameDMContext) adaptableObject;
 			return new ICSourceNotFoundDescription() {
 
+				@Override
 				public String getDescription() {
 		               Query<IStack.IFrameDMData> query = new Query<IStack.IFrameDMData>() {
 		                    @Override
@@ -77,6 +79,7 @@ public class CSourceNotFoundDescriptionFactory implements IAdapterFactory {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return new Class[] { ICSourceNotFoundDescription.class };
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java
index 8458c7d604a..0ae330638a2 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/DebugTextHoverAdapterFactory.java
@@ -28,7 +28,8 @@ public class DebugTextHoverAdapterFactory implements IAdapterFactory {
     private static final Class<?>[] TYPES = { ICEditorTextHover.class };
     private static final Object fDebugTextHover= new DsfDebugTextHover();
     
-    @SuppressWarnings("rawtypes")
+    @Override
+	@SuppressWarnings("rawtypes")
     public Object getAdapter(Object adaptableObject, Class adapterType) {
         if (adaptableObject instanceof IDMVMContext) {
         	IDMContext dmc = ((IDMVMContext) adaptableObject).getDMContext();
@@ -46,7 +47,8 @@ public class DebugTextHoverAdapterFactory implements IAdapterFactory {
         return null;
     }
 
-    @SuppressWarnings("rawtypes")
+    @Override
+	@SuppressWarnings("rawtypes")
     public Class[] getAdapterList() {
         return TYPES;
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java
index aa56811d137..e95804e8780 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java
@@ -59,6 +59,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	public static void startup() {
 		Runnable r = new Runnable() {
 
+			@Override
 			public void run() {
 				if ( fgManager == null ) {
 					fgManager = new EvaluationContextManager();
@@ -80,6 +81,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
 	 */
+	@Override
 	public void windowActivated( IWorkbenchWindow window ) {
 		windowOpened( window );
 	}
@@ -87,12 +89,14 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
 	 */
+	@Override
 	public void windowDeactivated( IWorkbenchWindow window ) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
 	 */
+	@Override
 	public void windowClosed( IWorkbenchWindow window ) {
 		window.removePageListener( this );
 	}
@@ -100,6 +104,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
 	 */
+	@Override
 	public void windowOpened( IWorkbenchWindow window ) {
 		IWorkbenchPage[] pages = window.getPages();
 		for( int i = 0; i < pages.length; i++ ) {
@@ -111,6 +116,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPageListener#pageActivated(org.eclipse.ui.IWorkbenchPage)
 	 */
+	@Override
 	public void pageActivated( IWorkbenchPage page ) {
 		pageOpened( page );
 	}
@@ -118,6 +124,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPageListener#pageClosed(org.eclipse.ui.IWorkbenchPage)
 	 */
+	@Override
 	public void pageClosed( IWorkbenchPage page ) {
 		page.removeSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this );
 		page.removePartListener( this );
@@ -126,6 +133,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPageListener#pageOpened(org.eclipse.ui.IWorkbenchPage)
 	 */
+	@Override
 	public void pageOpened( IWorkbenchPage page ) {
 		page.addSelectionListener( IDebugUIConstants.ID_DEBUG_VIEW, this );
 		page.addPartListener( this );
@@ -138,6 +146,7 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void selectionChanged( IWorkbenchPart part, ISelection selection ) {
 		IWorkbenchPage page = part.getSite().getPage();
 		if ( selection instanceof IStructuredSelection ) {
@@ -157,18 +166,21 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partActivated( IWorkbenchPartReference partRef ) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partBroughtToTop( IWorkbenchPartReference partRef ) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partClosed( IWorkbenchPartReference partRef ) {
 		if ( IDebugUIConstants.ID_DEBUG_VIEW.equals( partRef.getId() ) ) {
 			removeContext( partRef.getPage() );
@@ -178,30 +190,35 @@ public class EvaluationContextManager implements IWindowListener, IPageListener,
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partDeactivated( IWorkbenchPartReference partRef ) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partOpened( IWorkbenchPartReference partRef ) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partHidden( IWorkbenchPartReference partRef ) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partVisible( IWorkbenchPartReference partRef ) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference)
 	 */
+	@Override
 	public void partInputChanged( IWorkbenchPartReference partRef ) {
 	}
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java
index a8587ca401a..88239eb1769 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ExpressionInformationControlCreator.java
@@ -138,6 +138,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			/*
 			 * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentPaneID()
 			 */
+			@Override
 			public String getCurrentPaneID() {
 				return fDetailPane.getCurrentPaneID();
 			}
@@ -145,6 +146,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			/*
 			 * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getCurrentSelection()
 			 */
+			@Override
 			public IStructuredSelection getCurrentSelection() {
 				return (IStructuredSelection)fViewer.getSelection();
 			}
@@ -152,6 +154,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			/*
 			 * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#refreshDetailPaneContents()
 			 */
+			@Override
 			public void refreshDetailPaneContents() {		
 				fDetailPane.display(getCurrentSelection());
 			}
@@ -159,6 +162,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			/*
 			 * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getParentComposite()
 			 */
+			@Override
 			public Composite getParentComposite() {
 				return fDetailPaneComposite;
 			}
@@ -166,6 +170,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			/*
 			 * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#getWorkbenchPartSite()
 			 */
+			@Override
 			public IWorkbenchPartSite getWorkbenchPartSite() {
 				return null;
 			}
@@ -173,6 +178,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			/*
 			 * @see org.eclipse.debug.internal.ui.views.variables.details.IDetailPaneContainer#paneChanged(java.lang.String)
 			 */
+			@Override
 			public void paneChanged(String newPaneID) {
 				if (DefaultDetailPane.ID.equals(newPaneID)){
 					fDetailPane.getCurrentControl().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
@@ -335,10 +341,12 @@ public class ExpressionInformationControlCreator implements IInformationControlC
     			fDetailPane.display(null); // Bring up the default pane so the user doesn't see an empty composite
     
     			fTree.addSelectionListener(new SelectionListener() {
-    				public void widgetSelected(SelectionEvent e) {
+    				@Override
+					public void widgetSelected(SelectionEvent e) {
     					fDetailPane.display((IStructuredSelection)fViewer.getSelection());
     				}
-    				public void widgetDefaultSelected(SelectionEvent e) {}
+    				@Override
+					public void widgetDefaultSelected(SelectionEvent e) {}
     			});
             }
             
@@ -346,9 +354,11 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 
 			// add update listener to auto-select and display details of root expression
 			fViewer.addViewerUpdateListener(new IViewerUpdateListener() {
+				@Override
 				public void viewerUpdatesComplete() {
                     fViewer.getDisplay().timerExec(100, new Runnable() {
-                        public void run() {
+                        @Override
+						public void run() {
                             TreeSelection selection = (TreeSelection) fViewer.getSelection();
                             if (selection.isEmpty()) {
                                 selection = new TreeSelection(fViewer.getTopElementPath());
@@ -359,10 +369,13 @@ public class ExpressionInformationControlCreator implements IInformationControlC
                             }
                         }});
 				}
+				@Override
 				public void viewerUpdatesBegin() {
 				}
+				@Override
 				public void updateStarted(IViewerUpdate update) {
 				}
+				@Override
 				public void updateComplete(IViewerUpdate update) {
 				}
 			});
@@ -433,6 +446,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 		/*
 		 * @see org.eclipse.jface.text.IInformationControlExtension#hasContents()
 		 */
+		@Override
 		public boolean hasContents() {
 			return fVariable != null;
 		}
@@ -440,6 +454,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 		/*
 		 * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
 		 */
+		@Override
 		public void setInput(Object input) {
 			if (input instanceof IExpressionDMContext) {
 				fVariable = input;
@@ -460,6 +475,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			return fInformationControlCreator;
 		}
 
+		@Override
 		public void viewerInputComplete(IViewerInputUpdate update) {
 			fViewer.setInput(fVariable = update.getInputElement());
 		}
@@ -493,6 +509,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
     /*
 	 * @see org.eclipse.jface.text.IInformationControlCreator#createInformationControl(org.eclipse.swt.widgets.Shell)
 	 */
+	@Override
 	public IInformationControl createInformationControl(Shell parent) {
 		return new ExpressionInformationControl(parent, false);
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java
index ea1667c4c56..935c243fed1 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/SuspendResumeAdapterFactory.java
@@ -43,7 +43,8 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory {
             fResumeAtLine = new ResumeAtLine(execCtx);
         }
         
-        @SuppressWarnings("rawtypes")
+        @Override
+		@SuppressWarnings("rawtypes")
         public Object getAdapter(Class adapter) {
             if (adapter.isInstance(fRunToLine)) {
                 return fRunToLine;
@@ -57,17 +58,23 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory {
             return null;
         }
 
-        public boolean canResume() { return false; }
-        public boolean canSuspend() { return false; }
+        @Override
+		public boolean canResume() { return false; }
+        @Override
+		public boolean canSuspend() { return false; }
         // This must return true because the platform
         // RunToLineActionDelegate will only enable the
         // action if we are suspended
-        public boolean isSuspended() { return true; }
-        public void resume() throws DebugException {}
-        public void suspend() throws DebugException {}
+        @Override
+		public boolean isSuspended() { return true; }
+        @Override
+		public void resume() throws DebugException {}
+        @Override
+		public void suspend() throws DebugException {}
     }
     
-    @SuppressWarnings("rawtypes")
+    @Override
+	@SuppressWarnings("rawtypes")
     public Object getAdapter(Object adaptableObject, Class adapterType) {
         if (ISuspendResume.class.equals(adapterType)) {
             if (adaptableObject instanceof IDMVMContext) {
@@ -84,7 +91,8 @@ public class SuspendResumeAdapterFactory implements IAdapterFactory {
         return null;
     }
 
-    @SuppressWarnings("rawtypes")
+    @Override
+	@SuppressWarnings("rawtypes")
     public Class[] getAdapterList() {
         return new Class[] { ISuspendResume.class };
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java
index e1f7a66a79a..67a906f7ced 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java
@@ -60,6 +60,7 @@ public class ToggleBreakpointsTargetFactory implements IToggleBreakpointsTargetF
 	public ToggleBreakpointsTargetFactory() {
 	}
 
+    @Override
 	public IToggleBreakpointsTarget createToggleTarget(String targetID) {
 		if (TOGGLE_C_BREAKPOINT_TARGET_ID.equals(targetID)) {
 			return fgDisassemblyToggleBreakpointsTarget;
@@ -67,6 +68,7 @@ public class ToggleBreakpointsTargetFactory implements IToggleBreakpointsTargetF
 		return null;
 	}
 
+    @Override
 	public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) {
 		if (part instanceof IDisassemblyPart) {
 	        // Return the debug context as a default if the currently selected context
@@ -94,14 +96,17 @@ public class ToggleBreakpointsTargetFactory implements IToggleBreakpointsTargetF
 		return null;
 	}
 
+    @Override
 	public String getToggleTargetDescription(String targetID) {
 		return Messages.ToggleBreakpointsTargetFactory_description;
 	}
 
+    @Override
 	public String getToggleTargetName(String targetID) {
 		return Messages.ToggleBreakpointsTargetFactory_name;
 	}
 
+    @Override
 	public Set<String> getToggleTargets(IWorkbenchPart part, ISelection selection) {
 		if (part instanceof IDisassemblyPart) {
 			return TOGGLE_TARGET_IDS;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyMoveToLineAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyMoveToLineAdapter.java
index fc8b2965460..275a458a567 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyMoveToLineAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyMoveToLineAdapter.java
@@ -37,6 +37,7 @@ import org.eclipse.ui.IWorkbenchPart;
  */
 public class DisassemblyMoveToLineAdapter implements IMoveToLineTarget {
 
+	@Override
 	public void moveToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) throws CoreException {
 		if (part instanceof IDisassemblyPart && selection instanceof ITextSelection) {
 			if (!(selection instanceof IDisassemblySelection)) {
@@ -59,6 +60,7 @@ public class DisassemblyMoveToLineAdapter implements IMoveToLineTarget {
 		}
 	}
 
+	@Override
 	public boolean canMoveToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) {
 		if (target instanceof IAdaptable && part instanceof IDisassemblyPart && selection instanceof ITextSelection) {
 			IMoveToAddress moveToAddress = (IMoveToAddress)((IAdaptable)target).getAdapter(IMoveToAddress.class);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyResumeAtLineAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyResumeAtLineAdapter.java
index 112f91225c7..76664b8eb66 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyResumeAtLineAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyResumeAtLineAdapter.java
@@ -37,6 +37,7 @@ import org.eclipse.ui.IWorkbenchPart;
  */
 public class DisassemblyResumeAtLineAdapter implements IResumeAtLineTarget {
 
+	@Override
 	public void resumeAtLine(IWorkbenchPart part, ISelection selection,	ISuspendResume target) throws CoreException {
 		if (part instanceof IDisassemblyPart && selection instanceof ITextSelection) {
 			if (!(selection instanceof IDisassemblySelection)) {
@@ -59,6 +60,7 @@ public class DisassemblyResumeAtLineAdapter implements IResumeAtLineTarget {
 		}
 	}
 
+	@Override
 	public boolean canResumeAtLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) {
 		if (target instanceof IAdaptable && part instanceof IDisassemblyPart && selection instanceof ITextSelection) {
 			IResumeAtAddress resumeAtAddress = (IResumeAtAddress)((IAdaptable)target).getAdapter(IResumeAtAddress.class);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyRunToLineAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyRunToLineAdapter.java
index 5ebca3316ce..7b13412a2e7 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyRunToLineAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/DisassemblyRunToLineAdapter.java
@@ -42,6 +42,7 @@ public class DisassemblyRunToLineAdapter implements IRunToLineTarget {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IRunToLineTarget#runToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
 	 */
+	@Override
 	public void runToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) throws CoreException {
 		if (part instanceof IDisassemblyPart && selection instanceof ITextSelection) {
 			if (!(selection instanceof IDisassemblySelection)) {
@@ -68,6 +69,7 @@ public class DisassemblyRunToLineAdapter implements IRunToLineTarget {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IRunToLineTarget#canRunToLine(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.core.model.ISuspendResume)
 	 */
+	@Override
 	public boolean canRunToLine(IWorkbenchPart part, ISelection selection, ISuspendResume target) {
 		if (target instanceof IAdaptable && part instanceof IDisassemblyPart && selection instanceof ITextSelection) {
 			IRunToAddress runToAddress = (IRunToAddress)((IAdaptable)target).getAdapter(IRunToAddress.class);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
index 717291fdaa6..fa37c410917 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/MoveToLine.java
@@ -41,6 +41,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
         fContext = context;
     }
 
+    @Override
 	public boolean canMoveToLine(final String fileName, final int lineNumber) {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -71,6 +72,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
         return false;
     }
 
+    @Override
 	public void moveToLine(final String fileName, final int lineNumber) throws DebugException {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -110,6 +112,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
         }
     }
 	
+    @Override
 	public boolean canMoveToAddress(final IAddress address) {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -140,6 +143,7 @@ public class MoveToLine implements IMoveToLine, IMoveToAddress {
         return false;
     }
 
+    @Override
 	public void moveToAddress(final IAddress address) throws DebugException {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
index 3d7fa080556..7a3e12be86b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/ResumeAtLine.java
@@ -42,10 +42,12 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
         fContext = context;
     }
 
+	@Override
 	public boolean canResumeAtLine(IFile file, final int lineNumber) {
 		return canResumeAtLine(file.getLocation().makeAbsolute().toOSString(), lineNumber);
 	}
 
+	@Override
 	public boolean canResumeAtLine(final String fileName, final int lineNumber) {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -76,10 +78,12 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
         return false;
     }
 	
+	@Override
 	public void resumeAtLine(IFile file, int lineNumber) throws DebugException {
 		resumeAtLine(file.getLocation().makeAbsolute().toOSString(), lineNumber);
 	}
 	
+	@Override
 	public void resumeAtLine(final String fileName, final int lineNumber) throws DebugException {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -119,6 +123,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
         }
     }
 	
+	@Override
 	public boolean canResumeAtAddress(final IAddress address) {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -149,6 +154,7 @@ public class ResumeAtLine implements IResumeAtLine, IResumeAtAddress {
         return false;
     }
 
+	@Override
 	public void resumeAtAddress(final IAddress address) throws DebugException {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java
index 38dffce1f7b..da7e2ebc45e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RetargettableActionAdapterFactory.java
@@ -25,6 +25,7 @@ public class RetargettableActionAdapterFactory implements IAdapterFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
 	 */
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (adapterType == IRunToLineTarget.class) {
@@ -42,6 +43,7 @@ public class RetargettableActionAdapterFactory implements IAdapterFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return new Class[]{ IRunToLineTarget.class, IResumeAtLineTarget.class, IMoveToLineTarget.class };
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
index e9fec4b7112..51ea10899fc 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/actions/RunToLine.java
@@ -45,11 +45,13 @@ public class RunToLine implements IRunToLine, IRunToAddress {
         fContext = context;
     }
     
-    public boolean canRunToLine(final IFile file, final int lineNumber) {
+    @Override
+	public boolean canRunToLine(final IFile file, final int lineNumber) {
     	return canRunToLine(file.getLocation().makeAbsolute().toOSString(), lineNumber);
      }
 
-    public boolean canRunToLine(final String fileName, final int lineNumber) {
+    @Override
+	public boolean canRunToLine(final String fileName, final int lineNumber) {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
             try {
@@ -79,11 +81,13 @@ public class RunToLine implements IRunToLine, IRunToAddress {
         return false;
     }
 
-    public void runToLine(IFile file, int lineNumber, boolean skipBreakpoints) throws DebugException {
+    @Override
+	public void runToLine(IFile file, int lineNumber, boolean skipBreakpoints) throws DebugException {
     	runToLine(file.getLocation().makeAbsolute().toOSString(), lineNumber, skipBreakpoints);
     }
     
-    public void runToLine(final String fileName, final int lineNumber, final boolean skipBreakpoints) throws DebugException {
+    @Override
+	public void runToLine(final String fileName, final int lineNumber, final boolean skipBreakpoints) throws DebugException {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
             Throwable exception = null;
@@ -122,6 +126,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
         }
     }
     
+	@Override
 	public boolean canRunToAddress(final IAddress address) {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
@@ -152,6 +157,7 @@ public class RunToLine implements IRunToLine, IRunToAddress {
         return false;
     }
 
+	@Override
 	public void runToAddress(final IAddress address, final boolean skipBreakpoints) throws DebugException {
         DsfSession session = DsfSession.getSession(fContext.getSessionId());
         if (session != null && session.isActive()) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/DebugViewLayoutTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/DebugViewLayoutTester.java
index 2ef82d481d6..4313a6986b4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/DebugViewLayoutTester.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/DebugViewLayoutTester.java
@@ -28,6 +28,7 @@ public class DebugViewLayoutTester extends PropertyTester{
 	protected static final String IS_GROUP_VISIBLE = "isGroupDebugContextsVisible"; //$NON-NLS-1$
 	protected static final String IS_UNGROUP_VISIBLE = "isUngroupDebugContextsVisible"; //$NON-NLS-1$
 	
+	@Override
 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
 
 		if( IS_GROUP_VISIBLE.equals(property) || IS_UNGROUP_VISIBLE.equals(property)) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/actions/DsfDebugViewLayoutCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/actions/DsfDebugViewLayoutCommand.java
index 354deb80239..a50ed52752a 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/actions/DsfDebugViewLayoutCommand.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/debugview/layout/actions/DsfDebugViewLayoutCommand.java
@@ -84,10 +84,12 @@ public abstract class DsfDebugViewLayoutCommand implements IDebugCommandHandler{
     	return ret.toArray(new IExecutionDMContext[0]);
     }
     
+	@Override
 	public void canExecute(final IEnabledStateRequest request) {
 		final IExecutionDMContext[] executionContexts = getDMContexts( request);
 		if( executionContexts.length > 0 && !fExecutor.isTerminated()) {
 	        fExecutor.submit(new DsfRunnable() {
+				@Override
 				public void run() {
 					IExecutionContextTranslator translator = fTracker.getService(IExecutionContextTranslator.class);
 					if( translator != null) {
@@ -114,10 +116,12 @@ public abstract class DsfDebugViewLayoutCommand implements IDebugCommandHandler{
 		}
 	}
 
+	@Override
 	public boolean execute(final IDebugCommandRequest request) {
 		final IExecutionDMContext[] executionContexts = getDMContexts( request);
 		if( executionContexts.length > 0 && !fExecutor.isTerminated()) {
 	        fExecutor.submit(new DsfRunnable() {
+				@Override
 				public void run() {
 					IExecutionContextTranslator translator = fTracker.getService(IExecutionContextTranslator.class);
 					if( translator != null) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
index 19b84a4110c..88bc428176a 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsf.java
@@ -98,6 +98,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#dispose()
 	 */
+	@Override
 	public void dispose() {
 		DsfSession.removeSessionEndedListener(this);
 	}
@@ -141,6 +142,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
     /* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#supportsDebugContext(org.eclipse.core.runtime.IAdaptable)
 	 */
+	@Override
 	public boolean supportsDebugContext(IAdaptable context) {
 		return supportsDebugContext_(context);
 	}
@@ -148,6 +150,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#hasDebugContext()
 	 */
+	@Override
 	public boolean hasDebugContext() {
 		return fTargetContext != null;
 	}
@@ -155,6 +158,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#setDebugContext(org.eclipse.core.runtime.IAdaptable)
 	 */
+	@Override
 	public SetDebugContextResult setDebugContext(IAdaptable context) {
 		assert supportsDebugContext(context) : "caller should not have invoked us"; //$NON-NLS-1$
 		IDMVMContext vmContext = (IDMVMContext) context.getAdapter(IDMVMContext.class);
@@ -187,7 +191,8 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 		        	if (prevSession != null) {
 		        		try {
 		        			prevSession.getExecutor().execute(new DsfRunnable() {
-		        				public void run() {
+		        				@Override
+								public void run() {
 		        					prevSession.removeServiceEventListener(DisassemblyBackendDsf.this);
 		        				}
 		        			});
@@ -208,7 +213,8 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	        	if (newSession != null) {
 	        		try {
 	        			newSession.getExecutor().execute(new DsfRunnable() {
-	        				public void run() {
+	        				@Override
+							public void run() {
 	        					newSession.addServiceEventListener(DisassemblyBackendDsf.this, null);
 	        				}
 	        			});
@@ -248,11 +254,13 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#clearDebugContext()
 	 */
+	@Override
 	public void clearDebugContext() {
 		final DsfSession session = DsfSession.getSession(fDsfSessionId);
 		if (session != null) {
 			try {
 				session.getExecutor().execute(new DsfRunnable() {
+					@Override
 					public void run() {
 						session.removeServiceEventListener(DisassemblyBackendDsf.this);
 					}
@@ -271,9 +279,11 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#retrieveFrameAddress(int)
 	 */
+	@Override
 	public void retrieveFrameAddress(final int frame) {
 		final DsfExecutor executor= getSession().getExecutor();
 		executor.execute(new DsfRunnable() {
+			@Override
 			public void run() {
 				retrieveFrameAddressInSessionThread(frame);
 			}});
@@ -322,6 +332,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 					final BigInteger addressValue= address.getValue();
 					if (DEBUG) System.out.println("retrieveFrameAddress done "+ DisassemblyUtils.getAddressText(addressValue)); //$NON-NLS-1$
 					fCallback.asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							if (address.getSize() * 8 != fCallback.getAddressSize()) {
 								fCallback.addressSizeChanged(address.getSize() * 8);
@@ -346,6 +357,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#isSuspended()
 	 */
+	@Override
 	public boolean isSuspended() {
 		DsfSession session = getSession();
 		if (session == null || !session.isActive()) {
@@ -410,6 +422,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 		if (context.equals(fTargetContext)
 				|| DMContexts.isAncestorOf(fTargetContext, context)) {
 			fCallback.asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					fCallback.handleTargetEnded();
 				}});
@@ -443,6 +456,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.dsf.service.DsfSession.SessionEndedListener#sessionEnded(org.eclipse.cdt.dsf.service.DsfSession)
 	 */
+	@Override
 	public void sessionEnded(DsfSession session) {
 		if (session.getId().equals(fDsfSessionId)) {
 			clearDebugContext();
@@ -453,6 +467,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#getFrameLevel()
 	 */
+	@Override
 	public int getFrameLevel() {
 		if (fTargetFrameContext != null) {
 			return fTargetFrameContext.getLevel();
@@ -463,6 +478,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#hasFrameContext()
 	 */
+	@Override
 	public boolean hasFrameContext() {
 		return fTargetFrameContext != null;
 	}
@@ -471,6 +487,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#getFrameFile()
 	 */
+	@Override
 	public String getFrameFile() {
 		return fTargetFrameData.getFile();
 	}
@@ -478,6 +495,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#getFrameLine()
 	 */
+	@Override
 	public int getFrameLine() {
 		return fTargetFrameData.getLine();
 	}
@@ -485,6 +503,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.IDisassemblyBackend#retrieveDisassembly(java.math.BigInteger, java.math.BigInteger, java.lang.String, int, int, boolean, boolean, boolean, int)
 	 */
+	@Override
 	public void retrieveDisassembly(final BigInteger startAddress, BigInteger endAddress, final String file, final int lineNumber, final int lines, final boolean mixed, final boolean showSymbols, final boolean showDisassembly, final int linesHint) {
 		// make sure address range is no less than 32 bytes
 		// this is an attempt to get better a response from the backend (bug 302505)
@@ -501,6 +520,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 		
 		// align the start address first (bug 328168)
 		executor.execute(new Runnable() {			
+			@Override
 			public void run() {
 				alignOpCodeAddress(startAddress, new DataRequestMonitor<BigInteger>(executor, null) {
 					
@@ -514,6 +534,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 									final IMixedInstruction[] data= getData();
 									if (!isCanceled() && data != null) {
 										fCallback.asyncExec(new Runnable() {
+											@Override
 											public void run() {
 												if (!insertDisassembly(finalStartAddress, finalEndAddress, data, showSymbols, showDisassembly)) {
 													// retry in non-mixed mode
@@ -525,14 +546,17 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 										if (status != null && !status.isOK()) {
 											if( file != null )	{
 												fCallback.asyncExec(new Runnable() {
+													@Override
 													public void run() {
 														fCallback.retrieveDisassembly(finalStartAddress, finalEndAddress, linesHint, true, true);
 													}});
 											}
 											else {
 												fCallback.asyncExec(new Runnable() {
+													@Override
 													public void run() {
 														fCallback.doScrollLocked(new Runnable() {
+															@Override
 															public void run() {
 																fCallback.insertError(finalStartAddress, status.getMessage());
 															}
@@ -546,6 +570,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 							};
 							if (file != null) {
 								executor.execute(new Runnable() {
+									@Override
 									public void run() {
 										final IDisassembly disassembly= fServicesTracker.getService(IDisassembly.class);
 										if (disassembly == null) {
@@ -557,6 +582,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 									}});
 							} else {
 								executor.execute(new Runnable() {
+									@Override
 									public void run() {
 										final IDisassembly disassembly= fServicesTracker.getService(IDisassembly.class);
 										if (disassembly == null) {
@@ -573,9 +599,11 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 								public void handleCompleted() {
 									if (!isCanceled() && getData() != null) {
 										fCallback.asyncExec(new Runnable() {
+											@Override
 											public void run() {
 												if (!insertDisassembly(finalStartAddress, finalEndAddress, getData(), showSymbols, showDisassembly)) {
 													fCallback.doScrollLocked(new Runnable() {
+														@Override
 														public void run() {
 															fCallback.insertError(finalStartAddress, DisassemblyMessages.DisassemblyBackendDsf_error_UnableToRetrieveData);
 														}
@@ -586,8 +614,10 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 										final IStatus status= getStatus();
 										if (status != null && !status.isOK()) {
 											fCallback.asyncExec(new Runnable() {
+												@Override
 												public void run() {
 													fCallback.doScrollLocked(new Runnable() {
+														@Override
 														public void run() {
 															fCallback.insertError(finalStartAddress, status.getMessage());
 														}
@@ -599,6 +629,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 								}
 							};
 							executor.execute(new Runnable() {
+								@Override
 								public void run() {
 									final IDisassembly disassembly= fServicesTracker.getService(IDisassembly.class);
 									if (disassembly == null) {
@@ -850,6 +881,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#insertSource(org.eclipse.jface.text.Position, java.math.BigInteger, java.lang.String, int)
 	 */
+	@Override
 	public Object insertSource(Position pos, BigInteger address, final String file, int lineNumber) {
 		Object sourceElement = null;
 		final ISourceLookupDMContext ctx= DMContexts.getAncestorOfType(fTargetContext, ISourceLookupDMContext.class);
@@ -882,6 +914,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#gotoSymbol(java.lang.String)
 	 */
+	@Override
 	public void gotoSymbol(final String symbol) {
 		evaluateAddressExpression(symbol, false, new DataRequestMonitor<BigInteger>(getSession().getExecutor(), null) {			
 			@Override
@@ -889,6 +922,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 				final BigInteger address = getData();
 				if (address != null) {
 					fCallback.asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							fCallback.gotoAddress(address);
 						}});
@@ -935,7 +969,8 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
                 if (address != null && address != IExpressionDMLocation.INVALID_ADDRESS) {
                     final BigInteger addressValue = address.getValue();
                     fCallback.asyncExec(new Runnable() {
-                        public void run() {
+                        @Override
+						public void run() {
                             fCallback.gotoAddress(addressValue);
                         }
                     });
@@ -986,6 +1021,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#retrieveDisassembly(java.lang.String, int, java.math.BigInteger, boolean, boolean, boolean)
 	 */
+	@Override
 	public void retrieveDisassembly(final String file, final int lines, final BigInteger endAddress, boolean mixed, final boolean showSymbols, final boolean showDisassembly) {
 		String debuggerPath= file;
 		// try reverse lookup
@@ -1023,6 +1059,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 				final IMixedInstruction[] data= getData();
 				if (!isCanceled() && data != null) {
 					fCallback.asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							if (!insertDisassembly(null, endAddress, data, showSymbols, showDisassembly)) {
 								// retry in non-mixed mode
@@ -1041,6 +1078,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 		assert !fCallback.getUpdatePending();
 		fCallback.setUpdatePending(true);
 		executor.execute(new Runnable() {
+			@Override
 			public void run() {
 				final IDisassembly disassembly= fServicesTracker.getService(IDisassembly.class);
 				if (disassembly == null) {
@@ -1055,6 +1093,7 @@ public class DisassemblyBackendDsf extends AbstractDisassemblyBackend implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.ui.disassembly.dsf.IDisassemblyBackend#evaluateExpression(java.lang.String)
 	 */
+	@Override
 	public String evaluateExpression(final String expression) {
 		if (fTargetFrameContext == null) {
 			return null;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java
index b24b8189d49..db9047a2e18 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyBackendDsfFactory.java
@@ -23,6 +23,7 @@ public class DisassemblyBackendDsfFactory implements IAdapterFactory {
 
 	private static final Class<?>[] ADAPTERS = { IDisassemblyBackend.class };
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (IDisassemblyBackend.class.equals(adapterType)) {							
@@ -43,6 +44,7 @@ public class DisassemblyBackendDsfFactory implements IAdapterFactory {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Class[] getAdapterList() {
 		return ADAPTERS;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java
index 9a08c9296b8..bb81c03a0bb 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyEditor.java
@@ -92,6 +92,7 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart {
 	/*
 	 * @see org.eclipse.ui.IEditorPart#getEditorInput()
 	 */
+	@Override
 	public IEditorInput getEditorInput() {
 		return fInput;
 	}
@@ -99,6 +100,7 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart {
 	/*
 	 * @see org.eclipse.ui.IEditorPart#getEditorSite()
 	 */
+	@Override
 	public IEditorSite getEditorSite() {
 		return (IEditorSite)getSite();
 	}
@@ -106,6 +108,7 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart {
 	/*
 	 * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
 	 */
+	@Override
 	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
 		setSite(site);
 		setInput(input);
@@ -114,18 +117,21 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart {
 	/*
 	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	public void doSave(IProgressMonitor monitor) {
 	}
 
 	/*
 	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
 	 */
+	@Override
 	public void doSaveAs() {
 	}
 
 	/*
 	 * @see org.eclipse.ui.ISaveablePart#isDirty()
 	 */
+	@Override
 	public boolean isDirty() {
 		return false;
 	}
@@ -133,6 +139,7 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart {
 	/*
 	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
 	 */
+	@Override
 	public boolean isSaveAsAllowed() {
 		return false;
 	}
@@ -140,6 +147,7 @@ public class DisassemblyEditor extends DisassemblyPart implements IEditorPart {
 	/*
 	 * @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded()
 	 */
+	@Override
 	public boolean isSaveOnCloseNeeded() {
 		return false;
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyHyperlinkDetector.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyHyperlinkDetector.java
index 2d0d978fb61..78bec6d299a 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyHyperlinkDetector.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyHyperlinkDetector.java
@@ -42,6 +42,7 @@ class DisassemblyHyperlinkDetector extends AbstractHyperlinkDetector {
 		/*
 		 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
 		 */
+		@Override
 		public IRegion getHyperlinkRegion() {
 			return fRegion;
 		}
@@ -49,6 +50,7 @@ class DisassemblyHyperlinkDetector extends AbstractHyperlinkDetector {
 		/*
 		 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
 		 */
+		@Override
 		public String getHyperlinkText() {
 			return null;
 		}
@@ -56,6 +58,7 @@ class DisassemblyHyperlinkDetector extends AbstractHyperlinkDetector {
 		/*
 		 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
 		 */
+		@Override
 		public String getTypeLabel() {
 			return null;
 		}
@@ -63,6 +66,7 @@ class DisassemblyHyperlinkDetector extends AbstractHyperlinkDetector {
 		/*
 		 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
 		 */
+		@Override
 		public void open() {
 			if (fPart != null) {
  				fPart.gotoSymbol(fSymbol);
@@ -80,6 +84,7 @@ class DisassemblyHyperlinkDetector extends AbstractHyperlinkDetector {
 	/*
 	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean)
 	 */
+	@Override
 	public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
 			IRegion region, boolean canShowMultipleHyperlinks) {
 		IDocument document= textViewer.getDocument();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblySelectionProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblySelectionProvider.java
index e3cec114296..3fe32d79b22 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblySelectionProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblySelectionProvider.java
@@ -34,6 +34,7 @@ class DisassemblySelectionProvider implements ISelectionProvider {
 
 	private final ListenerList fListenerList = new ListenerList(ListenerList.IDENTITY);
 	private final ISelectionChangedListener fListener = new ISelectionChangedListener() {
+		@Override
 		public void selectionChanged(SelectionChangedEvent event) {
 			fireSelectionChanged(event);
 		}
@@ -57,6 +58,7 @@ class DisassemblySelectionProvider implements ISelectionProvider {
 	/*
 	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
 	 */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		fListenerList.add(listener);			
 	}
@@ -64,6 +66,7 @@ class DisassemblySelectionProvider implements ISelectionProvider {
 	/*
 	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
 	 */
+	@Override
 	public ISelection getSelection() {
 		final ISourceViewer textViewer= fPart.getTextViewer();
 		ISelectionProvider provider = textViewer.getSelectionProvider();
@@ -76,6 +79,7 @@ class DisassemblySelectionProvider implements ISelectionProvider {
 	/*
 	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
 	 */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		fListenerList.remove(listener);
 	}
@@ -83,6 +87,7 @@ class DisassemblySelectionProvider implements ISelectionProvider {
 	/*
 	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void setSelection(ISelection selection) {
 		ISelectionProvider provider = fPart.getTextViewer().getSelectionProvider();
 		if (provider != null) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyTextHover.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyTextHover.java
index 81b867f58d4..6bed675311b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyTextHover.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyTextHover.java
@@ -42,7 +42,8 @@ public class DisassemblyTextHover implements ITextHover {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
 	 */
-    public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
+    @Override
+	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
 		IDocument doc = textViewer.getDocument();
 		return CWordFinder.findWord(doc, offset);
 	}
@@ -50,6 +51,7 @@ public class DisassemblyTextHover implements ITextHover {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
 	 */
+	@Override
 	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 		DisassemblyDocument doc = (DisassemblyDocument)textViewer.getDocument();
 		int offset = hoverRegion.getOffset();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyToggleBreakpointTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyToggleBreakpointTester.java
index e872b33742e..15ccef7e1cd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyToggleBreakpointTester.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyToggleBreakpointTester.java
@@ -32,6 +32,7 @@ public class DisassemblyToggleBreakpointTester extends PropertyTester {
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
 	 */
+	@Override
 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
 		if ("isDisassemblyViewSupportsCBreakpoint".equals(property) && (receiver instanceof IDisassemblyPart)) { //$NON-NLS-1$
 			IDisassemblyPart view = ((IDisassemblyPart) receiver);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyView.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyView.java
index f82513b7e18..cd8ff543091 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyView.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyView.java
@@ -43,6 +43,7 @@ public class DisassemblyView extends DisassemblyPart implements IViewPart {
 	/*
 	 * @see org.eclipse.ui.IViewPart#getViewSite()
 	 */
+	@Override
 	public IViewSite getViewSite() {
 		return (IViewSite)getSite();
 	}
@@ -50,6 +51,7 @@ public class DisassemblyView extends DisassemblyPart implements IViewPart {
 	/*
 	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
 	 */
+	@Override
 	public void init(IViewSite site) throws PartInitException {
 		setSite(site);
 	}
@@ -57,6 +59,7 @@ public class DisassemblyView extends DisassemblyPart implements IViewPart {
 	/*
 	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite, org.eclipse.ui.IMemento)
 	 */
+	@Override
 	public void init(IViewSite site, IMemento memento) throws PartInitException {
 		setSite(site);
         if (memento != null) {
@@ -72,6 +75,7 @@ public class DisassemblyView extends DisassemblyPart implements IViewPart {
 	/*
 	 * @see org.eclipse.ui.IViewPart#saveState(org.eclipse.ui.IMemento)
 	 */
+	@Override
 	public void saveState(IMemento memento) {
 		memento.putBoolean(DisassemblyPreferenceConstants.TRACK_EXPRESSION, isTrackExpression());
 		memento.putBoolean(DisassemblyPreferenceConstants.SYNC_ACTIVE_CONTEXT, isSyncWithActiveDebugContext());
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyViewerConfiguration.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyViewerConfiguration.java
index 847b6db27df..338c38ee527 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyViewerConfiguration.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyViewerConfiguration.java
@@ -43,12 +43,14 @@ public class DisassemblyViewerConfiguration extends TextSourceViewerConfiguratio
 		/*
 		 * @see org.eclipse.jface.text.presentation.IPresentationDamager#setDocument(org.eclipse.jface.text.IDocument)
 		 */
+		@Override
 		public void setDocument(IDocument document) {
 		}
 
 		/*
 		 * @see org.eclipse.jface.text.presentation.IPresentationDamager#getDamageRegion(org.eclipse.jface.text.ITypedRegion, org.eclipse.jface.text.DocumentEvent, boolean)
 		 */
+		@Override
 		public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
 			int start= e.fOffset;
 			int end= e.getOffset() + (e.getText() == null ? 0 : e.getText().length());
@@ -58,6 +60,7 @@ public class DisassemblyViewerConfiguration extends TextSourceViewerConfiguratio
 		/*
 		 * @see org.eclipse.jface.text.presentation.IPresentationRepairer#createPresentation(org.eclipse.jface.text.TextPresentation, org.eclipse.jface.text.ITypedRegion)
 		 */
+		@Override
 		public void createPresentation(TextPresentation presentation, ITypedRegion damage) {
 			// do nothing
 		}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/SourceColorerJob.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/SourceColorerJob.java
index 27a479a04ee..2c712f27224 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/SourceColorerJob.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/SourceColorerJob.java
@@ -66,6 +66,7 @@ class SourceColorerJob extends UIJob implements Runnable {
 	/*
 	 * @see java.lang.Runnable#run()
 	 */
+	@Override
 	public void run() {
 		IWorkbenchSiteProgressService progressService = (IWorkbenchSiteProgressService)fDisassemblyPart.getSite().getAdapter(IWorkbenchSiteProgressService.class);
 		if(progressService != null) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java
index 6796c03d3b2..1ff5a94c6de 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyAction.java
@@ -65,6 +65,7 @@ public abstract class AbstractDisassemblyAction extends Action implements IUpdat
 	@Override
 	public abstract void run();
 
+	@Override
 	public void update() {
 		boolean enabled= fDisassemblyPart == null || fDisassemblyPart.isConnected();
 		setEnabled(enabled);
@@ -73,6 +74,7 @@ public abstract class AbstractDisassemblyAction extends Action implements IUpdat
 	/*
 	 * @see org.eclipse.ui.IPropertyListener#propertyChanged(java.lang.Object, int)
 	 */
+	@Override
 	public void propertyChanged(Object source, int propId) {
 		if (source == fDisassemblyPart && (propId & 0x500) != 0) {
 			update();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyRulerActionDelegate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyRulerActionDelegate.java
index 261a6ebeea8..74ed3576436 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyRulerActionDelegate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AbstractDisassemblyRulerActionDelegate.java
@@ -60,6 +60,7 @@ public abstract class AbstractDisassemblyRulerActionDelegate extends ActionDeleg
 	/*
 	 * @see IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
 	 */
+	@Override
 	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
 		setTargetPart(callerAction, targetEditor);
 	}
@@ -67,7 +68,8 @@ public abstract class AbstractDisassemblyRulerActionDelegate extends ActionDeleg
     /*
      * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
      */
-    public void init(IViewPart view) {
+    @Override
+	public void init(IViewPart view) {
     	setTargetPart(fCallerAction, view);
     }
 
@@ -142,6 +144,7 @@ public abstract class AbstractDisassemblyRulerActionDelegate extends ActionDeleg
 	/*
 	 * @see IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
 	 */
+	@Override
 	public void menuAboutToShow(IMenuManager manager) {
 		update();
 	}
@@ -149,12 +152,14 @@ public abstract class AbstractDisassemblyRulerActionDelegate extends ActionDeleg
 	/*
 	 * @see MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
 	 */
+	@Override
 	public void mouseDoubleClick(MouseEvent e) {
 	}
 
 	/*
 	 * @see MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
 	 */
+	@Override
 	public void mouseDown(MouseEvent e) {
 		update();
 	}
@@ -162,6 +167,7 @@ public abstract class AbstractDisassemblyRulerActionDelegate extends ActionDeleg
 	/*
 	 * @see MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
 	 */
+	@Override
 	public void mouseUp(MouseEvent e) {
 	}
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java
index ee1d7a39d10..d2976da6600 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/AddressBarContributionItem.java
@@ -88,6 +88,7 @@ public class AddressBarContributionItem extends ContributionItem {
 
 		parent.addDisposeListener(new DisposeListener() {
 
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				if (warningImage != null)
 					warningImage.dispose();
@@ -198,10 +199,12 @@ public class AddressBarContributionItem extends ContributionItem {
 			// [nmehregani]: Support Ctrl+C in address bar
 			KeyListener keyListener = new KeyListener() {
 
+				@Override
 				public void keyPressed(KeyEvent e) {
 					/* Not used */
 				}
 
+				@Override
 				public void keyReleased(KeyEvent e) {
 					if (e.stateMask == SWT.CTRL
 							&& (((char) e.keyCode) == 'c' || ((char) e.keyCode) == 'C')) {
@@ -234,6 +237,7 @@ public class AddressBarContributionItem extends ContributionItem {
 
 			};
 
+			@Override
 			public void focusGained(FocusEvent e) {
 				// [nmehregani] bugzilla 297387: 'Home' shouldn't jump to PC address when focus is on location combo box
 				if (action instanceof JumpToAddressAction) 
@@ -250,6 +254,7 @@ public class AddressBarContributionItem extends ContributionItem {
 				addressBox.addKeyListener(keyListener);
 			}
 
+			@Override
 			public void focusLost(FocusEvent e) {
 				// [nmehregani] bugzilla 297387: 'Home' shouldn't jump to PC address when focus is on location combo box
 				if (action instanceof JumpToAddressAction) 
@@ -268,6 +273,7 @@ public class AddressBarContributionItem extends ContributionItem {
 
 		addressBox.addTraverseListener(new TraverseListener() {
 
+			@Override
 			public void keyTraversed(TraverseEvent e) {
 				if (e.detail == SWT.TRAVERSE_RETURN) {
 					String addressBoxStr = addressBox.getText();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/BreakpointPropertiesRulerAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/BreakpointPropertiesRulerAction.java
index 6b1bb3df579..3bc945de35f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/BreakpointPropertiesRulerAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/BreakpointPropertiesRulerAction.java
@@ -44,16 +44,20 @@ public class BreakpointPropertiesRulerAction extends AbstractDisassemblyBreakpoi
 		if ( fContext != null ) {
 			PropertyDialogAction action = new PropertyDialogAction( getDisassemblyPart().getSite(), new ISelectionProvider() {
 
+			    @Override
 				public void addSelectionChangedListener( ISelectionChangedListener listener ) {
 				}
 
+			    @Override
 				public ISelection getSelection() {
 					return new StructuredSelection( fContext );
 				}
 
+			    @Override
 				public void removeSelectionChangedListener( ISelectionChangedListener listener ) {
 				}
 
+			    @Override
 				public void setSelection( ISelection selection ) {
 				}
 			} );
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/RulerToggleBreakpointHandler.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/RulerToggleBreakpointHandler.java
index 398d68504a5..fdfcd6ef466 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/RulerToggleBreakpointHandler.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/RulerToggleBreakpointHandler.java
@@ -28,6 +28,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  */
 public class RulerToggleBreakpointHandler extends AbstractHandler {
 
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		IWorkbenchPart part = HandlerUtil.getActivePartChecked(event);
 		if (part instanceof IDisassemblyPart) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/TextOperationAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/TextOperationAction.java
index 080c67499c2..e93dc6e807d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/TextOperationAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/actions/TextOperationAction.java
@@ -35,6 +35,7 @@ public class TextOperationAction extends Action implements IUpdate {
 		 * 
 		 * @see Action#firePropertyChange(String, Object, Object)
 		 */
+		@Override
 		public void update() {
 	
 			boolean wasEnabled= isEnabled();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/SourceEditorInput.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/SourceEditorInput.java
index b70210e34f2..81ad1e6e110 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/SourceEditorInput.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/model/SourceEditorInput.java
@@ -28,6 +28,7 @@ public class SourceEditorInput extends StorageEditorInput {
 	/*
 	 * @see org.eclipse.ui.IEditorInput#exists()
 	 */
+	@Override
 	public boolean exists() {
 		return false;
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java
index 6616216582e..0e140845d3e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourcePresentationCreator.java
@@ -263,6 +263,7 @@ public class CSourcePresentationCreator extends PresentationReconciler implement
 					if (fSourceTagProvider != null) {
 						if (fSourceTagListener == null) {
 							fSourceTagListener= new ISourceTagListener() {
+								@Override
 								public void sourceTagsChanged(ISourceTagProvider provider) {
 									handleSourceTagsChanged();
 								}};
@@ -280,6 +281,7 @@ public class CSourcePresentationCreator extends PresentationReconciler implement
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.presentation.ISourcePresentationCreator#dispose()
 	 */
+	@Override
 	public void dispose() {
 		fViewer= null;
 		fPresentation= null;
@@ -303,6 +305,7 @@ public class CSourcePresentationCreator extends PresentationReconciler implement
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.presentation.ISourcePresentationCreator#getPresentation(org.eclipse.jface.text.IRegion, org.eclipse.jface.text.IDocument)
 	 */
+	@Override
 	public TextPresentation getPresentation(IRegion region, IDocument document) {
 		assert fViewer != null;
 		if (fViewer == null) {
@@ -334,6 +337,7 @@ public class CSourcePresentationCreator extends PresentationReconciler implement
 				Display display= fViewer.getTextWidget().getDisplay();
 				if (display.getThread() != Thread.currentThread()) {
 					display.asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							if (fViewer != null) {
 								fViewer.invalidateTextPresentation();
@@ -375,6 +379,7 @@ public class CSourcePresentationCreator extends PresentationReconciler implement
 	/*
 	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
 	 */
+	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (fSourceViewerConfiguration.affectsBehavior(event)) {
 			fSourceViewerConfiguration.handlePropertyChangeEvent(event);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTag.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTag.java
index 6179cd2b1ac..6c6a8e24b4e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTag.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTag.java
@@ -24,18 +24,22 @@ public class CSourceTag implements ISourceTag {
 	 */
 	public class NullRange implements ISourceRange {
 
+		@Override
 		public boolean contains(int offset) {
 			return false;
 		}
 
+		@Override
 		public int getBeginOffset() {
 			return 0;
 		}
 
+		@Override
 		public int getEndOffset() {
 			return -1;
 		}
 
+		@Override
 		public int compareTo(ISourceRange other) {
 			if (this == other) {
 				return 0;
@@ -59,18 +63,22 @@ public class CSourceTag implements ISourceTag {
 			fRange= sourceRange;
 		}
 
+		@Override
 		public boolean contains(int offset) {
 			return fRange.getStartPos() <= offset && offset - fRange.getStartPos() < fRange.getLength();
 		}
 
+		@Override
 		public int getBeginOffset() {
 			return fRange.getStartPos();
 		}
 
+		@Override
 		public int getEndOffset() {
 			return fRange.getStartPos() + fRange.getLength() - 1;
 		}
 
+		@Override
 		public int compareTo(ISourceRange other) {
 			int delta= this.getBeginOffset() - other.getBeginOffset();
 			if (delta == 0) {
@@ -92,18 +100,22 @@ public class CSourceTag implements ISourceTag {
 			fRange= sourceRange;
 		}
 
+		@Override
 		public boolean contains(int offset) {
 			return fRange.getIdStartPos() <= offset && offset - fRange.getIdStartPos() < fRange.getIdLength();
 		}
 
+		@Override
 		public int getBeginOffset() {
 			return fRange.getIdStartPos();
 		}
 
+		@Override
 		public int getEndOffset() {
 			return fRange.getIdStartPos() + fRange.getIdLength() - 1;
 		}
 
+		@Override
 		public int compareTo(ISourceRange other) {
 			int delta= this.getBeginOffset() - other.getBeginOffset();
 			if (delta == 0) {
@@ -128,6 +140,7 @@ public class CSourceTag implements ISourceTag {
 		fType= elementType;
 	}
 
+	@Override
 	public ISourceRange getFullRange() {
 		try {
 			return new CSourceRange(fReference.getSourceRange());
@@ -136,14 +149,17 @@ public class CSourceTag implements ISourceTag {
 		return new NullRange();
 	}
 
+	@Override
 	public String getName() {
 		return ((ICElement)fReference).getElementName();
 	}
 
+	@Override
 	public String getQualifiedName() {
 		return getName();
 	}
 
+	@Override
 	public ISourceRange getRangeOfIdentifier() {
 		try {
 			return new CIdentifierRange(fReference.getSourceRange());
@@ -152,10 +168,12 @@ public class CSourceTag implements ISourceTag {
 		return new NullRange();
 	}
 
+	@Override
 	public long getSnapshotTime() {
 		return 0;
 	}
 
+	@Override
 	public int getStyleCode() {
 		switch (fType) {
 		case ICElement.C_METHOD :
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java
index 8ee622b7c0e..409cd6802ad 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/CSourceTagProvider.java
@@ -36,19 +36,23 @@ public class CSourceTagProvider implements ISourceTagProvider {
 		fUnit= unit;
 	}
 
+	@Override
 	public void addSourceTagListener(ISourceTagListener listener) {
 		fListenerList.add(listener);
 	}
 
+	@Override
 	public int[] getActiveCodePositions() {
 		// unsupported
 		return null;
 	}
 
+	@Override
 	public long getSnapshotTime() {
 		return 0;
 	}
 
+	@Override
 	public void getSourceTags(Collection<ISourceTag> target) {
 		try {
 			convertToSourceTags(fUnit.getChildren(), target);
@@ -88,6 +92,7 @@ public class CSourceTagProvider implements ISourceTagProvider {
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.presentation.ISourceTagProvider#removeSourceTagListener(org.eclipse.cdt.dsf.debug.internal.ui.disassembly.presentation.ISourceTagListener)
 	 */
+	@Override
 	public void removeSourceTagListener(ISourceTagListener listener) {
 		fListenerList.remove(listener);
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/DisassemblyIPAnnotation.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/DisassemblyIPAnnotation.java
index 87c075383ce..46fafab2146 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/DisassemblyIPAnnotation.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/DisassemblyIPAnnotation.java
@@ -64,6 +64,7 @@ public class DisassemblyIPAnnotation extends Annotation implements IAnnotationPr
 	/*
 	 * @see org.eclipse.jface.text.source.IAnnotationPresentation#getLayer()
 	 */
+	@Override
 	public int getLayer() {
 		return 5;
 	}
@@ -71,6 +72,7 @@ public class DisassemblyIPAnnotation extends Annotation implements IAnnotationPr
 	/*
 	 * @see org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse.swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle)
 	 */
+	@Override
 	public void paint(GC gc, Canvas canvas, Rectangle bounds) {
 		Rectangle imageBounds = fImage.getBounds();
 		gc.drawImage(fImage, bounds.x + (bounds.width - imageBounds.width) / 2 , bounds.y + (bounds.height - imageBounds.height) / 2);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/SourceTagDamagerRepairer.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/SourceTagDamagerRepairer.java
index f6d80f70d87..a8f1f2848f0 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/SourceTagDamagerRepairer.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/presentation/SourceTagDamagerRepairer.java
@@ -325,11 +325,13 @@ public class SourceTagDamagerRepairer extends DefaultDamagerRepairer implements
 		}
 	}
 
+	@Override
 	public void sourceTagsChanged(ISourceTagProvider sourceTagProvider) {
 		fSourceTags.clear();
 		if (sourceTagProvider != null) {
 			sourceTagProvider.getSourceTags(fSourceTags);
 			Collections.sort(fSourceTags, new Comparator<Object>() {
+				@Override
 				public int compare(Object o1, Object o2) {
 					ISourceRange sr1 = ((ISourceTag)o1).getRangeOfIdentifier();
 					ISourceRange sr2 = ((ISourceTag)o2).getRangeOfIdentifier();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java
index cde2fdf39e4..d90eeb4810e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java
@@ -100,6 +100,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.jface.viewers.ISelection#isEmpty()
 	 */
+	@Override
 	public boolean isEmpty() {
 		return fTextSelection.isEmpty();
 	}
@@ -107,6 +108,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.jface.text.ITextSelection#getEndLine()
 	 */
+	@Override
 	public int getEndLine() {
 		return fTextSelection.getEndLine();
 	}
@@ -114,6 +116,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.jface.text.ITextSelection#getLength()
 	 */
+	@Override
 	public int getLength() {
 		return fTextSelection.getLength();
 	}
@@ -121,6 +124,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.jface.text.ITextSelection#getOffset()
 	 */
+	@Override
 	public int getOffset() {
 		return fTextSelection.getOffset();
 	}
@@ -128,6 +132,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.jface.text.ITextSelection#getStartLine()
 	 */
+	@Override
 	public int getStartLine() {
 		return fTextSelection.getStartLine();
 	}
@@ -135,6 +140,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.jface.text.ITextSelection#getText()
 	 */
+	@Override
 	public String getText() {
 		return fTextSelection.getText();
 	}
@@ -142,6 +148,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection#getSourceFile()
 	 */
+	@Override
 	public IFile getSourceFile() {
 		if (fSourceFile != null) {
 			IResource resource = (IResource) fSourceFile.getAdapter(IResource.class);
@@ -155,6 +162,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection#getSourceLine()
 	 */
+	@Override
 	public int getSourceLine() {
 		if (fSourceFile != null) {
 			return fSourceLine;
@@ -165,6 +173,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection#getSourceLocationURI()
 	 */
+	@Override
 	public URI getSourceLocationURI() {
 		if (fSourceFile != null) {
 			IResource resource = (IResource) fSourceFile.getAdapter(IResource.class);
@@ -183,6 +192,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection#getStartAddress()
 	 */
+	@Override
 	public IAddress getStartAddress() {
 		return fStartAddress;
 	}
@@ -190,6 +200,7 @@ public class DisassemblySelection implements IDisassemblySelection {
 	/**
 	 * @since 2.2
 	 */
+	@Override
 	public String getLabel() {
 		return fLabel;
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDFileRider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDFileRider.java
index 661400613b9..7b300e3084e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDFileRider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDFileRider.java
@@ -35,6 +35,7 @@ public final class REDFileRider implements IFileRider {
 	/*
 	 * @see org.eclipse.cdt.dsf.debug.internal.ui.disassembly.text.IFileRider#seek(int)
 	 */
+	@Override
 	public void seek(int pos) throws IOException {
 		fFile.seek(pos);
 		fEof = false;
@@ -86,62 +87,75 @@ public final class REDFileRider implements IFileRider {
 		return fFile;
 	}
 
+	@Override
 	public void writeChar(char c) throws IOException {
 		fOneCharBuf[0] = c;
 		writeChars(fOneCharBuf, 0, 1);
 	}
 
+	@Override
 	public void writeChars(char[] buf) throws IOException {
 		writeChars(buf, 0, buf.length);
 	}
 
+	@Override
 	public void writeChars(char[] buf, int n) throws IOException {
 		writeChars(buf, 0, n);
 	}
 
+	@Override
 	public void writeChars(char[] buf, int off, int n) throws IOException {
 		fFile.writeBuffered(buf, off, n);
 		fResult = 0;
 	}
 
+	@Override
 	public void writeChars(String buf, int off, int n) throws IOException {
 		fFile.writeBuffered(buf, off, n);
 		fResult = 0;
 	}
 
+	@Override
 	public char readChar() throws IOException {
 		readChars(fOneCharBuf, 0, 1);
 		return fEof ? '\0' : fOneCharBuf[0];
 	}
 
+	@Override
 	public void readChars(char[] buf) throws IOException {
 		readChars(buf, 0, buf.length);
 	}
 
+	@Override
 	public void readChars(char[] buf, int n) throws IOException {
 		readChars(buf, 0, n);
 	}
 
+	@Override
 	public void readChars(char[] buf, int off, int n) throws IOException {
 		int count = fFile.readBuffered(buf, off, n);
 		fResult = n-count;
 		fEof = fResult > 0;
 	}
 
+	@Override
 	public void readChars(StringBuffer buf, int n) throws IOException {
 		int count = fFile.readBuffered(buf, n);
 		fResult = n-count;
 		fEof = fResult > 0;
 	}
 
+	@Override
 	public int length() {
 		return fFile.length();
 	}
 
+	@Override
 	public int limit() {
 		return fLimit;
 	}
 
+	@Override
 	public boolean isReadonly() {
 		return fFile.isReadonly();
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDRun.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDRun.java
index 57f93bf31c5..8be86044ba4 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDRun.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDRun.java
@@ -124,6 +124,7 @@ public class REDRun implements CharSequence {
 	/*
 	 * @see java.lang.CharSequence#charAt(int)
 	 */
+	@Override
 	public char charAt(int pos) {
 		try {
 			fRider.seek(fOffset + pos);
@@ -136,6 +137,7 @@ public class REDRun implements CharSequence {
 	/*
 	 * @see java.lang.CharSequence#subSequence(int, int)
 	 */
+	@Override
 	public CharSequence subSequence(int start, int end) {
 		return new REDRun(fRider, fOffset + start, end - start);
 	}
@@ -143,6 +145,7 @@ public class REDRun implements CharSequence {
 	/*
 	 * @see java.lang.CharSequence#length()
 	 */
+	@Override
 	public int length() {
 		return fLength;
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDTextStore.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDTextStore.java
index f0e0fe4cdb9..338c12568cd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDTextStore.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/REDTextStore.java
@@ -157,6 +157,7 @@ public final class REDTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#get(int)
 	 */
+	@Override
 	public char get(int offset) {
 		synchronized (fRunSpec) {
 			RunSpec spec = findNextRun(offset, null);
@@ -170,6 +171,7 @@ public final class REDTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#get(int, int)
 	 */
+	@Override
 	public String get(int offset, int length) {
 		synchronized (fRunSpec) {
 			// special case: long in-memory text in full length (about to be swapped)
@@ -184,6 +186,7 @@ public final class REDTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#getLength()
 	 */
+	@Override
 	public int getLength() {
 		synchronized (fRunSpec) {
 			return fLength;
@@ -193,6 +196,7 @@ public final class REDTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#set(java.lang.String)
 	 */
+	@Override
 	public void set(String text) {
 		synchronized (fRunSpec) {
 			dispose();
@@ -210,6 +214,7 @@ public final class REDTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String)
 	 */
+	@Override
 	public void replace(int offset, int length, String text) {
 		synchronized (fRunSpec) {
 			if (text == null || text.length() == 0) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringRider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringRider.java
index cbe121c9d13..6564b5a503f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringRider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringRider.java
@@ -31,46 +31,57 @@ public class StringRider implements IFileRider {
 		fBuffer = buffer;
 	}
 
+	@Override
 	public void seek(int pos) throws IOException {
 		fBuffer.position(pos);
 	}
 
+	@Override
 	public void writeChar(char c) throws IOException {
 		fBuffer.put(c);
 	}
 
+	@Override
 	public void writeChars(char[] buf) throws IOException {
 		fBuffer.put(buf);
 	}
 
+	@Override
 	public void writeChars(char[] buf, int n) throws IOException {
 		fBuffer.put(buf, 0, n);
 	}
 
+	@Override
 	public void writeChars(char[] buf, int off, int n) throws IOException {
 		fBuffer.put(buf, off, n);
 	}
 
+	@Override
 	public void writeChars(String buf, int off, int n) throws IOException {
 		fBuffer.put(buf, off, off+n);
 	}
 
+	@Override
 	public char readChar() throws IOException {
 		return fBuffer.get();
 	}
 
+	@Override
 	public void readChars(char[] buf) throws IOException {
 		fBuffer.get(buf, 0, buf.length);
 	}
 
+	@Override
 	public void readChars(char[] buf, int n) throws IOException {
 		fBuffer.get(buf, 0, n);
 	}
 
+	@Override
 	public void readChars(char[] buf, int off, int n) throws IOException {
 		fBuffer.get(buf, off, n);
 	}
 
+	@Override
 	public void readChars(StringBuffer buf, int n) throws IOException {
 		int pos = fBuffer.position();
 		if (fBuffer.hasArray()) {
@@ -85,14 +96,17 @@ public class StringRider implements IFileRider {
 		fBuffer.position(pos + n);
 	}
 
+	@Override
 	public int length() {
 		return fBuffer.length();
 	}
 
+	@Override
 	public int limit() {
 		return fBuffer.limit();
 	}
 
+	@Override
 	public boolean isReadonly() {
 		return fBuffer.isReadOnly();
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringTextStore.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringTextStore.java
index 484484414f7..c7d355c9829 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringTextStore.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/text/StringTextStore.java
@@ -31,6 +31,7 @@ public class StringTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#get(int)
 	 */
+	@Override
 	public char get(int offset) {
 		return fText.charAt(offset);
 	}
@@ -38,6 +39,7 @@ public class StringTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#get(int, int)
 	 */
+	@Override
 	public String get(int offset, int length) {
 		if (length == fText.length()) {
 			return fText;
@@ -48,6 +50,7 @@ public class StringTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#getLength()
 	 */
+	@Override
 	public int getLength() {
 		return fText.length();
 	}
@@ -55,6 +58,7 @@ public class StringTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String)
 	 */
+	@Override
 	public void replace(int offset, int length, String text) {
 		// unmodifiable
 		throw new UnsupportedOperationException();
@@ -63,6 +67,7 @@ public class StringTextStore implements ITextStore {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextStore#set(java.lang.String)
 	 */
+	@Override
 	public void set(String text) {
 		fText = text != null ? text : ""; //$NON-NLS-1$
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java
index e2e424d12fb..8a4f99a6e59 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/util/StorageEditorInput.java
@@ -37,6 +37,7 @@ abstract public class StorageEditorInput implements IStorageEditorInput {
 	/**
 	 * @see IStorageEditorInput#getStorage()
 	 */
+	@Override
 	public IStorage getStorage() {
 		return fStorage;
 	}
@@ -53,6 +54,7 @@ abstract public class StorageEditorInput implements IStorageEditorInput {
 	/**
 	 * @see IEditorInput#getImageDescriptor()
 	 */
+	@Override
 	public ImageDescriptor getImageDescriptor() {
 		return null;
 	}
@@ -60,6 +62,7 @@ abstract public class StorageEditorInput implements IStorageEditorInput {
 	/**
 	 * @see IEditorInput#getName()
 	 */
+	@Override
 	public String getName() {
 		return getStorage().getName();
 	}
@@ -67,6 +70,7 @@ abstract public class StorageEditorInput implements IStorageEditorInput {
 	/**
 	 * @see IEditorInput#getPersistable()
 	 */
+	@Override
 	public IPersistableElement getPersistable() {
 		return null;
 	}
@@ -74,6 +78,7 @@ abstract public class StorageEditorInput implements IStorageEditorInput {
 	/**
 	 * @see IEditorInput#getToolTipText()
 	 */
+	@Override
 	public String getToolTipText() {
 		return getStorage().getFullPath().toOSString();
 	}
@@ -102,6 +107,7 @@ abstract public class StorageEditorInput implements IStorageEditorInput {
 		return getStorage().hashCode();
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
     public Object getAdapter(Class adapter) {
 		return null;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/preferences/DsfDebugPreferencePage.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/preferences/DsfDebugPreferencePage.java
index eda43cc9906..320af995c18 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/preferences/DsfDebugPreferencePage.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/preferences/DsfDebugPreferencePage.java
@@ -44,6 +44,7 @@ public class DsfDebugPreferencePage extends FieldEditorPreferencePage implements
 	/*
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/DsfCastToTypeSupport.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/DsfCastToTypeSupport.java
index c6b2b2246e0..e625c17d03f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/DsfCastToTypeSupport.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/DsfCastToTypeSupport.java
@@ -117,6 +117,7 @@ public class DsfCastToTypeSupport  {
 		 * (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.core.model.ICastToType#canCast()
 		 */
+	    @Override
         public boolean canCast() {
         	return isValid();
 		}
@@ -125,6 +126,7 @@ public class DsfCastToTypeSupport  {
 		 * (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.core.model.ICastToType#getCurrentType()
 		 */
+	    @Override
         public String getCurrentType() {
         	// get expected casted type first, if possible (if there's an error in the type,
         	// the expression might not evaluate successfully)
@@ -144,6 +146,7 @@ public class DsfCastToTypeSupport  {
 		 * (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.core.model.ICastToType#cast(java.lang.String)
 		 */
+	    @Override
         public void cast(String type) throws DebugException {
         	throwIfNotValid();
         	
@@ -159,6 +162,7 @@ public class DsfCastToTypeSupport  {
          * (non-Javadoc)
          * @see org.eclipse.cdt.debug.core.model.ICastToType#restoreOriginal()
          */
+	    @Override
 		public void restoreOriginal() throws DebugException {
 			throwIfNotValid();
         	fCastedExpressionStorage.remove(memento);
@@ -169,6 +173,7 @@ public class DsfCastToTypeSupport  {
 		 * (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.core.model.ICastToType#isCasted()
 		 */
+	    @Override
 		public boolean isCasted() {
 			if (isValid())
 				return fCastedExpressionStorage.containsKey(memento);
@@ -180,6 +185,7 @@ public class DsfCastToTypeSupport  {
 		 * (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.core.model.ICastToArray#canCastToArray()
 		 */
+	    @Override
 		public boolean canCastToArray() {
 			return isValid();
 		}
@@ -188,6 +194,7 @@ public class DsfCastToTypeSupport  {
 		 * (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.core.model.ICastToArray#castToArray(int, int)
 		 */
+	    @Override
 		public void castToArray(int startIndex, int length)
 				throws DebugException {
 			throwIfNotValid();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java
index 51583f723a7..e969df77347 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/DsfViewMemoryHandler.java
@@ -67,6 +67,7 @@ public class DsfViewMemoryHandler extends AbstractHandler {
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		ISelection selection = HandlerUtil.getCurrentSelection(event);
 		if (selection instanceof IStructuredSelection) {
@@ -184,6 +185,7 @@ public class DsfViewMemoryHandler extends AbstractHandler {
 					continue;
 				}
 				executor.execute(new DsfRunnable() {
+					@Override
 					public void run() {
 						DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), session.getId());
 						IExpressions service = tracker.getService(IExpressions.class);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshActionDelegate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshActionDelegate.java
index 8c05618e40a..ea811ff98ea 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshActionDelegate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshActionDelegate.java
@@ -25,7 +25,8 @@ import org.eclipse.ui.IViewPart;
  */
 public class RefreshActionDelegate extends AbstractVMProviderActionDelegate {
 
-    public void run(IAction action) {
+    @Override
+	public void run(IAction action) {
         IVMProvider provider = VMHandlerUtils.getVMProviderForPart(getView());
         if (provider instanceof ICachingVMProvider) {
             ((ICachingVMProvider)provider).refresh();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshHandler.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshHandler.java
index 01e3340c89f..435a8d73ad8 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshHandler.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RefreshHandler.java
@@ -19,7 +19,8 @@ import org.eclipse.core.commands.ExecutionException;
 
 public class RefreshHandler extends AbstractHandler  {
 
-    public Object execute(ExecutionEvent event) throws ExecutionException {
+    @Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
         IVMProvider vmProvider = VMHandlerUtils.getActiveVMProvider(event);
         
         if (vmProvider instanceof ICachingVMProvider) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RetargetDebugContextAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RetargetDebugContextAction.java
index fda8571ef20..89bbf666ece 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RetargetDebugContextAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/RetargetDebugContextAction.java
@@ -44,7 +44,8 @@ abstract public class RetargetDebugContextAction implements IWorkbenchWindowActi
     /* (non-Javadoc)
      * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
      */
-    public void init(IWorkbenchWindow window) {
+    @Override
+	public void init(IWorkbenchWindow window) {
         fWindow = window;
         IDebugContextService debugContextService = DebugUITools.getDebugContextManager().getContextService(fWindow);
         debugContextService.addPostDebugContextListener(this);
@@ -53,18 +54,21 @@ abstract public class RetargetDebugContextAction implements IWorkbenchWindowActi
     }
 
 
-    public void selectionChanged(IAction action, ISelection selection) {
+    @Override
+	public void selectionChanged(IAction action, ISelection selection) {
         if (fAction != action) {
             fAction = action;
         }
         // Update on debug context changed events
     }
     
-    public void runWithEvent(IAction action, Event event) {
+    @Override
+	public void runWithEvent(IAction action, Event event) {
         run(action);
     }
     
-    public void run(IAction action) {
+    @Override
+	public void run(IAction action) {
         if (fTargetAdapter != null) {
             try {
                 performAction(fTargetAdapter, fDebugContext);
@@ -100,7 +104,8 @@ abstract public class RetargetDebugContextAction implements IWorkbenchWindowActi
      */
     protected abstract Class<?> getAdapterClass();
 
-    public void init(IAction action) {
+    @Override
+	public void init(IAction action) {
         fAction = action;
     }
 
@@ -128,12 +133,14 @@ abstract public class RetargetDebugContextAction implements IWorkbenchWindowActi
         fAction.setEnabled(false);
     }
 
-    public void dispose() {
+    @Override
+	public void dispose() {
         DebugUITools.getDebugContextManager().getContextService(fWindow).removePostDebugContextListener(this);
         fTargetAdapter = null;
     }
     
-    public void debugContextChanged(DebugContextEvent event) {
+    @Override
+	public void debugContextChanged(DebugContextEvent event) {
         fDebugContext = event.getContext();
         update();
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesContribution.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesContribution.java
index 53bbd8556dd..78697aec8b5 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesContribution.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesContribution.java
@@ -104,7 +104,8 @@ public class UpdatePoliciesContribution extends CompoundContributionItem impleme
         return items;
     }
     
-    public void initialize(IServiceLocator serviceLocator) {
+    @Override
+	public void initialize(IServiceLocator serviceLocator) {
         fServiceLocator = serviceLocator;
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesPropertyTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesPropertyTester.java
index 97b58c3ad9b..30233b9f7ab 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesPropertyTester.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/actions/UpdatePoliciesPropertyTester.java
@@ -44,7 +44,8 @@ public class UpdatePoliciesPropertyTester extends PropertyTester {
     private static final String AVAILABLE = "isUpdatePolicyAvailable"; //$NON-NLS-1$
     private static final String ACTIVE = "isUpdatePolicyActive"; //$NON-NLS-1$
 
-    public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+    @Override
+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
         if (receiver instanceof IVMContext) {
             IVMProvider provider = ((IVMContext)receiver).getVMNode().getVMProvider();
             if (provider instanceof ICachingVMProvider) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/DetailPaneMaxLengthDialog.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/DetailPaneMaxLengthDialog.java
index 6db4e4e216d..e30dff47a74 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/DetailPaneMaxLengthDialog.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/DetailPaneMaxLengthDialog.java
@@ -54,6 +54,7 @@ public class DetailPaneMaxLengthDialog extends TrayDialog {
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 		fValue = Integer.toString(DsfUIPlugin.getDefault().getPreferenceStore().getInt(IDebugUIConstants.PREF_MAX_DETAIL_LENGTH));
 		fValidator = new IInputValidator() {
+					@Override
 					public String isValid(String newText) {
 						try {
 							int num = Integer.parseInt(newText);
@@ -109,7 +110,8 @@ public class DetailPaneMaxLengthDialog extends TrayDialog {
         fTextWidget.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL));
         fTextWidget.setText(fValue);
         fTextWidget.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
+            @Override
+			public void modifyText(ModifyEvent e) {
                 validateInput();
                 fValue = fTextWidget.getText();
             }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/TextViewerAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/TextViewerAction.java
index b3104892bcf..62a474209a7 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/TextViewerAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/detailsupport/TextViewerAction.java
@@ -49,7 +49,8 @@ public class TextViewerAction extends Action implements IUpdate {
      * 
      * @see org.eclipse.jface.action.Action#firePropertyChange(String, Object, Object)
      */
-    public void update() {
+    @Override
+	public void update() {
 
         boolean wasEnabled= isEnabled();
         boolean isEnabled= (fOperationTarget != null && fOperationTarget.canDoOperation(fOperationCode));
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java
index 3f6fd2c8060..5858610545c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java
@@ -118,7 +118,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite)
      */
-    public void init(IWorkbenchPartSite workbench) {
+    @Override
+	public void init(IWorkbenchPartSite workbench) {
         fWorkbenchPartSite = workbench;
 
     }
@@ -379,7 +380,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
         /* (non-Javadoc)
          * @see org.eclipse.debug.ui.IValueDetailListener#detailComputed(org.eclipse.debug.core.model.IValue, java.lang.String)
          */
-        public void detailComputed(IValue value, final String result) {
+        @Override
+		public void detailComputed(IValue value, final String result) {
         	synchronized (this) {
 			}
             if (!fMonitor.isCanceled()) {
@@ -448,7 +450,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite)
      */
-    public Control createControl(Composite parent) {
+    @Override
+	public Control createControl(Composite parent) {
         
         createTextViewer(parent);
         
@@ -489,15 +492,18 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
         
         // Add a document listener so actions get updated when the document changes
         getDetailDocument().addDocumentListener(new IDocumentListener() {
-            public void documentAboutToBeChanged(DocumentEvent event) {}
-            public void documentChanged(DocumentEvent event) {
+            @Override
+			public void documentAboutToBeChanged(DocumentEvent event) {}
+            @Override
+			public void documentChanged(DocumentEvent event) {
                 updateSelectionDependentActions();
             }
         });
         
         // Add the selection listener so selection dependent actions get updated.
         fTextViewer.getSelectionProvider().addSelectionChangedListener(new ISelectionChangedListener() {
-            public void selectionChanged(SelectionChangedEvent event) {
+            @Override
+			public void selectionChanged(SelectionChangedEvent event) {
                 updateSelectionDependentActions();
             }
         });
@@ -565,7 +571,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
         MenuManager menuMgr= new MenuManager(); 
         menuMgr.setRemoveAllWhenShown(true);
         menuMgr.addMenuListener(new IMenuListener() {
-            public void menuAboutToShow(IMenuManager mgr) {
+            @Override
+			public void menuAboutToShow(IMenuManager mgr) {
                 fillDetailContextMenu(mgr);
             }
         });
@@ -596,7 +603,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection)
      */
-    public void display(IStructuredSelection selection) {
+    @Override
+	public void display(IStructuredSelection selection) {
         
         if (selection == null){
             clearTextViewer();
@@ -658,7 +666,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#setFocus()
      */
-    public boolean setFocus(){
+    @Override
+	public boolean setFocus(){
         if (fTextViewer != null){
             fTextViewer.getTextWidget().setFocus();
             return true;
@@ -669,7 +678,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
     /*
      * 
      */
-    public void dispose(){
+    @Override
+	public void dispose(){
         fActionMap.clear();
         fSelectionActions.clear();
         
@@ -689,28 +699,32 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#getDescription()
      */
-    public String getDescription() {
+    @Override
+	public String getDescription() {
         return MessagesForDetailPane.NumberFormatDetailPane_Description;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#getID()
      */
-    public String getID() {
+    @Override
+	public String getID() {
         return ID;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#getName()
      */
-    public String getName() {
+    @Override
+	public String getName() {
         return MessagesForDetailPane.NumberFormatDetailPane_Name;
     }
     
     /* (non-Javadoc)
      * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
      */
-    @SuppressWarnings("rawtypes")
+    @Override
+	@SuppressWarnings("rawtypes")
     public Object getAdapter(Class required) {
         if (IFindReplaceTarget.class.equals(required)) {
             return fTextViewer.getFindReplaceTarget();
@@ -783,7 +797,8 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
     /* (non-Javadoc)
      * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
      */
-    public void propertyChange(PropertyChangeEvent event) {
+    @Override
+	public void propertyChange(PropertyChangeEvent event) {
         String propertyName= event.getProperty();
         if (propertyName.equals(IDebugUIConstants.PREF_DETAIL_PANE_FONT)) {
             fTextViewer.getTextWidget().setFont(JFaceResources.getFont(IDebugUIConstants.PREF_DETAIL_PANE_FONT));
@@ -798,6 +813,7 @@ public class NumberFormatDetailPane implements IDetailPane2, IAdaptable, IProper
 	/*
 	 * @see org.eclipse.debug.ui.IDetailPane2#getSelectionProvider()
 	 */
+	@Override
 	public ISelectionProvider getSelectionProvider() {
 		if (fTextViewer != null) {
 			return fTextViewer.getSelectionProvider();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPaneFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPaneFactory.java
index 95f72918fc2..0ce87a40781 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPaneFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/viewmodel/numberformat/detail/NumberFormatDetailPaneFactory.java
@@ -27,6 +27,7 @@ public class NumberFormatDetailPaneFactory implements IDetailPaneFactory {
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#createDetailsArea(java.lang.String)
      */
+    @Override
     public IDetailPane createDetailPane(String id) {
         return new NumberFormatDetailPane();
     }
@@ -35,6 +36,7 @@ public class NumberFormatDetailPaneFactory implements IDetailPaneFactory {
      * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDetailsTypes(org.eclipse.jface.viewers.IStructuredSelection)
      */
     @SuppressWarnings("rawtypes")
+    @Override
     public Set getDetailPaneTypes(IStructuredSelection selection) {
         Set<String> possibleIDs = new HashSet<String>(1);
         possibleIDs.add(NumberFormatDetailPane.ID);
@@ -44,6 +46,7 @@ public class NumberFormatDetailPaneFactory implements IDetailPaneFactory {
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPaneFactory#getDefaultDetailPane(java.util.Set, org.eclipse.jface.viewers.IStructuredSelection)
      */
+    @Override
     public String getDefaultDetailPane(IStructuredSelection selection) {
         return null; // Allow competing detail pane factories to override this one
     }
@@ -51,6 +54,7 @@ public class NumberFormatDetailPaneFactory implements IDetailPaneFactory {
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getName(java.lang.String)
      */
+    @Override
     public String getDetailPaneName(String id) {
         if (id.equals(NumberFormatDetailPane.ID)){
             return MessagesForDetailPane.NumberFormatDetailPane_Name;
@@ -61,6 +65,7 @@ public class NumberFormatDetailPaneFactory implements IDetailPaneFactory {
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDescription(java.lang.String)
      */
+    @Override
     public String getDetailPaneDescription(String id) {
         if (id.equals(NumberFormatDetailPane.ID)){
             return MessagesForDetailPane.NumberFormatDetailPane_Description;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java
index 81be81d0886..e690a1ababe 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/AbstractDsfDebugTextHover.java
@@ -198,6 +198,7 @@ abstract public class AbstractDsfDebugTextHover extends AbstractDebugTextHover i
 		}
 
 		return new IInformationControlCreator() {
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent, EditorsUI.getTooltipAffordanceString());
 			}
@@ -207,6 +208,7 @@ abstract public class AbstractDsfDebugTextHover extends AbstractDebugTextHover i
 	/*
 	 * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
 	 */
+	@Override
 	public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
     	final String simpleInfo = getHoverInfo(textViewer, hoverRegion);
 		if (!useExpressionExplorer() || simpleInfo == null) {
@@ -222,6 +224,7 @@ abstract public class AbstractDsfDebugTextHover extends AbstractDebugTextHover i
 				final DsfSession dsfSession = DsfSession.getSession(frameDmc.getSessionId());
 				if (dsfSession != null) {
 					Callable<IExpressionDMContext> callable = new Callable<IExpressionDMContext>() {
+						@Override
 						public IExpressionDMContext call() throws Exception {
 							DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), frameDmc.getSessionId());
 							try {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java
index 2f5f152b1f6..5de42f43e9b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/DsfDebugUITools.java
@@ -37,6 +37,7 @@ public class DsfDebugUITools {
 	public static void enableActivity(final String activityID, final boolean enableit)
 	{
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				IWorkbenchActivitySupport workbenchActivitySupport = PlatformUI.getWorkbench().getActivitySupport();
 				IActivityManager activityManager = workbenchActivitySupport.getActivityManager();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/AbstractDisassemblyBreakpointsTarget.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/AbstractDisassemblyBreakpointsTarget.java
index b3e3426d753..db70e81e714 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/AbstractDisassemblyBreakpointsTarget.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/AbstractDisassemblyBreakpointsTarget.java
@@ -47,6 +47,7 @@ public abstract class AbstractDisassemblyBreakpointsTarget implements IToggleBre
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleLineBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException {
 		assert part instanceof IDisassemblyPart && selection instanceof ITextSelection;
 
@@ -69,6 +70,7 @@ public abstract class AbstractDisassemblyBreakpointsTarget implements IToggleBre
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleLineBreakpoints( IWorkbenchPart part, ISelection selection ) {
 		return part instanceof IDisassemblyPart && selection instanceof ITextSelection;
 	}
@@ -76,12 +78,14 @@ public abstract class AbstractDisassemblyBreakpointsTarget implements IToggleBre
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleMethodBreakpoints( IWorkbenchPart part, ISelection selection ) {
 		return false;
 	}
@@ -89,12 +93,14 @@ public abstract class AbstractDisassemblyBreakpointsTarget implements IToggleBre
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleWatchpoints( IWorkbenchPart part, ISelection selection ) throws CoreException {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleWatchpoints( IWorkbenchPart part, ISelection selection ) {
 		return false;
 	}
@@ -102,6 +108,7 @@ public abstract class AbstractDisassemblyBreakpointsTarget implements IToggleBre
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#toggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleBreakpoints( IWorkbenchPart part, ISelection selection ) throws CoreException {
 		toggleLineBreakpoints( part, selection );
 	}
@@ -109,6 +116,7 @@ public abstract class AbstractDisassemblyBreakpointsTarget implements IToggleBre
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#canToggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleBreakpoints( IWorkbenchPart part, ISelection selection ) {
 		return canToggleLineBreakpoints( part, selection );
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfCommandRunnable.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfCommandRunnable.java
index f0e5db0d094..a79fa6e4f5e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfCommandRunnable.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfCommandRunnable.java
@@ -67,7 +67,8 @@ public abstract class DsfCommandRunnable extends DsfRunnable {
         fRequest = request;
     }
     
-    public final void run() {
+    @Override
+	public final void run() {
         if (fRequest.isCanceled()) {
             fRequest.done();
             return;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfResumeCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfResumeCommand.java
index 2632de53142..10e7c464039 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfResumeCommand.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfResumeCommand.java
@@ -41,7 +41,8 @@ public class DsfResumeCommand implements IResumeHandler {
         fTracker.dispose();
     }
 
-    public void canExecute(final IEnabledStateRequest request) {
+    @Override
+	public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1) {
             request.setEnabled(false);
             request.done();
@@ -63,7 +64,8 @@ public class DsfResumeCommand implements IResumeHandler {
         });
     }
     
-    public boolean execute(final IDebugCommandRequest request) {
+    @Override
+	public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1) {
             request.done();
             return false;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoCommand.java
index ba4977fbcd8..0bccbe4f5fc 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoCommand.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoCommand.java
@@ -44,7 +44,8 @@ public class DsfStepIntoCommand implements IStepIntoHandler {
         fTracker.dispose();
     }
     
-    public void canExecute(final IEnabledStateRequest request) {
+    @Override
+	public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1) {
             request.setEnabled(false);
             request.done();
@@ -73,7 +74,8 @@ public class DsfStepIntoCommand implements IStepIntoHandler {
         });
     }
     
-    public boolean execute(final IDebugCommandRequest request) {
+    @Override
+	public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1) {
             request.done();
             return false;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepOverCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepOverCommand.java
index 3dd3d5ebff0..49360864284 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepOverCommand.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepOverCommand.java
@@ -44,6 +44,7 @@ public class DsfStepOverCommand implements IStepOverHandler {
         fTracker.dispose();
     }
     
+    @Override
     public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1) {
             request.setEnabled(false);
@@ -73,6 +74,7 @@ public class DsfStepOverCommand implements IStepOverHandler {
         });
     }
     
+    @Override
 	public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1) {
             request.done();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepReturnCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepReturnCommand.java
index 39cbd864afc..440d70f7d8c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepReturnCommand.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepReturnCommand.java
@@ -42,7 +42,8 @@ public class DsfStepReturnCommand implements IStepReturnHandler {
         fTracker.dispose();
     }
     
-    public void canExecute(final IEnabledStateRequest request) {
+    @Override
+	public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1) {
             request.setEnabled(false);
             request.done();
@@ -70,7 +71,8 @@ public class DsfStepReturnCommand implements IStepReturnHandler {
         });
     }
     
-    public boolean execute(final IDebugCommandRequest request) {
+    @Override
+	public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1) {
             request.done();
             return false;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSteppingModeTarget.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSteppingModeTarget.java
index 420ecd394ff..e4f1ce227a7 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSteppingModeTarget.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSteppingModeTarget.java
@@ -37,6 +37,7 @@ public class DsfSteppingModeTarget implements ISteppingModeTarget, ITargetProper
 	/*
 	 * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#enableInstructionStepping(boolean)
 	 */
+	@Override
 	public void enableInstructionStepping(boolean enabled) {
 		fPreferences.setValue(PREF_INSTRUCTION_STEPPING_MODE, enabled);
 		if (enabled) {
@@ -54,6 +55,7 @@ public class DsfSteppingModeTarget implements ISteppingModeTarget, ITargetProper
 	/*
 	 * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#isInstructionSteppingEnabled()
 	 */
+	@Override
 	public boolean isInstructionSteppingEnabled() {
 		return fPreferences.getBoolean(PREF_INSTRUCTION_STEPPING_MODE);
 	}
@@ -61,6 +63,7 @@ public class DsfSteppingModeTarget implements ISteppingModeTarget, ITargetProper
 	/*
 	 * @see org.eclipse.cdt.debug.core.model.ISteppingModeTarget#supportsInstructionStepping()
 	 */
+	@Override
 	public boolean supportsInstructionStepping() {
 		return true;
 	}
@@ -68,6 +71,7 @@ public class DsfSteppingModeTarget implements ISteppingModeTarget, ITargetProper
 	/*
 	 * @see org.eclipse.cdt.debug.core.model.ITargetProperties#addPropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener)
 	 */
+	@Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
 		fPreferences.addPropertyChangeListener(listener);
 	}
@@ -75,6 +79,7 @@ public class DsfSteppingModeTarget implements ISteppingModeTarget, ITargetProper
 	/*
 	 * @see org.eclipse.cdt.debug.core.model.ITargetProperties#removePropertyChangeListener(org.eclipse.core.runtime.Preferences.IPropertyChangeListener)
 	 */
+	@Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 		fPreferences.removePropertyChangeListener(listener);
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSuspendCommand.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSuspendCommand.java
index 2b0e7f21fd0..ebc32610586 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSuspendCommand.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfSuspendCommand.java
@@ -40,7 +40,8 @@ public class DsfSuspendCommand implements ISuspendHandler {
         fTracker.dispose();
     }
 
-    public void canExecute(final IEnabledStateRequest request) {
+    @Override
+	public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1) {
             request.setEnabled(false);
             request.done();
@@ -62,7 +63,8 @@ public class DsfSuspendCommand implements ISuspendHandler {
         });
     }
 
-    public boolean execute(final IDebugCommandRequest request) {
+    @Override
+	public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1) {
             request.done();
             return false;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java
index a9989a05808..27cc540ff89 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/contexts/DsfSuspendTrigger.java
@@ -67,6 +67,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
         fServicesTracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), fSession.getId());
         try {
             fSession.getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     if (!fDisposed) {
                         fSession.addServiceEventListener(DsfSuspendTrigger.this, null);
@@ -78,6 +79,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
     }
     
     @ThreadSafe
+    @Override
     public void addSuspendTriggerListener(final ISuspendTriggerListener listener) {
         fListeners.add(listener);
 
@@ -102,6 +104,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
     }
 
     @ThreadSafe
+    @Override
     public void removeSuspendTriggerListener(ISuspendTriggerListener listener) { 
         fListeners.remove(listener);
     }
@@ -110,6 +113,7 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
     public void dispose() {
         try {
             fSession.getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     if (fEventListenerRegisterd) {
                         fSession.removeServiceEventListener(DsfSuspendTrigger.this);
@@ -201,10 +205,12 @@ public class DsfSuspendTrigger implements ISuspendTrigger {
                     for (int i = 0; i < listeners.length; i++) {
                         final ISuspendTriggerListener listener = (ISuspendTriggerListener) listeners[i];
                         SafeRunner.run(new ISafeRunnable() {
-                            public void run() throws Exception {
+                            @Override
+                           public void run() throws Exception {
                                 listener.suspended(fLaunch, context);
                             }
                         
+                            @Override
                             public void handleException(Throwable exception) {
                                 status.add(new Status(
                                     IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, "Exception while calling suspend trigger listeners", exception)); //$NON-NLS-1$
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/RefreshAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/RefreshAction.java
index 3bf21859cb6..95b9b07ea09 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/RefreshAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/RefreshAction.java
@@ -35,10 +35,12 @@ public class RefreshAction implements IViewActionDelegate {
 	
 	private IMemoryRenderingSite fsite;
 	
+	@Override
 	public void init(IViewPart view) {
 		fsite = (IMemoryRenderingSite) view;
 	}
 
+	@Override
 	public void run(IAction action) {
 		
 		if(fMemoryBlock instanceof IMemoryBlockUpdatePolicyProvider)
@@ -60,6 +62,7 @@ public class RefreshAction implements IViewActionDelegate {
 		}
 	}
 
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		fMemoryBlock = null;
     	action.setEnabled(false);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/SelectUpdatePolicyAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/SelectUpdatePolicyAction.java
index 46d8083a603..4ce65ffd004 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/SelectUpdatePolicyAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/memory/SelectUpdatePolicyAction.java
@@ -41,11 +41,13 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
 	private IAction fAction = null;
     private IMemoryBlock fMemoryBlock = null;
 	
-    public void dispose() {
+    @Override
+	public void dispose() {
 		// do nothing
 		
 	}
 
+	@Override
 	public void runWithEvent(IAction action, Event event) {
 		// do nothing
 	}
@@ -73,26 +75,31 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
     }
 
 
-    public Menu getMenu(Control parent) {
+    @Override
+	public Menu getMenu(Control parent) {
         // Never called
         return null;
     }
     
     protected IAction getAction() { return fAction; }
     
-    public void init(IViewPart view) {
+    @Override
+	public void init(IViewPart view) {
     }
 
-    public void init(IAction action) {
+    @Override
+	public void init(IAction action) {
     	fAction = action;
         action.setMenuCreator(this);
     }
     
-    public void run(IAction action) {
+    @Override
+	public void run(IAction action) {
         // Do nothing, this is a pull-down menu
     }
 
-    public void selectionChanged(IAction action, ISelection selection) {
+    @Override
+	public void selectionChanged(IAction action, ISelection selection) {
     	fMemoryBlock = null;
     	action.setEnabled(false);
     	if(selection instanceof IStructuredSelection)
@@ -112,10 +119,12 @@ public class SelectUpdatePolicyAction implements IMenuCreator, IViewActionDelega
     	}
     }
     
-    public void debugContextChanged(DebugContextEvent event) {
+    @Override
+	public void debugContextChanged(DebugContextEvent event) {
     }
     
-    public Menu getMenu(Menu parent) {
+    @Override
+	public Menu getMenu(Menu parent) {
         Menu menu = new Menu(parent);
         menu.addMenuListener(new MenuAdapter() {
             @Override
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
index 33976f31e08..5e322b82711 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
@@ -182,7 +182,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
             }
             
 			final SourceLookupResult result = performLookup();
-            executeFromJob(new DsfRunnable() { public void run() {
+            executeFromJob(new DsfRunnable() { @Override
+			public void run() {
                 if (!monitor.isCanceled()) { 
                     fPrevResult = result;
                     fPrevFrameData = fFrameData;
@@ -264,7 +265,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
 		private final FrameData fFrameData;
 
 		private final DsfRunnable fDisplayJobFinishedRunnable = new DsfRunnable() { 
-            public void run() {
+            @Override
+			public void run() {
                 // If the current display job does not match up with "this", it means that this job got canceled
                 // after it already completed and after this runnable was queued into the dispatch thread.
                 if (fRunningDisplayJob == DisplayJob.this) {
@@ -389,6 +391,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
         private IEditorPart openEditor(final IWorkbenchPage page, final IEditorInput input, final String id) {
             final IEditorPart[] editor = new IEditorPart[] {null};
             Runnable r = new Runnable() {
+				@Override
 				public void run() {
                     if (!page.getWorkbenchWindow().getWorkbench().isClosing()) {
                         try {
@@ -545,7 +548,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
          */
         @Override
         public IStatus runInUIThread(IProgressMonitor monitor) {
-            DsfRunnable clearingJobFinishedRunnable = new DsfRunnable() { public void run() {
+            DsfRunnable clearingJobFinishedRunnable = new DsfRunnable() { @Override
+			public void run() {
                 assert fRunningClearingJob == ClearingJob.this;
                 fRunningClearingJob = null;
                 serviceDisplayAndClearingJobs();
@@ -612,7 +616,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
         final IInstructionPointerPresentation ipPresentation = (IInstructionPointerPresentation) session.getModelAdapter(IInstructionPointerPresentation.class);
 		fIPManager = new InstructionPointerManager(ipPresentation);
         
-        fExecutor.execute(new DsfRunnable() { public void run() {
+        fExecutor.execute(new DsfRunnable() { @Override
+		public void run() {
         	fSession.addServiceEventListener(DsfSourceDisplayAdapter.this, null);
         }});
 
@@ -641,7 +646,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
 		}
 		
 		try {
-			fExecutor.execute(new DsfRunnable() { public void run() {
+			fExecutor.execute(new DsfRunnable() { @Override
+			public void run() {
 				fSession.removeServiceEventListener(DsfSourceDisplayAdapter.this);
 			}});
 		} catch (RejectedExecutionException e) {
@@ -657,6 +663,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
         Display display = Display.getDefault();
         if (!display.isDisposed()) {
         	display.asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					enableLineBackgroundPainter();
 			        fIPManager.removeAllAnnotations();
@@ -667,6 +674,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.contexts.ISourceDisplayAdapter#displaySource(java.lang.Object, org.eclipse.ui.IWorkbenchPage, boolean)
 	 */
+	@Override
 	public void displaySource(Object context, final IWorkbenchPage page,
 			final boolean force) {
 		fStepCount = 0;
@@ -691,7 +699,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
     		return;
     	}
         // Re-dispatch to executor thread before accessing job lists.
-        fExecutor.execute(new DsfRunnable() { public void run() {
+        fExecutor.execute(new DsfRunnable() { @Override
+		public void run() {
             // We need to retrieve the frame level and line number from the service.  
         	IStack stackService = fServicesTracker.getService(IStack.class); 
             if (stackService == null) {
@@ -799,7 +808,8 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
         	if (dmc != null) {
         		try {
         			fController.getExecutor().execute(new DsfRunnable() {
-        				public void run() {
+        				@Override
+						public void run() {
         					fController.doneStepping(dmc, DsfSourceDisplayAdapter.this);
         				};
         			});
@@ -879,6 +889,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
     	    if (DEBUG) System.out.println("[DsfSourceDisplayAdapter] eventDispatched e="+e); //$NON-NLS-1$
 	        // trigger source display immediately (should be optional?)
 	        Display.getDefault().asyncExec(new Runnable() {
+				@Override
 				public void run() {
 			        Object context = DebugUITools.getDebugContext();
 			        if (context instanceof IDMVMContext) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerImageProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerImageProvider.java
index 4478e0e2c39..fdcdb7a90d5 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerImageProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerImageProvider.java
@@ -31,6 +31,7 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation)
 	 */
+	@Override
 	public Image getManagedImage(Annotation annotation) {
 		return ((IPAnnotation)annotation).getImage();
 	}
@@ -38,6 +39,7 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation)
 	 */
+	@Override
 	public String getImageDescriptorId(Annotation annotation) {
 		return null;
 	}
@@ -45,6 +47,7 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String)
 	 */
+	@Override
 	public ImageDescriptor getImageDescriptor(String imageDescritporId) {
 		return null;
 	}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerManager.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerManager.java
index 5bc3e98902d..2018d539fec 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerManager.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/InstructionPointerManager.java
@@ -108,7 +108,8 @@ class InstructionPointerManager {
         /*
          * @see org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse.swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle)
          */
-        public void paint(GC gc, Canvas canvas, Rectangle bounds) {
+        @Override
+		public void paint(GC gc, Canvas canvas, Rectangle bounds) {
             Rectangle imageBounds = fImage.getBounds();
             gc.drawImage(fImage, bounds.x + (bounds.width - imageBounds.width) / 2 , bounds.y + (bounds.height - imageBounds.height) / 2);
         }
@@ -116,7 +117,8 @@ class InstructionPointerManager {
         /*
          * @see org.eclipse.jface.text.source.IAnnotationPresentation#getLayer()
          */
-        public int getLayer() {
+        @Override
+		public int getLayer() {
             return 5;
         }
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java
index 72a078d51b5..e7c58f5da48 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/AbstractDebugVMAdapter.java
@@ -35,7 +35,8 @@ public class AbstractDebugVMAdapter extends AbstractDMVMAdapter
         fController = controller;
         try {
             fController.getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     fController.addSteppingControlParticipant(AbstractDebugVMAdapter.this);
                 }
             });
@@ -54,7 +55,8 @@ public class AbstractDebugVMAdapter extends AbstractDMVMAdapter
         if (event instanceof IRunControl.ISuspendedDMEvent) {
             final ISuspendedDMEvent suspendedEvent= (IRunControl.ISuspendedDMEvent) event;
             fController.getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     fController.doneStepping(suspendedEvent.getDMContext(), AbstractDebugVMAdapter.this);
                 };
             });
@@ -65,7 +67,8 @@ public class AbstractDebugVMAdapter extends AbstractDMVMAdapter
     public void dispose() {
         try {
 	        fController.getExecutor().execute(new DsfRunnable() {
-	            public void run() {
+	            @Override
+				public void run() {
 	                fController.removeSteppingControlParticipant(AbstractDebugVMAdapter.this);
 	            }
 	        });
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
index f49e29cde77..7046d450677 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/SteppingController.java
@@ -126,6 +126,7 @@ public final class SteppingController {
 		
 		private final IExecutionDMContext fDmc;
 		
+		@Override
 		public void run() {
 			fTimedOutFutures.remove(fDmc);
 
@@ -187,7 +188,8 @@ public final class SteppingController {
         final IPreferenceStore store= DsfUIPlugin.getDefault().getPreferenceStore();
 
         fPreferencesListener = new IPropertyChangeListener() {
-            public void propertyChange(final PropertyChangeEvent event) {
+            @Override
+			public void propertyChange(final PropertyChangeEvent event) {
                 handlePropertyChanged(store, event);
             }};
         store.addPropertyChangeListener(fPreferencesListener);
@@ -199,7 +201,8 @@ public final class SteppingController {
     public void dispose() {
         try {
             fSession.getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     if (fRunControl != null) {
                         getSession().removeServiceEventListener(SteppingController.this);
                     }
@@ -492,6 +495,7 @@ public final class SteppingController {
 			final int stepDelay = getStepDelay(execCtx);
 			if (stepDelay > 0) {
 				getExecutor().schedule(new DsfRunnable() {
+					@Override
 					public void run() {
 						processStepQueue(execCtx);
 					}
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java
index 2d063f9c9e7..168b63e1aad 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/AbstractVMProviderActionDelegate.java
@@ -38,6 +38,7 @@ abstract public class AbstractVMProviderActionDelegate implements IViewActionDel
     private IAction fAction = null;
     private ISelection fDebugContext;
 	
+    @Override
 	public void init(IViewPart view) {
         fView = view;
         
@@ -47,24 +48,29 @@ abstract public class AbstractVMProviderActionDelegate implements IViewActionDel
         fDebugContext = debugContextService.getActiveContext(); 
 	}
 
+    @Override
     public void selectionChanged(IAction action, ISelection selection) {
         if (fAction != action) {
             fAction = action;
         }
     }
     
+    @Override
     public void runWithEvent(IAction action, Event event) {
         run(action);
     }
 
+    @Override
     public void init(IAction action) {
         fAction = action;
     }
 
+    @Override
     public void dispose() {
         DebugUITools.getDebugContextManager().getContextService(getView().getSite().getWorkbenchWindow()).removePostDebugContextListener(this);
     }
     
+    @Override
     public void debugContextChanged(DebugContextEvent event) {
         fDebugContext = event.getContext();
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/DefaultRefreshAllTarget.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/DefaultRefreshAllTarget.java
index 0185c5b8cf7..fdb754abdb1 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/DefaultRefreshAllTarget.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/actions/DefaultRefreshAllTarget.java
@@ -26,7 +26,8 @@ import org.eclipse.jface.viewers.IStructuredSelection;
  */
 public class DefaultRefreshAllTarget implements IRefreshAllTarget {
 
-    public void refresh(ISelection debugContext) throws CoreException {
+    @Override
+	public void refresh(ISelection debugContext) throws CoreException {
         IVMAdapter adapter = getActiveVMAdapter( debugContext );
 
         if (adapter != null) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/AbstractBreakpointVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/AbstractBreakpointVMNode.java
index 2ad94355701..58b2c7426c1 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/AbstractBreakpointVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/AbstractBreakpointVMNode.java
@@ -55,7 +55,8 @@ public abstract class AbstractBreakpointVMNode extends AbstractVMNode {
      */
     abstract protected Object createBreakpiontElement(IBreakpoint bp);
     
-    public void update(final IHasChildrenUpdate[] updates) {
+    @Override
+	public void update(final IHasChildrenUpdate[] updates) {
         for (final IHasChildrenUpdate update : updates) {
             if (!checkUpdate(update)) continue;
             ((BreakpointVMProvider)getVMProvider()).getNestingCategoryBreakpoints(
@@ -74,7 +75,8 @@ public abstract class AbstractBreakpointVMNode extends AbstractVMNode {
         }
     }
 
-    public void update(final IChildrenCountUpdate[] updates) {
+    @Override
+	public void update(final IChildrenCountUpdate[] updates) {
         for (final IChildrenCountUpdate update : updates) {
             if (!checkUpdate(update)) continue;
             ((BreakpointVMProvider)getVMProvider()).getNestingCategoryBreakpoints(
@@ -93,7 +95,8 @@ public abstract class AbstractBreakpointVMNode extends AbstractVMNode {
         }
     }
     
-    public void update(IChildrenUpdate[] updates) {
+    @Override
+	public void update(IChildrenUpdate[] updates) {
         for (final IChildrenUpdate update : updates) {
             if (!checkUpdate(update)) continue;
             ((BreakpointVMProvider)getVMProvider()).getNestingCategoryBreakpoints(
@@ -126,7 +129,8 @@ public abstract class AbstractBreakpointVMNode extends AbstractVMNode {
         }
     }
     
-    public int getDeltaFlags(Object event) {
+    @Override
+	public int getDeltaFlags(Object event) {
         if (event instanceof BreakpointsChangedEvent) {
             BreakpointsChangedEvent bpChangedEvent = ((BreakpointsChangedEvent)event);
             if (BreakpointsChangedEvent.Type.ADDED.equals(bpChangedEvent.getType())) {
@@ -167,7 +171,8 @@ public abstract class AbstractBreakpointVMNode extends AbstractVMNode {
         return 0;
     }
 
-    public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor rm) {
+    @Override
+	public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor rm) {
         if (event instanceof BreakpointsChangedEvent) {
             BreakpointsChangedEvent bpChangedEvent = ((BreakpointsChangedEvent)event);
             if (BreakpointsChangedEvent.Type.ADDED.equals(bpChangedEvent.getType())) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMContext.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMContext.java
index 163b58b3e6e..5c9844a5582 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMContext.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMContext.java
@@ -45,15 +45,18 @@ public class BreakpointOrganizerVMContext extends AbstractVMContext implements I
         return getOrganizer().hashCode() + getVMNode().hashCode() + fCategory.hashCode();
     }
 
-    public IBreakpointOrganizer getOrganizer() {
+    @Override
+	public IBreakpointOrganizer getOrganizer() {
         return ((BreakpointOrganizerVMNode)getVMNode()).getOrganizer();
     }
     
-    public IAdaptable getCategory() {
+    @Override
+	public IAdaptable getCategory() {
         return fCategory;
     }
     
-    public boolean contains(IBreakpoint breakpoint) {
+    @Override
+	public boolean contains(IBreakpoint breakpoint) {
         for (IBreakpoint bp : fBreakpoints) {
             if (bp.equals(breakpoint)) {
                 return true;
@@ -62,7 +65,8 @@ public class BreakpointOrganizerVMContext extends AbstractVMContext implements I
         return false;
     }
     
-    public IBreakpoint[] getBreakpoints() {
+    @Override
+	public IBreakpoint[] getBreakpoints() {
         return fBreakpoints;
     }
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java
index b326a0219bc..ab9576fcd8d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointOrganizerVMNode.java
@@ -37,6 +37,7 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
     private final IBreakpointOrganizer fOrganizer;
 
     private final IPropertyChangeListener fOrganizerListener = new IPropertyChangeListener() {
+        @Override
         public void propertyChange(PropertyChangeEvent event) {
             ((BreakpointVMProvider)getVMProvider()).handleEventInExecThread(event);
         }
@@ -58,6 +59,7 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
         return fOrganizer;
     }
     
+    @Override
     public void update(final IHasChildrenUpdate[] updates) {
         for (final IHasChildrenUpdate update : updates) {
             if (!checkUpdate(update)) continue;
@@ -73,6 +75,7 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
         }
     }
 
+    @Override
     public void update(final IChildrenCountUpdate[] updates) {
         for (final IChildrenCountUpdate update : updates) {
             if (!checkUpdate(update)) continue;
@@ -88,6 +91,7 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
         }
     }
     
+    @Override
     public void update(IChildrenUpdate[] updates) {
         for (final IChildrenUpdate update : updates) {
             if (!checkUpdate(update)) continue;
@@ -114,6 +118,7 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
         return new BreakpointOrganizerVMContext(this, category, breakpoints);
     }
     
+    @Override
     public int getDeltaFlags(Object event) {
         if (event instanceof BreakpointsChangedEvent) {
             return IModelDelta.CONTENT;
@@ -132,6 +137,7 @@ public class BreakpointOrganizerVMNode extends AbstractVMNode {
         return 0;
     }
 
+    @Override
     public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor requestMonitor) {
         if (event instanceof BreakpointsChangedEvent) {
             parent.setFlags(parent.getFlags() | IModelDelta.CONTENT);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMInput.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMInput.java
index 7ca9d96be75..7e56a2a3fff 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMInput.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMInput.java
@@ -30,18 +30,21 @@ public class BreakpointVMInput extends AbstractVMContext implements IElementMeme
         fDMContext = dmc;
     }
 
-    public IDMContext getDMContext() {
+    @Override
+	public IDMContext getDMContext() {
         return fDMContext;
     }
     
-    public void encodeElements(IElementMementoRequest[] requests) {
+    @Override
+	public void encodeElements(IElementMementoRequest[] requests) {
         for (IElementMementoRequest request : requests) {
             request.getMemento().putString("ELEMENT_NAME", "BreakpointInputMemento");  //$NON-NLS-1$//$NON-NLS-2$
             request.done();
         }
     }
     
-    public void compareElements(IElementCompareRequest[] requests) {
+    @Override
+	public void compareElements(IElementCompareRequest[] requests) {
         for (IElementCompareRequest request : requests) {
             request.setEqual( "BreakpointInputMemento".equals(request.getMemento().getString("ELEMENT_NAME")) );  //$NON-NLS-1$//$NON-NLS-2$
             request.done();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMModelProxyStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMModelProxyStrategy.java
index c6e9ea23073..92069541abb 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMModelProxyStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMModelProxyStrategy.java
@@ -31,7 +31,8 @@ public class BreakpointVMModelProxyStrategy extends DefaultVMModelProxyStrategy
         super(provider, rootElement);
     }
     
-    public boolean setChecked(IPresentationContext context, Object viewerInput, TreePath path, boolean checked) {
+    @Override
+	public boolean setChecked(IPresentationContext context, Object viewerInput, TreePath path, boolean checked) {
         Object lastSegment = path.getLastSegment();
         if (lastSegment instanceof IBreakpointContainer) {
             IBreakpoint[] breakpoints = ((IBreakpointContainer) lastSegment).getBreakpoints();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMNode.java
index e223a732c97..67dda5908d7 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMNode.java
@@ -49,6 +49,7 @@ public class BreakpointVMNode extends AbstractBreakpointVMNode implements IEleme
         return new BreakpointVMContext(this, bp);
     }
 
+    @Override
     public void update(ILabelUpdate[] updates) {
         Map<IElementLabelProvider, List<ILabelUpdate>> delegatesMap = new HashMap<IElementLabelProvider, List<ILabelUpdate>>(1,1);
         
@@ -66,27 +67,43 @@ public class BreakpointVMNode extends AbstractBreakpointVMNode implements IEleme
                 delegatesMap.put(provider, delegatesList);
             }
             delegatesList.add(new ICheckUpdate() {
+                @Override
                 public void setChecked(boolean checked, boolean grayed) {
                     if (update instanceof ICheckUpdate) {
                         ((ICheckUpdate)update).setChecked(checked, grayed);
                     }
                 }
+                @Override
                 public String[] getColumnIds() { return update.getColumnIds(); }
+                @Override
                 public void setLabel(String text, int columnIndex) { 
                 	update.setLabel(text, columnIndex); 
                 	}
+                @Override
                 public void setFontData(FontData fontData, int columnIndex) { update.setFontData(fontData, columnIndex); }
+                @Override
                 public void setImageDescriptor(ImageDescriptor image, int columnIndex) { update.setImageDescriptor(image, columnIndex); }
+                @Override
                 public void setForeground(RGB foreground, int columnIndex) { update.setForeground(foreground, columnIndex); }
+                @Override
                 public void setBackground(RGB background, int columnIndex) { update.setBackground(background, columnIndex); }
+                @Override
                 public IPresentationContext getPresentationContext() { return update.getPresentationContext(); }
+                @Override
                 public Object getElement() { return bp; }
+                @Override
                 public TreePath getElementPath() { return update.getElementPath().getParentPath().createChildPath(bp); }
+                @Override
                 public Object getViewerInput() { return update.getViewerInput(); }
+                @Override
                 public void setStatus(IStatus status) { update.setStatus(status); }
+                @Override
                 public IStatus getStatus() { return update.getStatus(); }
+                @Override
                 public void done() { update.done(); }
+                @Override
                 public void cancel() { update.cancel(); }
+                @Override
                 public boolean isCanceled() { return update.isCanceled(); }
             });
         }
@@ -97,6 +114,7 @@ public class BreakpointVMNode extends AbstractBreakpointVMNode implements IEleme
         }
     }
     
+    @Override
     public void encodeElements(IElementMementoRequest[] updates) {
         Map<IElementMementoProvider, List<IElementMementoRequest>> delegatesMap = new HashMap<IElementMementoProvider, List<IElementMementoRequest>>(1,1);
         
@@ -114,15 +132,25 @@ public class BreakpointVMNode extends AbstractBreakpointVMNode implements IEleme
                 delegatesMap.put(provider, delegatesList);
             }
             delegatesList.add(new IElementMementoRequest() {
+                @Override
                 public IMemento getMemento() { return update.getMemento(); }
+                @Override
                 public IPresentationContext getPresentationContext() { return update.getPresentationContext(); }
+                @Override
                 public Object getElement() { return bp; }
+                @Override
                 public TreePath getElementPath() { return update.getElementPath().getParentPath().createChildPath(bp); }
+                @Override
                 public Object getViewerInput() { return update.getViewerInput(); }
+                @Override
                 public void setStatus(IStatus status) { update.setStatus(status); }
+                @Override
                 public IStatus getStatus() { return update.getStatus(); }
+                @Override
                 public void done() { update.done(); }
+                @Override
                 public void cancel() { update.cancel(); }
+                @Override
                 public boolean isCanceled() { return update.isCanceled(); }
             });
         }
@@ -133,6 +161,7 @@ public class BreakpointVMNode extends AbstractBreakpointVMNode implements IEleme
         }
     }
     
+    @Override
     public void compareElements(IElementCompareRequest[] updates) {
         Map<IElementMementoProvider, List<IElementCompareRequest>> delegatesMap = new HashMap<IElementMementoProvider, List<IElementCompareRequest>>(1,1);
         
@@ -150,16 +179,27 @@ public class BreakpointVMNode extends AbstractBreakpointVMNode implements IEleme
                 delegatesMap.put(provider, delegatesList);
             }
             delegatesList.add(new IElementCompareRequest() {
+                @Override
                 public IMemento getMemento() { return update.getMemento(); }
+                @Override
                 public void setEqual(boolean equal) { update.setEqual(equal);}
+                @Override
                 public IPresentationContext getPresentationContext() { return update.getPresentationContext(); }
+                @Override
                 public Object getElement() { return bp; }
+                @Override
                 public TreePath getElementPath() { return update.getElementPath().getParentPath().createChildPath(bp); }
+                @Override
                 public Object getViewerInput() { return update.getViewerInput(); }
+                @Override
                 public void setStatus(IStatus status) { update.setStatus(status); }
+                @Override
                 public IStatus getStatus() { return update.getStatus(); }
+                @Override
                 public void done() { update.done(); }
+                @Override
                 public void cancel() { update.cancel(); }
+                @Override
                 public boolean isCanceled() { return update.isCanceled(); }
             });
         }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java
index f632b7119d4..8dca8d2f91b 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/breakpoints/BreakpointVMProvider.java
@@ -73,20 +73,24 @@ import org.eclipse.ui.IWorkbenchWindow;
 public class BreakpointVMProvider extends AbstractVMProvider 
 {
     private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
+        @Override
         public void propertyChange(PropertyChangeEvent event) {
             handleEventInExecThread(event);
         }        
     };
 
     private IBreakpointsListener fBreakpointsListener = new IBreakpointsListener() {
+        @Override
         public void breakpointsRemoved(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
             handleEventInExecThread(new BreakpointsChangedEvent(BreakpointsChangedEvent.Type.REMOVED, breakpoints));
         }
         
+        @Override
         public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
             handleEventInExecThread(new BreakpointsChangedEvent(BreakpointsChangedEvent.Type.CHANGED, breakpoints));
         }
         
+        @Override
         public void breakpointsAdded(IBreakpoint[] breakpoints) {
             handleEventInExecThread(new BreakpointsChangedEvent(BreakpointsChangedEvent.Type.ADDED, breakpoints));
         }
@@ -94,6 +98,7 @@ public class BreakpointVMProvider extends AbstractVMProvider
     };
  
     private IDebugContextListener fDebugContextListener = new IDebugContextListener() {
+        @Override
         public void debugContextChanged(final DebugContextEvent event) {
             handleEventInExecThread(event);
         }
@@ -332,6 +337,7 @@ public class BreakpointVMProvider extends AbstractVMProvider
     
     public void handleEventInExecThread(final Object event) {
         getExecutor().execute(new DsfRunnable() {
+            @Override
             public void run() {
                 handleEvent(event);
             }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
index 48635bf62be..7f0ca69862e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/AbstractExpressionVMNode.java
@@ -52,7 +52,8 @@ public abstract class AbstractExpressionVMNode extends AbstractDMVMNode
         super(provider, session, dmcClassType);
     }
 
-    public void update(final IExpressionUpdate update) {
+    @Override
+	public void update(final IExpressionUpdate update) {
         if (!canParseExpression(update.getExpression())) {
             // This method should not be called if canParseExpression() returns false.
             // Return an internal error status.
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/DisabledExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/DisabledExpressionVMNode.java
index f1ab7a4b4b9..2a28017becd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/DisabledExpressionVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/DisabledExpressionVMNode.java
@@ -96,22 +96,27 @@ public class DisabledExpressionVMNode extends AbstractVMNode
         super(provider);
     }
     
+    @Override
     public boolean canParseExpression(IExpression expression) {
         return expression instanceof IWatchExpression && !((IWatchExpression)expression).isEnabled();
     }
 
+    @Override
     public int getDeltaFlagsForExpression(IExpression expression, Object event) {
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public int getDeltaFlags(Object event) {
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor requestMonitor) {
         requestMonitor.done();
     }
 
+    @Override
     public void update(IChildrenCountUpdate[] updates) {
         for (IViewerUpdate update : updates) {
             update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
@@ -119,6 +124,7 @@ public class DisabledExpressionVMNode extends AbstractVMNode
         }
     }
 
+    @Override
     public void update(IChildrenUpdate[] updates) {
         for (IViewerUpdate update : updates) {
             update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
@@ -126,6 +132,7 @@ public class DisabledExpressionVMNode extends AbstractVMNode
         }
     }
 
+    @Override
     public void update(IHasChildrenUpdate[] updates) {
         for (IViewerUpdate update : updates) {
             update.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "Not supported", null)); //$NON-NLS-1$
@@ -133,22 +140,26 @@ public class DisabledExpressionVMNode extends AbstractVMNode
         }
     }
 
+    @Override
     public void update(IExpressionUpdate update) {
         update.setExpressionElement(new DisabledExpressionVMContext(this, update.getExpression()));
         update.done();
     }
 
+    @Override
     public void buildDeltaForExpression(IExpression expression, int elementIdx, Object event, VMDelta parentDelta, 
         TreePath path, RequestMonitor rm) 
     {
         rm.done();
     }
 
+    @Override
     public void buildDeltaForExpressionElement(Object element, int elementIdx, Object event, VMDelta parentDelta,
         RequestMonitor rm) {
         rm.done();
     }
     
+    @Override
     public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
         if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnId)) {
             return new TextCellEditor(parent);
@@ -156,6 +167,7 @@ public class DisabledExpressionVMNode extends AbstractVMNode
         return null;
     }
     
+    @Override
     public ICellModifier getCellModifier(IPresentationContext context, Object element) {
         return fWatchExpressionCellModifier;
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java
index a9a2e642dff..1e73cd03fe0 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionColumnPresentation.java
@@ -23,19 +23,23 @@ public class ExpressionColumnPresentation implements IColumnPresentation {
 
     public static final String ID = DsfUIPlugin.PLUGIN_ID + ".EXPRESSION_COLUMN_PRESENTATION_ID"; //$NON-NLS-1$
 
-    public void init(IPresentationContext context) {
+    @Override
+	public void init(IPresentationContext context) {
     }
     
-    public void dispose() {
+    @Override
+	public void dispose() {
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getAvailableColumns()
-    public String[] getAvailableColumns() {
+    @Override
+	public String[] getAvailableColumns() {
         return new String[] { IDebugVMConstants.COLUMN_ID__EXPRESSION, IDebugVMConstants.COLUMN_ID__NAME, IDebugVMConstants.COLUMN_ID__TYPE, IDebugVMConstants.COLUMN_ID__VALUE, IDebugVMConstants.COLUMN_ID__DESCRIPTION, IDebugVMConstants.COLUMN_ID__ADDRESS };
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getHeader(java.lang.String)
-    public String getHeader(String id) {
+    @Override
+	public String getHeader(String id) {
         if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(id)) {
             return MessagesForExpressionVM.ExpressionColumnPresentation_expression; 
         } else if (IDebugVMConstants.COLUMN_ID__NAME.equals(id)) {
@@ -53,21 +57,25 @@ public class ExpressionColumnPresentation implements IColumnPresentation {
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getId()
-    public String getId() {
+    @Override
+	public String getId() {
         return ID;
     }
     
-    public ImageDescriptor getImageDescriptor(String id) {
+    @Override
+	public ImageDescriptor getImageDescriptor(String id) {
         return null;
     } 
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getInitialColumns()
-    public String[] getInitialColumns() {
+    @Override
+	public String[] getInitialColumns() {
         return new String[] { IDebugVMConstants.COLUMN_ID__EXPRESSION, IDebugVMConstants.COLUMN_ID__TYPE, IDebugVMConstants.COLUMN_ID__VALUE };
     }
     
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#isOptional()
-    public boolean isOptional() {
+    @Override
+	public boolean isOptional() {
         return true;
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java
index 7429e5d1dca..a5098e6059f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionManagerVMNode.java
@@ -117,6 +117,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode
         return (ExpressionVMProvider)getVMProvider();
     }
 
+    @Override
     public void update(IHasChildrenUpdate[] updates) {
         // Test availability of children based on whether there are any expressions 
         // in the manager.  We assume that the getExpressions() will just read 
@@ -128,6 +129,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode
         }
     }
     
+    @Override
     public void update(IChildrenCountUpdate[] updates) {
         for (IChildrenCountUpdate update : updates) {
             if (!checkUpdate(update)) continue;
@@ -139,6 +141,7 @@ public class ExpressionManagerVMNode extends AbstractVMNode
         }
     }
     
+    @Override
     public void update(final IChildrenUpdate[] updates) {
         for (IChildrenUpdate update : updates) {
             doUpdateChildren(update);
@@ -203,7 +206,8 @@ public class ExpressionManagerVMNode extends AbstractVMNode
         multiRm.setDoneCount(multiRmCount);
     }
 
-    public void update(ILabelUpdate[] updates) {
+    @Override
+	public void update(ILabelUpdate[] updates) {
         // The label update handler only handles labels for the invalid expression VMCs.
         // The expression layout nodes are responsible for supplying label providers 
         // for their VMCs.
@@ -240,7 +244,8 @@ public class ExpressionManagerVMNode extends AbstractVMNode
         update.done();
     }
 
-    public int getDeltaFlags(Object event) {
+    @Override
+	public int getDeltaFlags(Object event) {
         int retVal = 0;
         
         // Add a flag if the list of expressions in the global expression manager has changed.
@@ -255,7 +260,8 @@ public class ExpressionManagerVMNode extends AbstractVMNode
         return retVal;
     }
 
-    public void buildDelta(final Object event, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
+    @Override
+	public void buildDelta(final Object event, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
         if (event instanceof ExpressionsChangedEvent) {
             buildDeltaForExpressionsChangedEvent((ExpressionsChangedEvent)event, parentDelta, nodeOffset, requestMonitor);
         } else {
@@ -314,7 +320,8 @@ public class ExpressionManagerVMNode extends AbstractVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellEditor(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, java.lang.Object, org.eclipse.swt.widgets.Composite)
      */
-    public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
+    @Override
+	public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
         if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnId)) {
             return new TextCellEditor(parent);
         } 
@@ -325,7 +332,8 @@ public class ExpressionManagerVMNode extends AbstractVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellModifier(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object)
      */
-    public ICellModifier getCellModifier(IPresentationContext context, Object element) {
+    @Override
+	public ICellModifier getCellModifier(IPresentationContext context, Object element) {
         if ( fWatchExpressionCellModifier == null ) {
         	fWatchExpressionCellModifier = createCellModifier();
         }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProvider.java
index edc462ff673..0be570cf919 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProvider.java
@@ -76,7 +76,8 @@ public class ExpressionVMProvider extends AbstractDMVMProvider
     private IExpressionVMNode[] fExpressionNodes;
 
     private IPropertyChangeListener fPreferencesListener = new IPropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent event) {
+        @Override
+		public void propertyChange(PropertyChangeEvent event) {
             String property = event.getProperty();
 			if (property.equals(IDsfDebugUIConstants.PREF_WAIT_FOR_VIEW_UPDATE_AFTER_STEP_ENABLE)) {
                 IPreferenceStore store = DsfDebugUITools.getPreferenceStore();
@@ -86,7 +87,8 @@ public class ExpressionVMProvider extends AbstractDMVMProvider
     };
 
     private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent event) {
+        @Override
+		public void propertyChange(PropertyChangeEvent event) {
             handleEvent(event);
         }        
     };
@@ -280,7 +282,8 @@ public class ExpressionVMProvider extends AbstractDMVMProvider
 			final VariableVMNode variableNode) {
 		 try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), getSession().getId());
                     IExpressions2 expressions2 = tracker.getService(IExpressions2.class);
                     if (expressions2 != null) {
@@ -355,23 +358,28 @@ public class ExpressionVMProvider extends AbstractDMVMProvider
             new ExpressionsBreakpointHitUpdatePolicy() };
     }
 
-    public void expressionsAdded(IExpression[] expressions) {
+    @Override
+	public void expressionsAdded(IExpression[] expressions) {
         expressionsListChanged(ExpressionsChangedEvent.Type.ADDED, expressions, -1);
     }
     
-    public void expressionsRemoved(IExpression[] expressions) {
+    @Override
+	public void expressionsRemoved(IExpression[] expressions) {
         expressionsListChanged(ExpressionsChangedEvent.Type.REMOVED, expressions, -1);
     }
     
-    public void expressionsInserted(IExpression[] expressions, int index) {
+    @Override
+	public void expressionsInserted(IExpression[] expressions, int index) {
         expressionsListChanged(ExpressionsChangedEvent.Type.INSERTED, expressions, index);
     }
 
-    public void expressionsMoved(IExpression[] expressions, int index) {
+    @Override
+	public void expressionsMoved(IExpression[] expressions, int index) {
         expressionsListChanged(ExpressionsChangedEvent.Type.MOVED, expressions, index);
     }
     
-    public void expressionsChanged(IExpression[] expressions) {
+    @Override
+	public void expressionsChanged(IExpression[] expressions) {
         expressionsListChanged(ExpressionsChangedEvent.Type.CHANGED, expressions, -1);
     }
     
@@ -396,7 +404,8 @@ public class ExpressionVMProvider extends AbstractDMVMProvider
         super.refresh();
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), getSession().getId());
                     IExpressions expressionsService = tracker.getService(IExpressions.class);
                     if (expressionsService instanceof ICachingService) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionsChangedUpdateTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionsChangedUpdateTester.java
index f6b4bc6d4e2..57506621d5c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionsChangedUpdateTester.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionsChangedUpdateTester.java
@@ -23,7 +23,8 @@ class ExpressionsChangedUpdateTester implements IElementUpdateTester {
         fEvent = event;
     }
 
-    public int getUpdateFlags(Object viewerInput, TreePath path) {
+    @Override
+	public int getUpdateFlags(Object viewerInput, TreePath path) {
         // Check whether the element in the cache matches the expression manager element.
         Object element = path.getSegmentCount() == 0 ? viewerInput : path.getLastSegment();
         if (fEvent.getExpressionManagerElements().contains(element)) {
@@ -57,7 +58,8 @@ class ExpressionsChangedUpdateTester implements IElementUpdateTester {
         return false;
     }
     
-    public boolean includes(IElementUpdateTester tester) {
+    @Override
+	public boolean includes(IElementUpdateTester tester) {
         return tester instanceof ExpressionsChangedUpdateTester;
     }
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java
index 2949ebd9e5c..eacf55d2acd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/InvalidExpressionVMContext.java
@@ -69,7 +69,8 @@ public class InvalidExpressionVMContext extends AbstractVMContext implements IEl
     /**
      * Updates the label for the InvalidExpressionVMC.
      */
-    public void update(ILabelUpdate[] updates) {
+    @Override
+	public void update(ILabelUpdate[] updates) {
         for (ILabelUpdate update : updates) {
             String[] columnIds = update.getColumnIds() != null ? 
                 update.getColumnIds() : new String[] { IDebugVMConstants.COLUMN_ID__NAME };
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
index 32557a52867..a511fbeb7ab 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/SingleExpressionVMNode.java
@@ -53,6 +53,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
 			super(node);
 			fDmc = dmc;
 		}
+	    @Override
 		public IDMContext getDMContext() {
 			return fDmc;
 		}
@@ -96,24 +97,31 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
 		SimpleExpression(String text) {
 			fExpressionText = text;
 		}
+	    @Override
 		public void dispose() {
 		}
+	    @Override
 		public IDebugTarget getDebugTarget() {
 			return null;
 		}
+	    @Override
 		public String getExpressionText() {
 			return fExpressionText;
 		}
+	    @Override
 		public IValue getValue() {
 			return null;
 		}
+	    @Override
 		public ILaunch getLaunch() {
 			return null;
 		}
+	    @Override
 		public String getModelIdentifier() {
 			return null;
 		}
 		@SuppressWarnings("rawtypes")
+	    @Override
 		public Object getAdapter(Class adapter) {
 			return null;
 		}
@@ -165,6 +173,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
         return (ExpressionVMProvider)getVMProvider();
     }
 
+    @Override
 	public void update(IHasChildrenUpdate[] updates) {
         // Test availability of children based on whether there are any expressions 
         // in the manager.  We assume that the getExpressions() will just read 
@@ -176,6 +185,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
         }
     }
     
+    @Override
 	public void update(IChildrenCountUpdate[] updates) {
         for (IChildrenCountUpdate update : updates) {
             if (!checkUpdate(update)) continue;
@@ -187,6 +197,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
         }
     }
     
+    @Override
 	public void update(final IChildrenUpdate[] updates) {
         for (IChildrenUpdate update : updates) {
             doUpdateChildren(update);
@@ -247,6 +258,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
         multiRm.setDoneCount(multiRmCount);
     }
 
+    @Override
     public void update(ILabelUpdate[] updates) {
         // The label update handler only handles labels for the invalid expression VMCs.
         // The expression layout nodes are responsible for supplying label providers 
@@ -256,6 +268,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
         }
     }
 
+    @Override
     public int getDeltaFlags(Object event) {
         int retVal = 0;
 
@@ -271,6 +284,7 @@ public class SingleExpressionVMNode extends AbstractVMNode implements IElementLa
         return retVal;
     }
 
+    @Override
     public void buildDelta(final Object event, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
         if (event instanceof ExpressionsChangedEvent) {
             buildDeltaForExpressionsChangedEvent((ExpressionsChangedEvent)event, parentDelta, nodeOffset, requestMonitor);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java
index 7773975a5e1..01eb4a1738e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/VMExpressionUpdate.java
@@ -52,12 +52,14 @@ class VMExpressionUpdate extends VMViewerUpdate implements IExpressionUpdate {
     }
 
 
-    public IExpression getExpression() {
+    @Override
+	public IExpression getExpression() {
         return fExpression;
     }
 
 
-    public void setExpressionElement(Object element) {
+    @Override
+	public void setExpressionElement(Object element) {
         fExpressionElement = element;
     }
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java
index c9a6576df24..e027284a04c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionCellModifier.java
@@ -53,12 +53,14 @@ public class WatchExpressionCellModifier implements ICellModifier {
     public WatchExpressionCellModifier() {
     }
 
-    public boolean canModify(Object element, String property) {
+    @Override
+	public boolean canModify(Object element, String property) {
         return IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(property) && 
                (getWatchExpression(element) != null  || element instanceof NewExpressionVMC); 
     }
 
-    public Object getValue(Object element, String property) {
+    @Override
+	public Object getValue(Object element, String property) {
         if (!IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(property)) return ""; //$NON-NLS-1$
 
         IWatchExpression expression = getWatchExpression(element);
@@ -69,7 +71,8 @@ public class WatchExpressionCellModifier implements ICellModifier {
         return ""; //$NON-NLS-1$
     }
 
-    public void modify(Object element, String property, Object value) {
+    @Override
+	public void modify(Object element, String property, Object value) {
         if (!IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(property)) return;
         if (!(value instanceof String)) return;
         
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionDelegate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionDelegate.java
index 8f651757535..4f1e5ba03b2 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionDelegate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/WatchExpressionDelegate.java
@@ -21,13 +21,19 @@ import org.eclipse.debug.core.model.IWatchExpressionResult;
  * 
  */
 public class WatchExpressionDelegate implements IWatchExpressionDelegate {
-    public void evaluateExpression(final String expression, IDebugElement context, IWatchExpressionListener listener) {
+    @Override
+	public void evaluateExpression(final String expression, IDebugElement context, IWatchExpressionListener listener) {
         listener.watchEvaluationFinished(new IWatchExpressionResult() {
-            public String[] getErrorMessages() { return new String[0]; }
-            public DebugException getException() { return null; }
-            public String getExpressionText() { return expression; }
-            public IValue getValue() { return null; }
-            public boolean hasErrors() { return false; }
+            @Override
+			public String[] getErrorMessages() { return new String[0]; }
+            @Override
+			public DebugException getException() { return null; }
+            @Override
+			public String getExpressionText() { return expression; }
+            @Override
+			public IValue getValue() { return null; }
+            @Override
+			public boolean hasErrors() { return false; }
         });
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java
index df83b1169b0..13b398fbcfa 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java
@@ -118,6 +118,7 @@ public abstract class AbstractContainerVMNode extends AbstractExecutionContextVM
     }
     
 	
+	@Override
 	public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -127,10 +128,12 @@ public abstract class AbstractContainerVMNode extends AbstractExecutionContextVM
      * 
      * @since 2.0
      */    
-    public void update(final IPropertiesUpdate[] updates) {
+    @Override
+	public void update(final IPropertiesUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     updatePropertiesInSessionThread(updates);
                 }});
         } catch (RejectedExecutionException e) {
@@ -228,7 +231,8 @@ public abstract class AbstractContainerVMNode extends AbstractExecutionContextVM
                 protected void handleSuccess() {
                     try {
                         getSession().getExecutor().execute(new DsfRunnable() {
-                            public void run() {
+                            @Override
+							public void run() {
                                 final IRunControl runControl = getServicesTracker().getService(IRunControl.class);
                                 if (runControl != null) {
                                     int vmcIdx = -1;
@@ -270,7 +274,8 @@ public abstract class AbstractContainerVMNode extends AbstractExecutionContextVM
             }));
     }
 
-    public int getDeltaFlags(Object e) {
+    @Override
+	public int getDeltaFlags(Object e) {
         IDMContext dmc = e instanceof IDMEvent<?> ? ((IDMEvent<?>)e).getDMContext() : null;
 
 	    if (e instanceof IContainerResumedDMEvent) {
@@ -301,6 +306,7 @@ public abstract class AbstractContainerVMNode extends AbstractExecutionContextVM
 	    return IModelDelta.NO_CHANGE;
 	}
 
+	@Override
 	public void buildDelta(Object e, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
 	    IDMContext dmc = e instanceof IDMEvent<?> ? ((IDMEvent<?>)e).getDMContext() : null;
 	    
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
index 2455d4dfc9c..62fc69003a9 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractLaunchVMProvider.java
@@ -82,6 +82,7 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
         }
         
         fPreferencesListener = new IPropertyChangeListener() {
+			@Override
 			public void propertyChange(final PropertyChangeEvent event) {
 				handlePropertyChanged(store, event);
 			}};
@@ -105,14 +106,16 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
 		};
     }
     
-    public void handleDebugEvents(final DebugEvent[] events) {
+    @Override
+	public void handleDebugEvents(final DebugEvent[] events) {
         if (isDisposed()) return;
         
 		// We're in session's executor thread. Re-dispatch to our executor thread
 		// and then call root layout node.
         try {
             getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+				public void run() {
                     if (isDisposed()) return;
     
                     for (final DebugEvent event : events) {
@@ -140,7 +143,8 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
 						// replace double click event with expand stack event
 						final ExpandStackEvent expandStackEvent = new ExpandStackEvent(exeCtx);
 						getExecutor().execute(new DsfRunnable() {
-						    public void run() {
+						    @Override
+							public void run() {
 						        handleEvent(expandStackEvent, null);
 						    }
 						});
@@ -163,10 +167,12 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
     		try {
         		refreshStackFramesFuture = getSession().getExecutor().schedule(
     	            new DsfRunnable() { 
-    	                public void run() {
+    	                @Override
+						public void run() {
     	                    if (getSession().isActive()) {
     	                        getExecutor().execute(new Runnable() {
-    	                            public void run() {
+    	                            @Override
+									public void run() {
     	                                // trigger full stack frame update
     	                                ScheduledFuture<?> future= fRefreshStackFramesFutures.get(exeContext);
     	                                if (future != null && !isDisposed()) {
@@ -220,19 +226,23 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
         super.dispose();
     }
     
-    public void launchesAdded(ILaunch[] launches) {
+    @Override
+	public void launchesAdded(ILaunch[] launches) {
         handleLaunchesEvent(new LaunchesEvent(launches, LaunchesEvent.Type.ADDED)); 
     }
     
-    public void launchesRemoved(ILaunch[] launches) {
+    @Override
+	public void launchesRemoved(ILaunch[] launches) {
         handleLaunchesEvent(new LaunchesEvent(launches, LaunchesEvent.Type.REMOVED)); 
     }
     
-    public void launchesChanged(ILaunch[] launches) {
+    @Override
+	public void launchesChanged(ILaunch[] launches) {
         handleLaunchesEvent(new LaunchesEvent(launches, LaunchesEvent.Type.CHANGED)); 
     }
     
-    public void launchesTerminated(ILaunch[] launches) {
+    @Override
+	public void launchesTerminated(ILaunch[] launches) {
         handleLaunchesEvent(new LaunchesEvent(launches, LaunchesEvent.Type.TERMINATED)); 
     }
     
@@ -243,7 +253,8 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
 		// and then call root layout node.
         try {
             getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+				public void run() {
                     if (isDisposed()) return;
     
                     IRootVMNode rootLayoutNode = getRootVMNode();
@@ -300,7 +311,8 @@ public class AbstractLaunchVMProvider extends AbstractDMVMProvider
 		
 		if (processEvent) {
 			getExecutor().execute(new DsfRunnable() {
-			    public void run() {
+			    @Override
+				public void run() {
 			        handleEvent(event);
 			    }
 			});
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java
index 36e6e78bbfb..ef2ad9eafbf 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java
@@ -151,7 +151,8 @@ public abstract class AbstractThreadVMNode extends AbstractExecutionContextVMNod
 
 
     
-    public void update(final ILabelUpdate[] updates) {
+    @Override
+	public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
 
@@ -160,10 +161,12 @@ public abstract class AbstractThreadVMNode extends AbstractExecutionContextVMNod
      * 
      * @since 2.0
      */    
-    public void update(final IPropertiesUpdate[] updates) {
+    @Override
+	public void update(final IPropertiesUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     updatePropertiesInSessionThread(updates);
                 }});
         } catch (RejectedExecutionException e) {
@@ -293,7 +296,8 @@ public abstract class AbstractThreadVMNode extends AbstractExecutionContextVMNod
                 protected void handleSuccess() {
                     try {
                         getSession().getExecutor().execute(new DsfRunnable() {
-                            public void run() {
+                            @Override
+							public void run() {
                                 final IRunControl runControl = getServicesTracker().getService(IRunControl.class);
                                 if (runControl != null) {
                                     int vmcIdx = -1;
@@ -336,7 +340,8 @@ public abstract class AbstractThreadVMNode extends AbstractExecutionContextVMNod
     }
     
     
-    public int getDeltaFlags(Object e) {
+    @Override
+	public int getDeltaFlags(Object e) {
         IDMContext dmc = e instanceof IDMEvent<?> ? ((IDMEvent<?>)e).getDMContext() : null;
 
         if (dmc instanceof IContainerDMContext) {
@@ -357,7 +362,8 @@ public abstract class AbstractThreadVMNode extends AbstractExecutionContextVMNod
         return IModelDelta.NO_CHANGE;
     }
 
-    public void buildDelta(Object e, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor rm) {
+    @Override
+	public void buildDelta(Object e, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor rm) {
         IDMContext dmc = e instanceof IDMEvent<?> ? ((IDMEvent<?>)e).getDMContext() : null;
 
         if(dmc instanceof IContainerDMContext) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java
index 02f781f641d..2c05824b038 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfModelSelectionPolicyFactory.java
@@ -27,6 +27,7 @@ public class DefaultDsfModelSelectionPolicyFactory implements IModelSelectionPol
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicyFactory#createModelSelectionPolicyAdapter(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
 	 */
+	@Override
 	public IModelSelectionPolicy createModelSelectionPolicyAdapter(Object element, IPresentationContext context) {
 		if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) {
 			if (element instanceof IDMVMContext) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
index 6f56045e9bd..df6510237cb 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DefaultDsfSelectionPolicy.java
@@ -56,6 +56,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy#contains(org.eclipse.jface.viewers.ISelection, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
 	 */
+	@Override
 	public boolean contains(ISelection selection, IPresentationContext context) {
 		if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) {
 			if (selection instanceof IStructuredSelection) {
@@ -76,6 +77,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy#isSticky(org.eclipse.jface.viewers.ISelection, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
 	 */
+	@Override
 	public boolean isSticky(ISelection selection, IPresentationContext context) {
 		if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) {
 			if (selection instanceof IStructuredSelection) {
@@ -136,6 +138,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy#overrides(org.eclipse.jface.viewers.ISelection, org.eclipse.jface.viewers.ISelection, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext)
 	 */
+	@Override
 	public boolean overrides(ISelection existing, ISelection candidate, IPresentationContext context) {
 		if (IDebugUIConstants.ID_DEBUG_VIEW.equals(context.getId())) {
 			if (existing instanceof IStructuredSelection && candidate instanceof IStructuredSelection) {
@@ -243,6 +246,7 @@ public class DefaultDsfSelectionPolicy implements IModelSelectionPolicy {
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelSelectionPolicy#replaceInvalidSelection(org.eclipse.jface.viewers.ISelection, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public ISelection replaceInvalidSelection(ISelection invalidSelection, ISelection newSelection) {
         if (invalidSelection instanceof ITreeSelection) {
             ITreeSelection treeSelection = (ITreeSelection)invalidSelection;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DelayedStackRefreshUpdatePolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DelayedStackRefreshUpdatePolicy.java
index 5397ed9aec9..eb84876f10f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DelayedStackRefreshUpdatePolicy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/DelayedStackRefreshUpdatePolicy.java
@@ -49,6 +49,7 @@ public class DelayedStackRefreshUpdatePolicy extends UpdatePolicyDecorator {
 		    fBaseTester = baseTester;
 		    fLazyStackFrameMode = lazyStackFrameMode;
 		}
+		@Override
 		public int getUpdateFlags(Object viewerInput, TreePath path) {
             Object element = path.getSegmentCount() != 0 ? path.getLastSegment() : viewerInput;
 			if (element instanceof IDMVMContext) {
@@ -69,6 +70,7 @@ public class DelayedStackRefreshUpdatePolicy extends UpdatePolicyDecorator {
 			return FLUSH;
 		}
 
+		@Override
 		public boolean includes(IElementUpdateTester tester) {
 		    // A non-lazy tester includes a lazy tester, but not vice versa.  
 		    // This allows entries that were marked as dirty by a flush with
@@ -109,7 +111,8 @@ public class DelayedStackRefreshUpdatePolicy extends UpdatePolicyDecorator {
             fRefreshAll = refreshAll;
         }
 
-        public int getUpdateFlags(Object viewerInput, TreePath path) {
+        @Override
+		public int getUpdateFlags(Object viewerInput, TreePath path) {
             Object element = path.getSegmentCount() != 0 ? path.getLastSegment() : viewerInput;
             
             if (!fRefreshAll && element instanceof IDMVMContext) {
@@ -124,7 +127,8 @@ public class DelayedStackRefreshUpdatePolicy extends UpdatePolicyDecorator {
             return FLUSH;
         }
         
-        public boolean includes(IElementUpdateTester tester) {
+        @Override
+		public boolean includes(IElementUpdateTester tester) {
             // A refresh-all tester includes a non-refresh-all tester, but not 
             // vice versa. This allows entries that were marked as dirty by 
             // a flush with
@@ -174,11 +178,13 @@ public class DelayedStackRefreshUpdatePolicy extends UpdatePolicyDecorator {
 		}
 	}
 	
+	@Override
 	public Object[] getInitialRootElementChildren(Object rootElement) {
 	    return null;
 	}
 
-    public Map<String, Object> getInitialRootElementProperties(Object rootElement) {
+    @Override
+	public Map<String, Object> getInitialRootElementProperties(Object rootElement) {
         return null;
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
index 064b36905ad..bbe23094c6c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
@@ -409,6 +409,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
         }
     }
     
+    @Override
     public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -418,9 +419,11 @@ public class StackFramesVMNode extends AbstractDMVMNode
      * 
      * @since 2.0
      */    
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     updatePropertiesInSessionThread(updates);
                 }});
@@ -597,6 +600,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#getDeltaFlags(java.lang.Object)
      */
+    @Override
     public int getDeltaFlags(Object e) {
         // This node generates delta if the timers have changed, or if the 
         // label has changed.
@@ -634,6 +638,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#buildDelta(java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, int, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDelta(final Object e, final VMDelta parent, final int nodeOffset, final RequestMonitor rm) {
         if (e instanceof IContainerSuspendedDMEvent) {
             // Clear the limit on the stack frames for all stack frames under a given container.
@@ -729,7 +734,8 @@ public class StackFramesVMNode extends AbstractDMVMNode
 	protected void buildDeltaForFullStackRefreshEvent(final IExecutionDMContext executionCtx, final IExecutionDMContext triggeringCtx, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor rm) {
 	    try {
     	    getSession().getExecutor().execute(new DsfRunnable() {
-    	        public void run() {
+    	        @Override
+				public void run() {
     	            IRunControl runControlService = getServicesTracker().getService(IRunControl.class); 
     	            IStack stackService = getServicesTracker().getService(IStack.class);
     	            if (stackService == null || runControlService == null) {
@@ -867,7 +873,8 @@ public class StackFramesVMNode extends AbstractDMVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[])
      */
-    public void compareElements(IElementCompareRequest[] requests) {
+    @Override
+	public void compareElements(IElementCompareRequest[] requests) {
         
         for ( IElementCompareRequest request : requests ) {
         	
@@ -895,7 +902,8 @@ public class StackFramesVMNode extends AbstractDMVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[])
      */
-    public void encodeElements(IElementMementoRequest[] requests) {
+    @Override
+	public void encodeElements(IElementMementoRequest[] requests) {
     	
     	for ( IElementMementoRequest request : requests ) {
     		
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StandardProcessVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StandardProcessVMNode.java
index 9ce08a5ab48..41324c90d16 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StandardProcessVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StandardProcessVMNode.java
@@ -44,6 +44,7 @@ public class StandardProcessVMNode extends AbstractVMNode {
         return "StandardProcessVMNode";  //$NON-NLS-1$ 
     }
 
+    @Override
     public void update(IChildrenUpdate[] updates) {
         for (IChildrenUpdate update : updates) {
             ILaunch launch = findLaunch(update.getElementPath());
@@ -67,6 +68,7 @@ public class StandardProcessVMNode extends AbstractVMNode {
         }
     }
     
+    @Override
     public void update(final IChildrenCountUpdate[] updates) {
         for (IChildrenCountUpdate update : updates) {
             if (!checkUpdate(update)) continue;
@@ -84,6 +86,7 @@ public class StandardProcessVMNode extends AbstractVMNode {
     }
 
     // @see org.eclipse.cdt.dsf.ui.viewmodel.IViewModelLayoutNode#hasElements(org.eclipse.cdt.dsf.ui.viewmodel.IVMContext, org.eclipse.cdt.dsf.concurrent.DataRequestMonitor)
+    @Override
     public void update(IHasChildrenUpdate[] updates) {
         for (IHasChildrenUpdate update : updates) {
             ILaunch launch = findLaunch(update.getElementPath());
@@ -125,6 +128,7 @@ public class StandardProcessVMNode extends AbstractVMNode {
         return null;
     }
     
+    @Override
     public int getDeltaFlags(Object e) {
         int myFlags = 0;
         if (e instanceof DebugEvent) {
@@ -140,6 +144,7 @@ public class StandardProcessVMNode extends AbstractVMNode {
         return myFlags;
     }
     
+    @Override
     public void buildDelta(Object e, VMDelta parent, int nodeOffset, RequestMonitor requestMonitor) {
         if (e instanceof DebugEvent && ((DebugEvent)e).getSource() instanceof IProcess) {
             DebugEvent de = (DebugEvent)e;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/actions/ExpandStackAction.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/actions/ExpandStackAction.java
index 4b085232cf8..fa469de941d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/actions/ExpandStackAction.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/actions/ExpandStackAction.java
@@ -33,6 +33,7 @@ public class ExpandStackAction extends AbstractVMProviderActionDelegate implemen
 	/*
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void run(IAction action) {
 		Object element = getViewerInput();
 		if (element instanceof IncompleteStackVMContext) {
@@ -44,7 +45,8 @@ public class ExpandStackAction extends AbstractVMProviderActionDelegate implemen
 				final ExpandStackEvent event = new ExpandStackEvent(exeCtx);
 				final AbstractLaunchVMProvider vmProvider = (AbstractLaunchVMProvider) getVMProvider();
 				vmProvider.getExecutor().execute(new DsfRunnable() {
-				    public void run() {
+				    @Override
+					public void run() {
 				        vmProvider.handleEvent(event);
 				    }
 				});
@@ -79,6 +81,7 @@ public class ExpandStackAction extends AbstractVMProviderActionDelegate implemen
 		getAction().setEnabled(enabled);
 	}
 
+	@Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 		if (targetPart instanceof IViewPart) {
 			init((IViewPart) targetPart);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java
index 04d1ae40cb6..264a655d7bd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java
@@ -154,9 +154,11 @@ public class ModulesVMNode extends AbstractDMVMNode
     /*
      * @since 2.0
      */    
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     updatePropertiesInSessionThread(updates);
                 }});
@@ -167,6 +169,7 @@ public class ModulesVMNode extends AbstractDMVMNode
         }
     }
     
+    @Override
     public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -205,6 +208,7 @@ public class ModulesVMNode extends AbstractDMVMNode
         update.setProperty(PROP_IS_LOADED, data.isSymbolsLoaded());
     }    
 
+    @Override
     public int getDeltaFlags(Object e) {
         if (e instanceof IRunControl.ISuspendedDMEvent) {
             return IModelDelta.CONTENT;
@@ -212,6 +216,7 @@ public class ModulesVMNode extends AbstractDMVMNode
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void buildDelta(Object e, VMDelta parentDelta, int nodeOffset, RequestMonitor rm) {
         if (e instanceof IRunControl.ISuspendedDMEvent) {
             // Create a delta that indicates all groups have changed
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMProvider.java
index ac418027a49..5fc69948fa6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/ModulesVMProvider.java
@@ -58,7 +58,8 @@ public class ModulesVMProvider extends AbstractDMVMProvider {
         super.refresh();
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), getSession().getId());
                     IModules modulesService = tracker.getService(IModules.class);
                     if (modulesService instanceof ICachingService) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java
index f917b574085..5ba3f503d80 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPane.java
@@ -96,6 +96,7 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
      * of selected modules will be displayed.
      */
     private SourceViewer fSourceViewer;
+    @Override
     public Control createControl(Composite parent) {
         createSourceViewer(parent);
         
@@ -109,6 +110,7 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
 	}
     
     private DetailJob fDetailJob = null;
+    @Override
 	public void display(IStructuredSelection selection) {
         if (selection == null){
             clearSourceViewer();
@@ -157,16 +159,20 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
         }
 		
 	}
+    @Override
 	public String getDescription() {
         return DESCRIPTION;
 	}
+    @Override
 	public String getID() {
         return ID;
 	}
+    @Override
 	public String getName() {
         return NAME;
 	}
 	
+    @Override
 	public boolean setFocus() {
         if (fSourceViewer != null){
             fSourceViewer.getTextWidget().setFocus();
@@ -176,6 +182,7 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
 	}
 	
 	@SuppressWarnings("rawtypes")
+    @Override
 	public Object getAdapter(Class adapter) {
         if (ITextViewer.class.equals(adapter)) {
             return fSourceViewer;
@@ -183,6 +190,7 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
         return null;
 	}
 	
+    @Override
 	public void propertyChange(PropertyChangeEvent event) {
         String propertyName= event.getProperty();
         if (propertyName.equals(IDebugUIConstants.PREF_DETAIL_PANE_FONT)) {
@@ -233,7 +241,9 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
         
         // Add a document listener so actions get updated when the document changes
         getDetailDocument().addDocumentListener(new IDocumentListener() {
+            @Override
             public void documentAboutToBeChanged(DocumentEvent event) {}
+            @Override
             public void documentChanged(DocumentEvent event) {
                 updateSelectionDependentActions();
             }
@@ -241,6 +251,7 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
         
         // Add the selection listener so selection dependent actions get updated.
         fSourceViewer.getSelectionProvider().addSelectionChangedListener(new ISelectionChangedListener() {
+            @Override
             public void selectionChanged(SelectionChangedEvent event) {
                 updateSelectionDependentActions();
             }
@@ -285,6 +296,7 @@ public class ModuleDetailPane extends ModulesAbstractDetailPane implements IAdap
         MenuManager menuMgr= new MenuManager(); 
         menuMgr.setRemoveAllWhenShown(true);
         menuMgr.addMenuListener(new IMenuListener() {
+            @Override
             public void menuAboutToShow(IMenuManager mgr) {
                 fillDetailContextMenu(mgr);
             }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPaneFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPaneFactory.java
index f369f08fe83..5e43d76f5bd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPaneFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModuleDetailPaneFactory.java
@@ -19,14 +19,17 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 
 public class ModuleDetailPaneFactory implements IDetailPaneFactory {
 	public static final String MODULE_DETAIL_PANE_ID = ModuleDetailPane.ID;
+	@Override
 	public IDetailPane createDetailPane(String paneID) {
 		return new ModuleDetailPane();
 	}
 
+	@Override
 	public String getDefaultDetailPane(IStructuredSelection selection) {
 		return null;
 	}
 
+	@Override
 	public String getDetailPaneDescription(String paneID) {
 		if (paneID.equals(ModuleDetailPane.ID)){
 			return ModuleDetailPane.DESCRIPTION;
@@ -34,6 +37,7 @@ public class ModuleDetailPaneFactory implements IDetailPaneFactory {
 		return null;
 	}
 
+	@Override
 	public String getDetailPaneName(String paneID) {
 		if (paneID.equals(ModuleDetailPane.ID)){
 			return ModuleDetailPane.NAME;
@@ -41,6 +45,7 @@ public class ModuleDetailPaneFactory implements IDetailPaneFactory {
 		return null;
 	}
 
+	@Override
 	public Set<?> getDetailPaneTypes(IStructuredSelection selection) {
 		Set<String> possibleIDs = new HashSet<String>(1);
 		possibleIDs.add(ModuleDetailPane.ID);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModulesAbstractDetailPane.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModulesAbstractDetailPane.java
index abc7f54ab37..23d57c07d4e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModulesAbstractDetailPane.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/modules/detail/ModulesAbstractDetailPane.java
@@ -48,6 +48,7 @@ public abstract class ModulesAbstractDetailPane implements IDetailPane {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite)
 	 */
+	@Override
 	public void init(IWorkbenchPartSite workbench) {
 		fWorkbenchPartSite = workbench;
 
@@ -56,6 +57,7 @@ public abstract class ModulesAbstractDetailPane implements IDetailPane {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.IDetailPane#dispose()
 	 */
+	@Override
 	public void dispose() {
 		fActionMap.clear();
 		fSelectionActions.clear();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java
index 25d161a364a..4fdfe459b7a 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/FormattedValueRetriever.java
@@ -175,7 +175,8 @@ public class FormattedValueRetriever {
     	            }
     	            try {
     	                service.getExecutor().execute(new DsfRunnable() {
-    	                    public void run() {
+    	                    @Override
+							public void run() {
     	                        retrieveAvailableFormats(
     	                            calcOutstandingAvailableFormatsUpdates(updates, cachedAvailableFormatsMap), 
     	                            new DataRequestMonitor<Map<IPropertiesUpdate, String[]>>(fNode.getVMProvider().getExecutor(), rm) {
@@ -452,7 +453,8 @@ public class FormattedValueRetriever {
         }
         try {
             service.getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     doUpdateWithRequestedFormats(outstandingUpdates, requestedFormatsMap, activeFormatsMap, rm);
                 }
             });
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsContribution.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsContribution.java
index 4a0b1d8384e..397efbc7304 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsContribution.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsContribution.java
@@ -119,7 +119,8 @@ public class NumberFormatsContribution extends CompoundContributionItem implemen
         return items;
     }
     
-    public void initialize(IServiceLocator serviceLocator) {
+    @Override
+	public void initialize(IServiceLocator serviceLocator) {
         fServiceLocator = serviceLocator;
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java
index f9a7e8de3da..865ea178d9c 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/numberformat/NumberFormatsPropertyTester.java
@@ -61,7 +61,8 @@ public class NumberFormatsPropertyTester extends PropertyTester {
         AVAILABLE_FORMATS.add(IFormattedValues.STRING_FORMAT);
     };
     
-    public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+    @Override
+	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
         if (receiver instanceof IVMContext) {
             IVMProvider provider = ((IVMContext)receiver).getVMNode().getVMProvider();
             if (provider != null) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java
index 2cab98e7505..5977fe26f4e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java
@@ -137,6 +137,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
 
     protected class BitFieldExpressionFactory implements IWatchExpressionFactoryAdapter2 {
         
+        @Override
         public boolean canCreateWatchExpression(Object element) {
             return element instanceof BitFieldVMC;
         }
@@ -144,6 +145,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
         /**
          * Expected format: GRP( GroupName ).REG( RegisterName ).BFLD( BitFieldname )
          */
+        @Override
         public String createWatchExpression(Object element) throws CoreException {
             IRegisterGroupDMData groupData = getSyncRegisterDataAccess().getRegisterGroupDMData(element);
             IRegisterDMData registerData   = getSyncRegisterDataAccess().getRegisterDMData(element);
@@ -494,6 +496,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
     	return fBitFieldExpressionFactory;
     }
     
+    @Override
     public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -508,6 +511,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * 
      * @since 2.0
      */    
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         final CountingRequestMonitor countingRm = new CountingRequestMonitor(ImmediateExecutor.getInstance(), null) {
             @Override
@@ -532,6 +536,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
 
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     updatePropertiesInSessionThread(subUpdates);
                 }});
@@ -689,6 +694,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#getDeltaFlags(java.lang.Object)
      */
+    @Override
     public int getDeltaFlags(Object e) {
         if ( e instanceof ISuspendedDMEvent || 
              e instanceof IMemoryChangedEvent ||
@@ -710,6 +716,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#buildDelta(java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, int, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDelta(Object e, VMDelta parentDelta, int nodeOffset, RequestMonitor rm) {
         // The following events can affect any bit field's values, 
         // refresh the contents of the parent element (i.e. all the registers). 
@@ -734,6 +741,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellEditor(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, java.lang.Object, org.eclipse.swt.widgets.Composite)
      */
+    @Override
     public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
         
         if (IDebugVMConstants.COLUMN_ID__VALUE.equals(columnId)) {
@@ -784,6 +792,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellModifier(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object)
      */
+    @Override
     public ICellModifier getCellModifier(IPresentationContext context, Object element) {
         
         /*
@@ -820,6 +829,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * Expected format: GRP( GroupName ).REG( RegisterName ).BFLD( BitFieldname )
      */
     
+    @Override
     public boolean canParseExpression(IExpression expression) {
         return parseExpressionForBitFieldName(expression.getExpressionText()) != null;
     }
@@ -902,7 +912,8 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
         final String bitFieldName = parseExpressionForBitFieldName(expression.getExpressionText());
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     IRegisters registersService = getServicesTracker().getService(IRegisters.class);
                     if (registersService != null) {
                         registersService.getBitFieldData(
@@ -941,6 +952,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#getDeltaFlagsForExpression(org.eclipse.debug.core.model.IExpression, java.lang.Object)
      */
+    @Override
     public int getDeltaFlagsForExpression(IExpression expression, Object event) {
         if (event instanceof ISuspendedDMEvent) {
             return IModelDelta.CONTENT;
@@ -962,6 +974,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#buildDeltaForExpression(org.eclipse.debug.core.model.IExpression, int, java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, org.eclipse.jface.viewers.TreePath, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDeltaForExpression(final IExpression expression, final int elementIdx, final Object event, final VMDelta parentDelta, final TreePath path, final RequestMonitor rm) 
     {
         // Always refresh the contents of the view upon suspended event.
@@ -976,6 +989,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#buildDeltaForExpressionElement(java.lang.Object, int, java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDeltaForExpressionElement(Object element, int elementIdx, Object event, VMDelta parentDelta, final RequestMonitor rm) 
     {
         // The following events can affect register values, refresh the state 
@@ -997,6 +1011,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      */
     private final String MEMENTO_NAME = "BITFIELD_MEMENTO_NAME"; //$NON-NLS-1$
     
+    @Override
     public void compareElements(IElementCompareRequest[] requests) {
         for ( final IElementCompareRequest request : requests ) {
             final String mementoName = request.getMemento().getString(MEMENTO_NAME);
@@ -1010,6 +1025,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
             //  Now go get the model data for the single register group found.
             try {
                 getSession().getExecutor().execute(new DsfRunnable() {
+                    @Override
                     public void run() {
                         final IRegisters regService = getServicesTracker().getService(IRegisters.class);
                         if ( regService != null ) {
@@ -1040,6 +1056,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[])
      */
+    @Override
     public void encodeElements(IElementMementoRequest[] requests) {
         for ( final IElementMementoRequest request : requests ) {
             final IBitFieldDMContext regDmc = findDmcInPath(request.getViewerInput(), request.getElementPath(), IBitFieldDMContext.class);
@@ -1051,6 +1068,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
             //  Now go get the model data for the single register group found.
             try {
                 getSession().getExecutor().execute(new DsfRunnable() {
+                    @Override
                     public void run() {
                         final IRegisters regService = getServicesTracker().getService(IRegisters.class);
                         if ( regService != null ) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java
index 044dc9288fc..9bb3a9953bc 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterColumnPresentation.java
@@ -23,19 +23,23 @@ public class RegisterColumnPresentation implements IColumnPresentation {
 
     public static final String ID = DsfUIPlugin.PLUGIN_ID + ".REGISTERS_COLUMN_PRESENTATION_ID"; //$NON-NLS-1$
 
-    public void init(IPresentationContext context) {
+    @Override
+	public void init(IPresentationContext context) {
     }
     
-    public void dispose() {
+    @Override
+	public void dispose() {
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getAvailableColumns()
-    public String[] getAvailableColumns() {
+    @Override
+	public String[] getAvailableColumns() {
         return new String[] { IDebugVMConstants.COLUMN_ID__NAME, IDebugVMConstants.COLUMN_ID__TYPE, IDebugVMConstants.COLUMN_ID__VALUE, IDebugVMConstants.COLUMN_ID__DESCRIPTION,  };
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getHeader(java.lang.String)
-    public String getHeader(String id) {
+    @Override
+	public String getHeader(String id) {
         if (IDebugVMConstants.COLUMN_ID__NAME.equals(id)) {
             return MessagesForRegisterVM.RegisterColumnPresentation_name; 
         } else if (IDebugVMConstants.COLUMN_ID__TYPE.equals(id)) {
@@ -49,23 +53,27 @@ public class RegisterColumnPresentation implements IColumnPresentation {
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getId()
-    public String getId() {
+    @Override
+	public String getId() {
         return ID;
     }
     
-    public ImageDescriptor getImageDescriptor(String id) {
+    @Override
+	public ImageDescriptor getImageDescriptor(String id) {
         return null;
     } 
 
 
     
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getInitialColumns()
-    public String[] getInitialColumns() {
+    @Override
+	public String[] getInitialColumns() {
         return new String[] { IDebugVMConstants.COLUMN_ID__NAME, IDebugVMConstants.COLUMN_ID__VALUE, IDebugVMConstants.COLUMN_ID__DESCRIPTION };
     }
     
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#isOptional()
-    public boolean isOptional() {
+    @Override
+	public boolean isOptional() {
         return true;
     }
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java
index 01fd2a2ad65..622a88f1e32 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java
@@ -117,6 +117,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
     
     protected class RegisterGroupExpressionFactory implements IWatchExpressionFactoryAdapter2 {
         
+        @Override
         public boolean canCreateWatchExpression(Object element) {
             return element instanceof RegisterGroupVMC;
         }
@@ -124,6 +125,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
         /**
          * Expected format: Group(GroupName)
          */
+        @Override
         public String createWatchExpression(Object element) throws CoreException {
             IRegisterGroupDMData groupData = getSyncRegisterDataAccess().getRegisterGroupDMData(element);
             if (groupData != null) {
@@ -263,6 +265,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
         return provider;
     }
 
+    @Override
     public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -272,9 +275,11 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      * 
      * @since 2.0
      */    
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     updatePropertiesInSessionThread(updates);
                 }});
@@ -337,6 +342,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
         }
     }
 
+    @Override
     public int getDeltaFlags(Object e) {
         if (e instanceof ISuspendedDMEvent) {
             return IModelDelta.CONTENT;
@@ -350,6 +356,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void buildDelta(Object e, VMDelta parentDelta, int nodeOffset, RequestMonitor rm) {
         // Although the register groups themselves are not affected by the 
         // suspended event, typically all the registers are.  Add a CONTENT changed
@@ -369,6 +376,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
         rm.done();
     }
     
+    @Override
     public boolean canParseExpression(IExpression expression) {
         return parseExpressionForGroupName(expression.getExpressionText()) != null;
     }
@@ -397,6 +405,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#getDeltaFlagsForExpression(org.eclipse.debug.core.model.IExpression, java.lang.Object)
      */
+    @Override
     public int getDeltaFlagsForExpression(IExpression expression, Object event) {
 
         if (event instanceof ISuspendedDMEvent ||
@@ -416,6 +425,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#buildDeltaForExpression(org.eclipse.debug.core.model.IExpression, int, java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, org.eclipse.jface.viewers.TreePath, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDeltaForExpression(IExpression expression, int elementIdx, Object event, VMDelta parentDelta, 
         TreePath path, RequestMonitor rm) 
     {
@@ -439,6 +449,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#buildDeltaForExpressionElement(java.lang.Object, int, java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDeltaForExpressionElement(Object element, int elementIdx, Object event, VMDelta parentDelta, final RequestMonitor rm) 
     {
         if (event instanceof IGroupChangedDMEvent) {
@@ -468,6 +479,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
         final String groupName = parseExpressionForGroupName(expression.getExpressionText());
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     IRegisters registersService = getServicesTracker().getService(IRegisters.class);
                     if (registersService != null) {
@@ -507,6 +519,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellEditor(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, java.lang.Object, org.eclipse.swt.widgets.Composite)
      */
+    @Override
     public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
         if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnId)) {
             return new TextCellEditor(parent);
@@ -518,6 +531,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellModifier(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object)
      */
+    @Override
     public ICellModifier getCellModifier(IPresentationContext context, Object element) {
         return fWatchExpressionCellModifier;
     }
@@ -528,6 +542,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      */
     private final String MEMENTO_NAME = "GROUP_MEMENTO_NAME"; //$NON-NLS-1$
     
+    @Override
     public void compareElements(IElementCompareRequest[] requests) {
         for (final IElementCompareRequest request : requests ) {
             final IRegisterGroupDMContext regDmc = findDmcInPath(request.getViewerInput(), request.getElementPath(), IRegisterGroupDMContext.class);
@@ -541,6 +556,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
         	// Now go get the model data for the single register group found.
         	try {
                 getSession().getExecutor().execute(new DsfRunnable() {
+                    @Override
                     public void run() {
                     	final IRegisters regService = getServicesTracker().getService(IRegisters.class);
                     	if ( regService != null ) {
@@ -571,6 +587,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[])
      */
+    @Override
     public void encodeElements(IElementMementoRequest[] requests) {
     	for ( final IElementMementoRequest request : requests ) {
             final IRegisterGroupDMContext regDmc = findDmcInPath(request.getViewerInput(), request.getElementPath(), IRegisterGroupDMContext.class);
@@ -582,6 +599,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
             //  Now go get the model data for the single register group found.
         	try {
                 getSession().getExecutor().execute(new DsfRunnable() {
+                    @Override
                     public void run() {
                     	final IRegisters regService = getServicesTracker().getService(IRegisters.class);
                     	if ( regService != null ) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java
index 36ba5db0c74..ce1caf969b1 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterRootDMVMNode.java
@@ -35,7 +35,8 @@ public class RegisterRootDMVMNode extends RootDMVMNode implements IElementMement
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[])
      */
-    public void compareElements(IElementCompareRequest[] requests) {
+    @Override
+	public void compareElements(IElementCompareRequest[] requests) {
         for ( IElementMementoRequest request : requests )  { request.done(); } 
     }
     
@@ -43,7 +44,8 @@ public class RegisterRootDMVMNode extends RootDMVMNode implements IElementMement
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[])
      */
-    public void encodeElements(IElementMementoRequest[] requests) {
+    @Override
+	public void encodeElements(IElementMementoRequest[] requests) {
     	
     	for ( IElementMementoRequest request : requests )  { request.done(); } 
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java
index 82ac014133e..81dafb8f28d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMNode.java
@@ -137,6 +137,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
 
     protected class RegisterExpressionFactory implements IWatchExpressionFactoryAdapter2 {
 
+        @Override
         public boolean canCreateWatchExpression(Object element) {
             return element instanceof RegisterVMC;
         }
@@ -144,6 +145,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
         /**
          * Expected format: GRP( GroupName ).REG( RegisterName )
          */
+        @Override
         public String createWatchExpression(Object element) throws CoreException {
             IRegisterGroupDMData groupData = getSyncRegisterDataAccess().getRegisterGroupDMData(element);
             IRegisterDMData registerData = getSyncRegisterDataAccess().getRegisterDMData(element);
@@ -262,6 +264,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
     	}
 
     	fPreferenceChangeListener = new IPropertyChangeListener() {
+    	    @Override
     		public void propertyChange(PropertyChangeEvent event) {
     			if ( event.getProperty().equals(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND) ) {
     				columnIdValueBackground.setBackground(DebugUITools.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB());
@@ -458,6 +461,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
     	return fRegisterExpressionFactory;
     }
         
+    @Override
     public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -472,6 +476,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * 
      * @since 2.0
      */    
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         final CountingRequestMonitor countingRm = new CountingRequestMonitor(ImmediateExecutor.getInstance(), null) {
             @Override
@@ -496,6 +501,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
 
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     updatePropertiesInSessionThread(subUpdates);
                 }});
@@ -663,6 +669,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#getDeltaFlags(java.lang.Object)
      */
+    @Override
     public int getDeltaFlags(Object e) {
         if ( e instanceof ISuspendedDMEvent || 
              e instanceof IMemoryChangedEvent ||
@@ -685,6 +692,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#buildDelta(java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, int, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDelta(Object e, VMDelta parentDelta, int nodeOffset, RequestMonitor rm) {
         // The following events can affect any register's values, 
         // refresh the contents of the parent element (i.e. all the registers). 
@@ -710,6 +718,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * Expected format: GRP( GroupName ).REG( RegisterName )
      *              or: $RegisterName
      */
+    @Override
     public boolean canParseExpression(IExpression expression) {
         return parseExpressionForRegisterName(expression.getExpressionText()) != null;
     }
@@ -782,6 +791,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
         final String regName = parseExpressionForRegisterName(expression.getExpressionText());
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     IRegisters registersService = getServicesTracker().getService(IRegisters.class);
                     if (registersService != null) {
@@ -821,6 +831,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#getDeltaFlagsForExpression(org.eclipse.debug.core.model.IExpression, java.lang.Object)
      */
+    @Override
     public int getDeltaFlagsForExpression(IExpression expression, Object event) {
         if ( event instanceof IRegisterChangedDMEvent ||
              event instanceof IMemoryChangedEvent ||
@@ -844,6 +855,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#buildDeltaForExpression(org.eclipse.debug.core.model.IExpression, int, java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, org.eclipse.jface.viewers.TreePath, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDeltaForExpression(IExpression expression, int elementIdx, Object event, VMDelta parentDelta, 
         TreePath path, RequestMonitor rm) 
     {
@@ -867,6 +879,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.IExpressionVMNode#buildDeltaForExpressionElement(java.lang.Object, int, java.lang.Object, org.eclipse.cdt.dsf.ui.viewmodel.VMDelta, org.eclipse.cdt.dsf.concurrent.RequestMonitor)
      */
+    @Override
     public void buildDeltaForExpressionElement(Object element, int elementIdx, Object event, VMDelta parentDelta, final RequestMonitor rm) 
     {
         // The following events can affect register values, refresh the state 
@@ -886,6 +899,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellEditor(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.String, java.lang.Object, org.eclipse.swt.widgets.Composite)
      */
+    @Override
     public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
         if (IDebugVMConstants.COLUMN_ID__EXPRESSION.equals(columnId)) {
             return new TextCellEditor(parent);
@@ -908,6 +922,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementEditor#getCellModifier(org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, java.lang.Object)
      */
+    @Override
     public ICellModifier getCellModifier(IPresentationContext context, Object element) {
         return new RegisterCellModifier( getDMVMProvider(), getSyncRegisterDataAccess() );
     }
@@ -918,6 +933,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      */
     private final String MEMENTO_NAME = "REGISTER_MEMENTO_NAME"; //$NON-NLS-1$
     
+    @Override
     public void compareElements(IElementCompareRequest[] requests) {
         for ( final IElementCompareRequest request : requests ) {
             final IRegisterDMContext regDmc = findDmcInPath(request.getViewerInput(), request.getElementPath(), IRegisterDMContext.class);
@@ -930,6 +946,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
             //  Now go get the model data for the single register group found.
             try {
                 getSession().getExecutor().execute(new DsfRunnable() {
+                    @Override
                     public void run() {
                         final IRegisters regService = getServicesTracker().getService(IRegisters.class);
                         if ( regService != null ) {
@@ -960,6 +977,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      * (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[])
      */
+    @Override
     public void encodeElements(IElementMementoRequest[] requests) {
         for ( final IElementMementoRequest request : requests ) {
             final IRegisterDMContext regDmc = findDmcInPath(request.getViewerInput(), request.getElementPath(), IRegisterDMContext.class);
@@ -971,6 +989,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
             //  Now go get the model data for the single register group found.
             try {
                 getSession().getExecutor().execute(new DsfRunnable() {
+                    @Override
                     public void run() {
                         final IRegisters regService = getServicesTracker().getService(IRegisters.class);
                         if ( regService != null ) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java
index 44ea26e3b99..8bb035c73c1 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java
@@ -47,7 +47,8 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 public class RegisterVMProvider extends AbstractDMVMProvider 
 {
     private IPropertyChangeListener fPreferencesListener = new IPropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent event) {
+        @Override
+		public void propertyChange(PropertyChangeEvent event) {
             String property = event.getProperty();
 			if (property.equals(IDsfDebugUIConstants.PREF_WAIT_FOR_VIEW_UPDATE_AFTER_STEP_ENABLE)) {
                 IPreferenceStore store = DsfDebugUITools.getPreferenceStore();
@@ -57,7 +58,8 @@ public class RegisterVMProvider extends AbstractDMVMProvider
     };
 
     private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent event) {
+        @Override
+		public void propertyChange(PropertyChangeEvent event) {
             handleEvent(event);
         }        
     };
@@ -209,6 +211,7 @@ public class RegisterVMProvider extends AbstractDMVMProvider
 			fDMContext = dmc;
 		}
 	    
+		@Override
 		public IDMContext getDMContext() {
 			return fDMContext;
 		}
@@ -253,7 +256,8 @@ public class RegisterVMProvider extends AbstractDMVMProvider
         super.refresh();
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), getSession().getId());
                     IRegisters registerService = tracker.getService(IRegisters.class);
                     if (registerService instanceof ICachingService) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/DebugManualUpdatePolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/DebugManualUpdatePolicy.java
index 6b4fd1bdeae..1c7b7007a37 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/DebugManualUpdatePolicy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/DebugManualUpdatePolicy.java
@@ -99,15 +99,18 @@ public class DebugManualUpdatePolicy extends ManualUpdatePolicy implements IVMUp
      */
     private IElementUpdateTester fNumberFormatPropertyEventUpdateTester = new IElementUpdateTesterExtension() {
         
-        public int getUpdateFlags(Object viewerInput, TreePath path) {
+        @Override
+		public int getUpdateFlags(Object viewerInput, TreePath path) {
             return FLUSH_PARTIAL_PROPERTIES; 
         }  
         
-        public Collection<String> getPropertiesToFlush(Object viewerInput, TreePath path, boolean isDirty) {
+        @Override
+		public Collection<String> getPropertiesToFlush(Object viewerInput, TreePath path, boolean isDirty) {
             return fActiveNumberFormatPropertiesWithPrefixes;
         }
         
-        public boolean includes(IElementUpdateTester tester) {
+        @Override
+		public boolean includes(IElementUpdateTester tester) {
         	// includes ElementFormatUpdateTester as well?
             return tester.equals(this);
         }
@@ -132,7 +135,8 @@ public class DebugManualUpdatePolicy extends ManualUpdatePolicy implements IVMUp
         return super.getElementUpdateTester(event);
     }
     
-    public boolean canUpdateDirtyProperty(ICacheEntry entry, String property) {
+    @Override
+	public boolean canUpdateDirtyProperty(ICacheEntry entry, String property) {
         return fActiveNumberFormatPropertiesWithPrefixes.contains(property);
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/ElementFormatUpdateTester.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/ElementFormatUpdateTester.java
index 48d7e834615..e84cfb1f7e0 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/ElementFormatUpdateTester.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/update/ElementFormatUpdateTester.java
@@ -34,6 +34,7 @@ public class ElementFormatUpdateTester implements IElementUpdateTesterExtension
 		this.propertiesWithPrefixes = propertiesWithPrefixes;
 	}
 
+	@Override
 	public int getUpdateFlags(Object viewerInput, TreePath path) {
 		Set<Object> elements = formatEvent.getElements();
 		if (elements.contains(viewerInput)) {
@@ -59,11 +60,13 @@ public class ElementFormatUpdateTester implements IElementUpdateTesterExtension
 		return 0;
 	}
 
+	@Override
 	public Collection<String> getPropertiesToFlush(Object viewerInput,
 			TreePath path, boolean isDirty) {
 		return propertiesWithPrefixes;
 	}
 
+	@Override
 	public boolean includes(IElementUpdateTester tester) {
 		if (tester.equals(this)) {
 			return true;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
index 098d76d550d..6d674ad0ff8 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
@@ -127,7 +127,8 @@ public class VariableCellModifier extends WatchExpressionCellModifier {
                 
                 fDataAccess.writeVariable(element, (String) value, formatId);
                 fProvider.getExecutor().execute(new DsfRunnable() {
-                    public void run() {
+                    @Override
+					public void run() {
                         fProvider.handleEvent(new UserEditEvent(element));
                     }
                 });
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java
index a08fc690806..9ad1d7c17de 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableColumnPresentation.java
@@ -23,18 +23,22 @@ public class VariableColumnPresentation implements IColumnPresentation {
     public static final String ID = DsfUIPlugin.PLUGIN_ID + ".VARIABLES_COLUMN_PRESENTATION_ID"; //$NON-NLS-1$
     
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#init(org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext)
-    public void init(IPresentationContext context) {}
+    @Override
+	public void init(IPresentationContext context) {}
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#dispose()
-    public void dispose() {}
+    @Override
+	public void dispose() {}
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getAvailableColumns()
-    public String[] getAvailableColumns() {
+    @Override
+	public String[] getAvailableColumns() {
         return new String[] { IDebugVMConstants.COLUMN_ID__NAME, IDebugVMConstants.COLUMN_ID__TYPE, IDebugVMConstants.COLUMN_ID__VALUE, IDebugVMConstants.COLUMN_ID__ADDRESS };
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getHeader(java.lang.String)
-    public String getHeader(String id) {
+    @Override
+	public String getHeader(String id) {
         if (IDebugVMConstants.COLUMN_ID__NAME.equals(id)) {
             return MessagesForVariablesVM.VariableColumnPresentation_name; 
         } else if (IDebugVMConstants.COLUMN_ID__TYPE.equals(id)) {
@@ -48,22 +52,26 @@ public class VariableColumnPresentation implements IColumnPresentation {
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getId()
-    public String getId() {
+    @Override
+	public String getId() {
         return ID;
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getImageDescriptor(java.lang.String)
-    public ImageDescriptor getImageDescriptor(String id) {
+    @Override
+	public ImageDescriptor getImageDescriptor(String id) {
         return null;
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#getInitialColumns()
-    public String[] getInitialColumns() {
+    @Override
+	public String[] getInitialColumns() {
         return new String[] { IDebugVMConstants.COLUMN_ID__NAME, IDebugVMConstants.COLUMN_ID__TYPE, IDebugVMConstants.COLUMN_ID__VALUE };
     }
 
     // @see org.eclipse.debug.internal.ui.viewers.provisional.IColumnPresentation#isOptional()
-    public boolean isOptional() {
+    @Override
+	public boolean isOptional() {
         return true;
     }
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java
index de32bb34463..f5bc8e03568 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java
@@ -208,10 +208,12 @@ public class VariableVMNode extends AbstractExpressionVMNode
     
     protected class VariableExpressionFactory implements IWatchExpressionFactoryAdapter2 {
 
+        @Override
         public boolean canCreateWatchExpression(Object element) {
             return element instanceof VariableExpressionVMC;
         }
 
+        @Override
         public String createWatchExpression(Object element) throws CoreException {
             
             VariableExpressionVMC exprVmc = (VariableExpressionVMC) element;
@@ -382,6 +384,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
     	}
 
     	fPreferenceChangeListener = new IPropertyChangeListener() {
+    	    @Override
     		public void propertyChange(PropertyChangeEvent event) {
     			if ( event.getProperty().equals(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND) ) {
     				columnIdValueBackground.setBackground(DebugUITools.getPreferenceColor(IDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB());
@@ -650,7 +653,8 @@ public class VariableVMNode extends AbstractExpressionVMNode
     }
     
     
-    public void update(final ILabelUpdate[] updates) {
+    @Override
+	public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
 
@@ -664,7 +668,8 @@ public class VariableVMNode extends AbstractExpressionVMNode
      * 
      * @since 2.0
      */    
-    public void update(final IPropertiesUpdate[] updates) {
+    @Override
+	public void update(final IPropertiesUpdate[] updates) {
         final CountingRequestMonitor countingRm = new CountingRequestMonitor(ImmediateExecutor.getInstance(), null) {
             @Override
             protected void handleCompleted() {
@@ -688,7 +693,8 @@ public class VariableVMNode extends AbstractExpressionVMNode
 
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     updatePropertiesInSessionThread(subUpdates);
                 }});
         } catch (RejectedExecutionException e) {
@@ -839,7 +845,8 @@ public class VariableVMNode extends AbstractExpressionVMNode
     		update.setProperty(PROP_VARIABLE_ADDRESS, "0x" + address.getAddress().toString(16)); //$NON-NLS-1$
     }
     
-    public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
+    @Override
+	public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {
         if (IDebugVMConstants.COLUMN_ID__VALUE.equals(columnId)) {
             return new TextCellEditor(parent);
         }
@@ -850,11 +857,13 @@ public class VariableVMNode extends AbstractExpressionVMNode
         return null;
     }
 
-    public ICellModifier getCellModifier(IPresentationContext context, Object element) {
+    @Override
+	public ICellModifier getCellModifier(IPresentationContext context, Object element) {
         return new VariableCellModifier(getDMVMProvider(), fSyncVariableDataAccess);
     }
     
-    public boolean canParseExpression(IExpression expression) {
+    @Override
+	public boolean canParseExpression(IExpression expression) {
     	// At this point we are going to say we will allow anything as an expression.
     	// Since the evaluation  of VM Node implementations searches  in the order of
     	// registration  and we always make sure we register the VariableVMNode last,
@@ -871,7 +880,8 @@ public class VariableVMNode extends AbstractExpressionVMNode
     public void update(final IExpressionUpdate update) {
         try {
             getSession().getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+				public void run() {
                     final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
                     if (expressionService != null) {
                         IExpressionDMContext expressionDMC = createExpression(expressionService, 
@@ -1193,6 +1203,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
     	return exprDMC;
 	}
 
+	@Override
 	public int getDeltaFlags(Object e) {
         if ( e instanceof ISuspendedDMEvent || 
              e instanceof IMemoryChangedEvent ||
@@ -1207,6 +1218,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void buildDelta(final Object e, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
 
         // The following events can affect any expression's values, 
@@ -1224,6 +1236,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
         requestMonitor.done();
     }
     
+    @Override
     public int getDeltaFlagsForExpression(IExpression expression, Object event) {
         if ( event instanceof IExpressionChangedDMEvent ||
              event instanceof IMemoryChangedEvent ||
@@ -1242,6 +1255,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
         return IModelDelta.NO_CHANGE;
     }
     
+    @Override
     public void buildDeltaForExpression(IExpression expression, int elementIdx, Object event, VMDelta parentDelta, 
         TreePath path, RequestMonitor rm) 
     {
@@ -1258,6 +1272,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
         rm.done();
     }
     
+    @Override
     public void buildDeltaForExpressionElement(Object element, int elementIdx, Object event, VMDelta parentDelta,
         RequestMonitor rm) 
     {
@@ -1283,6 +1298,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
 
     private final String MEMENTO_NAME = "VARIABLE_MEMENTO_NAME"; //$NON-NLS-1$
     
+    @Override
     public void compareElements(IElementCompareRequest[] requests) {
         
         for ( IElementCompareRequest request : requests ) {
@@ -1307,6 +1323,7 @@ public class VariableVMNode extends AbstractExpressionVMNode
         }
     }
     
+    @Override
     public void encodeElements(IElementMementoRequest[] requests) {
     	
     	for ( IElementMementoRequest request : requests ) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMProvider.java
index 48d9e9c7547..b8fac695f57 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMProvider.java
@@ -43,7 +43,8 @@ public class VariableVMProvider extends AbstractDMVMProvider
     implements IColumnPresentationFactory 
 {
     private IPropertyChangeListener fPreferencesListener = new IPropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent event) {
+        @Override
+		public void propertyChange(PropertyChangeEvent event) {
             String property = event.getProperty();
 			if (property.equals(IDsfDebugUIConstants.PREF_WAIT_FOR_VIEW_UPDATE_AFTER_STEP_ENABLE)) {
                 IPreferenceStore store = DsfDebugUITools.getPreferenceStore();
@@ -53,9 +54,11 @@ public class VariableVMProvider extends AbstractDMVMProvider
     };
 
     private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
-        public void propertyChange(final PropertyChangeEvent event) {
+        @Override
+		public void propertyChange(final PropertyChangeEvent event) {
             getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     handleEvent(event);                    
                 };
             });
@@ -112,7 +115,8 @@ public class VariableVMProvider extends AbstractDMVMProvider
 			final VariableVMNode variableNode) {
 		 try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), getSession().getId());
                     IExpressions2 expressions2 = tracker.getService(IExpressions2.class);
                     if (expressions2 != null) {
@@ -156,7 +160,8 @@ public class VariableVMProvider extends AbstractDMVMProvider
         super.refresh();
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     DsfServicesTracker tracker = new DsfServicesTracker(DsfUIPlugin.getBundleContext(), getSession().getId());
                     IExpressions expressionsService = tracker.getService(IExpressions.class);
                     if (expressionsService instanceof ICachingService) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java
index a3f4bff9ffb..a049a00e6db 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/DisplayDsfExecutor.java
@@ -76,7 +76,8 @@ public class DisplayDsfExecutor extends DefaultDsfExecutor
 		super("Display DSF Executor"); //$NON-NLS-1$
 		fDisplay = display;
 		fDisplay.addListener(SWT.Dispose, new Listener() {
-		    public void handleEvent(Event event) {
+		    @Override
+			public void handleEvent(Event event) {
 		        if (event.type == SWT.Dispose) {
                     DisplayDsfExecutor.super.shutdownNow();
 		        }
@@ -109,6 +110,7 @@ public class DisplayDsfExecutor extends DefaultDsfExecutor
         }
 
 	    return new Callable<V>() {
+			@Override
 			@SuppressWarnings("unchecked")
             public V call() throws Exception {
 				final Object[] v = new Object[1];
@@ -116,7 +118,8 @@ public class DisplayDsfExecutor extends DefaultDsfExecutor
 				
                 try {
     				fDisplay.syncExec(new Runnable() {
-    					public void run() {
+    					@Override
+						public void run() {
     						try {
     							v[0] = callable.call();
     						} catch(Throwable exception) {
@@ -159,10 +162,12 @@ public class DisplayDsfExecutor extends DefaultDsfExecutor
         }
 
 	    return new Runnable() {
+			@Override
 			public void run() {
 				try {
     				fDisplay.syncExec(new Runnable() {
-    					public void run() {
+    					@Override
+						public void run() {
     					    runnable.run();
     					}
     				});
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/SimpleDisplayExecutor.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/SimpleDisplayExecutor.java
index 997e20dbc73..a6fe2ec256d 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/SimpleDisplayExecutor.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/concurrent/SimpleDisplayExecutor.java
@@ -62,7 +62,8 @@ public class SimpleDisplayExecutor implements Executor{
         fDisplay = display;
     }
 
-    public void execute(Runnable command) {
+    @Override
+	public void execute(Runnable command) {
         try {
             fDisplay.asyncExec(command);
         } catch (SWTException e) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java
index cdecfff7a41..ba012c75023 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMAdapter.java
@@ -62,7 +62,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
     public AbstractVMAdapter() {
     }    
 
-    @ThreadSafe
+    @Override
+	@ThreadSafe
     public IVMProvider getVMProvider(IPresentationContext context) {
         synchronized(fViewModelProviders) {
             if (fDisposed) return null;
@@ -83,7 +84,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
      * 
 	 * @since 1.1
 	 */
-    public IVMProvider[] getActiveProviders() {
+    @Override
+	public IVMProvider[] getActiveProviders() {
         synchronized(fViewModelProviders) {
             return fViewModelProviders.values().toArray(new IVMProvider[fViewModelProviders.size()]);
         }
@@ -100,7 +102,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
         for (final IVMProvider provider : providers) {
             try {
                 provider.getExecutor().execute(new Runnable() {
-                    public void run() {
+                    @Override
+					public void run() {
                         provider.dispose();
                     }
                 });
@@ -119,15 +122,18 @@ abstract public class AbstractVMAdapter implements IVMAdapter
 		return fDisposed;
 	}
 
-    public void update(IHasChildrenUpdate[] updates) {
+    @Override
+	public void update(IHasChildrenUpdate[] updates) {
     	handleUpdate(updates);
     }
     
-    public void update(IChildrenCountUpdate[] updates) {
+    @Override
+	public void update(IChildrenCountUpdate[] updates) {
     	handleUpdate(updates);
     }
     
-    public void update(final IChildrenUpdate[] updates) {
+    @Override
+	public void update(final IChildrenUpdate[] updates) {
     	handleUpdate(updates);
     }
     
@@ -147,7 +153,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
     private void updateProvider(final IVMProvider provider, final IViewerUpdate[] updates) {
         try {
             provider.getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+				public void run() {
                     if (updates instanceof IHasChildrenUpdate[]) {
                         provider.update((IHasChildrenUpdate[])updates);
                     } else if (updates instanceof IChildrenCountUpdate[]) {
@@ -166,7 +173,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
         }            
     }
     
-    public IModelProxy createModelProxy(Object element, IPresentationContext context) {
+    @Override
+	public IModelProxy createModelProxy(Object element, IPresentationContext context) {
         IVMProvider provider = getVMProvider(context);
         if (provider != null) {
             return provider.createModelProxy(element, context);
@@ -174,7 +182,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
         return null;
     }
     
-    public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) {
+    @Override
+	public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) {
         final IVMProvider provider = getVMProvider(context);
         if (provider != null) {
             return provider.createColumnPresentation(context, element);
@@ -182,7 +191,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
         return null;
     }
     
-    public String getColumnPresentationId(IPresentationContext context, Object element) {
+    @Override
+	public String getColumnPresentationId(IPresentationContext context, Object element) {
         final IVMProvider provider = getVMProvider(context);
         if (provider != null) {
             return provider.getColumnPresentationId(context, element);
@@ -191,7 +201,8 @@ abstract public class AbstractVMAdapter implements IVMAdapter
     }
 
 
-    public void update(IViewerInputUpdate update) {
+    @Override
+	public void update(IViewerInputUpdate update) {
         final IVMProvider provider = getVMProvider(update.getPresentationContext());
         if (provider != null) {
             provider.update(update);
@@ -247,6 +258,7 @@ abstract public class AbstractVMAdapter implements IVMAdapter
 			    }
 			    final RequestMonitor finalListenerRm = listenerRm;
 			    vmEventListener.getExecutor().execute(new DsfRunnable() {
+					@Override
 					public void run() {
 						vmEventListener.handleEvent(event, finalListenerRm);
 					}});
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java
index f8d58b74bc0..7b00920f9f1 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMContext.java
@@ -38,9 +38,11 @@ abstract public class AbstractVMContext implements IVMContext {
         fNode = node;
     }
     
-    public IVMNode getVMNode() { return fNode; }
+    @Override
+	public IVMNode getVMNode() { return fNode; }
 
-    @SuppressWarnings("rawtypes")
+    @Override
+	@SuppressWarnings("rawtypes")
     public Object getAdapter(Class adapter) {
         // If the context implements the given adapter directly, it always takes
         // precedence.
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java
index 30fcef85761..df1ee536f41 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMNode.java
@@ -45,15 +45,18 @@ abstract public class AbstractVMNode implements IVMNode {
         return fProvider.getExecutor();
     }
 
-    public IVMProvider getVMProvider() {
+    @Override
+	public IVMProvider getVMProvider() {
         return fProvider;
     }
     
-    public void dispose() {
+    @Override
+	public void dispose() {
         fDisposed = true;
     }
 
-    public void getContextsForEvent(VMDelta parentDelta, Object event, DataRequestMonitor<IVMContext[]> rm) {
+    @Override
+	public void getContextsForEvent(VMDelta parentDelta, Object event, DataRequestMonitor<IVMContext[]> rm) {
         rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED, "", null)); //$NON-NLS-1$
         rm.done();
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java
index 89865c55e32..1897edb96a5 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/AbstractVMProvider.java
@@ -186,10 +186,12 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
         fContentStrategy = createContentStrategy();
     }    
 
+    @Override
     public IPresentationContext getPresentationContext() {
         return fPresentationContext;
     }
 
+    @Override
     public AbstractVMAdapter getVMAdapter() {
         return fVMAdapter;
     }
@@ -254,6 +256,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
      * {@inheritDoc}
 	 * @since 1.1
 	 */
+    @Override
     public void handleEvent(final Object event, RequestMonitor rm) {
         if (DEBUG_DELTA && (DEBUG_PRESENTATION_ID == null || getPresentationContext().getId().equals(DEBUG_PRESENTATION_ID))) {
         	trace(event, null, null, EventHandlerAction.received);
@@ -418,14 +421,17 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
     }
     
     /** @since 1.1 */
+    @Override
     public boolean shouldWaitHandleEventToComplete() {
         return false;
     }
     
+    @Override
     public IRootVMNode getRootVMNode() {
         return fRootNode;
     }
 
+    @Override
     public IVMNode[] getAllVMNodes() {
         if (fNodesListCache != null) {
             return fNodesListCache;
@@ -440,6 +446,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
         return fNodesListCache; 
     }
         
+    @Override
     public IVMNode[] getChildVMNodes(IVMNode node) {
         IVMNode[] retVal = fChildNodesMap.get(node);
         if (retVal != null) {
@@ -525,20 +532,24 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
     }
     
     /** Called to dispose the provider. */ 
+    @Override
     public void dispose() {
         clearNodes();
         fRootNode = null;
         fDisposed = true;
     }
     
+    @Override
     public void update(final IHasChildrenUpdate[] updates) {
         fContentStrategy.update(updates);
     }
     
+    @Override
     public void update(final IChildrenCountUpdate[] updates) {
         fContentStrategy.update(updates);
     }
     
+    @Override
     public void update(final IChildrenUpdate[] updates) {
         fContentStrategy.update(updates);
     }
@@ -557,6 +568,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
 	 * represent that type. It represents the type of the potential children
 	 * (frame, e.g.)
 	 */
+    @Override
     public void updateNode(final IVMNode node, IHasChildrenUpdate[] updates) {
         IHasChildrenUpdate[] updateProxies = new IHasChildrenUpdate[updates.length];
         for (int i = 0; i < updates.length; i++) {
@@ -611,6 +623,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
      * overrides this method to optionally return the results for an update from
      * a cache. 
      */
+    @Override
     public void updateNode(final IVMNode node, final IChildrenCountUpdate update) {
         if (DEBUG_CONTENT_PROVIDER && (DEBUG_PRESENTATION_ID == null || getPresentationContext().getId().equals(DEBUG_PRESENTATION_ID))) {
             DsfUIPlugin.debug("updateNodeChildCount(node = " + node + ", update = " + update + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -660,6 +673,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
      * overrides this method to optionally return the results for an update from
      * a cache. 
      */
+    @Override
     public void updateNode(IVMNode node, IChildrenUpdate update) {
         if (DEBUG_CONTENT_PROVIDER && (DEBUG_PRESENTATION_ID == null || getPresentationContext().getId().equals(DEBUG_PRESENTATION_ID))) {
             DsfUIPlugin.debug("updateNodeChildren(node = " + node + ", update = " + update + ")");  //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
@@ -684,10 +698,12 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
      * need to worry about the executor throwing the {@link RejectedExecutionException}
      * exception. 
      */
+    @Override
     public Executor getExecutor() { 
         return fExecutor; 
     }
     
+    @Override
     public IModelProxy createModelProxy(Object element, IPresentationContext context) {
         
         // Iterate through the current active proxies to try to find a proxy with the same
@@ -739,6 +755,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
      * 
      * @see IColumnPresentationFactory#createColumnPresentation(IPresentationContext, Object)
      */
+    @Override
     public IColumnPresentation createColumnPresentation(IPresentationContext context, Object element) {
         return null;
     }
@@ -758,6 +775,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
      * 
      * @see IColumnEditorFactory#getColumnEditorId(IPresentationContext, Object)
      */
+    @Override
     public String getColumnPresentationId(IPresentationContext context, Object element) {
         return null;
     }
@@ -771,6 +789,7 @@ abstract public class AbstractVMProvider implements IVMProvider, IVMEventListene
      * 
      * @see IViewerInputProvider
      */
+    @Override
     public void update(IViewerInputUpdate update) {
         update.setInputElement(update.getElement());
         update.done();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
index 28f492ff083..297fd812964 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMContentProviderStrategy.java
@@ -60,7 +60,8 @@ public class DefaultVMContentProviderStrategy implements IElementContentProvider
         return fVMProvider;
     }
 
-    public void update(final IHasChildrenUpdate[] updates) {
+    @Override
+	public void update(final IHasChildrenUpdate[] updates) {
         if (updates.length == 0)
             return;
 
@@ -174,7 +175,8 @@ public class DefaultVMContentProviderStrategy implements IElementContentProvider
         }
     }
 
-    public void update(final IChildrenCountUpdate[] updates) {
+    @Override
+	public void update(final IChildrenCountUpdate[] updates) {
         for (final IChildrenCountUpdate update : updates) {
             IVMNode node = getNodeForElement(update.getElement());
 
@@ -214,7 +216,8 @@ public class DefaultVMContentProviderStrategy implements IElementContentProvider
         }
     }
 
-    public void update(final IChildrenUpdate[] updates) {
+    @Override
+	public void update(final IChildrenUpdate[] updates) {
         for (final IChildrenUpdate update : updates) {
             // Get the VM Context for last element in path.
             final IVMNode node = getNodeForElement(update.getElement());
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMModelProxyStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMModelProxyStrategy.java
index 9e6e883a209..ed71e7ae4d2 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMModelProxyStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/DefaultVMModelProxyStrategy.java
@@ -75,10 +75,12 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
         fRootElement = rootElement;
     }
     
+    @Override
     public boolean isDeltaEvent(Object event) {
         return getEventDeltaFlags(event) != IModelDelta.NO_CHANGE; 
     }
 
+    @Override
     public int getEventDeltaFlags(Object event) {
         IRootVMNode rootNode = getVMProvider().getRootVMNode();
         if (rootNode != null && 
@@ -103,24 +105,29 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
         return fListeners.getListeners();
     }
 
+    @Override
     public void addModelChangedListener(IModelChangedListener listener) {
         fListeners.add(listener);
     }
 
+    @Override
     public void removeModelChangedListener(IModelChangedListener listener) {
         fListeners.remove(listener);
     }
 
+    @Override
     public Object getRootElement() {
         return fRootElement;
     }
     
     /** @since 1.1 */
-   public Object getViewerInput() {
+    @Override
+    public Object getViewerInput() {
         return fRootElement;
     }
     
-   /** @since 1.1 */
+    /** @since 1.1 */
+    @Override
     public TreePath getRootPath() {
         return TreePath.EMPTY;
     }
@@ -130,16 +137,19 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
      * 
      * @param delta model delta to broadcast
      */
+    @Override
     public void fireModelChanged(IModelDelta delta) {
         final IModelDelta root = getRootDelta(delta);
         Object[] listeners = getListeners();
         for (int i = 0; i < listeners.length; i++) {
             final IModelChangedListener listener = (IModelChangedListener) listeners[i];
             ISafeRunnable safeRunnable = new ISafeRunnable() {
+                @Override
                 public void handleException(Throwable exception) {
                     DebugUIPlugin.log(exception);
                 }
 
+                @Override
                 public void run() throws Exception {
                     listener.modelChanged(root, DefaultVMModelProxyStrategy.this);
                 }
@@ -167,6 +177,7 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.IModelProxy#dispose()
      */
+    @Override
     public void dispose() {
         fDisposed = true;
         if (fViewer instanceof StructuredViewer && fDoubleClickListener != null) {
@@ -178,6 +189,7 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.IModelProxy#init(org.eclipse.debug.internal.ui.viewers.IPresentationContext)
      */
+    @Override
     public void init(IPresentationContext context) {
         fDisposed = false;
         fContext = context;
@@ -199,15 +211,18 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
      * 
      * @see org.eclipse.debug.internal.ui.viewers.provisional.IModelProxy#installed(org.eclipse.jface.viewers.Viewer)
      */
+    @Override
     public void installed(final Viewer viewer) {  
         fViewer = viewer;
         getVMProvider().getExecutor().execute( new DsfRunnable() {
+            @Override
             public void run() {
                 fProvider.handleEvent(new ModelProxyInstalledEvent(DefaultVMModelProxyStrategy.this, viewer, fRootElement));
             }
         });
         if (fViewer instanceof StructuredViewer && fDoubleClickListener == null) {
         	((StructuredViewer) fViewer).addDoubleClickListener(fDoubleClickListener= new IDoubleClickListener() {
+        	    @Override
         		public void doubleClick(DoubleClickEvent e) {
         			handleDoubleClick(e);
         		}
@@ -231,6 +246,7 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
 	    	    final Object input = e.getViewer().getInput();
 	    	    
 	            vmProvider.getExecutor().execute( new DsfRunnable() {
+	                @Override
 	                public void run() {
 	                    Object rootElement = getRootElement();
 	                    boolean eventContainsRootElement = rootElement.equals(input);
@@ -254,6 +270,7 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
      * 
      * @since 1.1
      */
+    @Override
     public Viewer getViewer() {
         return fViewer;
     }
@@ -261,6 +278,7 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy#isDisposed()
      */
+    @Override
     public boolean isDisposed() {
         return fDisposed;
     }
@@ -326,6 +344,7 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
      * Default implementation creates a delta assuming that the root node
      * is the input object into the view.  
      */
+    @Override
     public void createDelta(final Object event, final DataRequestMonitor<IModelDelta> rm) {
         final IRootVMNode rootNode = getVMProvider().getRootVMNode(); 
         
@@ -369,6 +388,7 @@ public class DefaultVMModelProxyStrategy implements IVMModelProxy {
 
     protected VMDelta pruneDelta(VMDelta delta) {
         delta.accept(new IModelDeltaVisitor() {
+            @Override
             public boolean visit(IModelDelta deltaNode, int depth) {
                 if ((deltaNode.getFlags() & (IModelDelta.CONTENT | IModelDelta.STATE)) != 0) {
                     VMDelta parent = (VMDelta)deltaNode.getParentDelta();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java
index 5a33897d7a8..13f4d59cdab 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/RootVMNode.java
@@ -29,14 +29,17 @@ public class RootVMNode extends AbstractVMNode implements IRootVMNode {
         super(provider);
     }
 
+    @Override
     public void update(IChildrenUpdate[] updates) {
         throw new UnsupportedOperationException("Root view model node should never be queried for list of elements."); //$NON-NLS-1$
     }
     
+    @Override
     public void update(IChildrenCountUpdate[] updates) {
         throw new UnsupportedOperationException("Root view model node should never be queried for list of elements."); //$NON-NLS-1$
     }
 
+    @Override
     public void update(IHasChildrenUpdate[] updates) {
         throw new UnsupportedOperationException("Root view model node should never be queried for list of elements."); //$NON-NLS-1$
     }
@@ -45,6 +48,7 @@ public class RootVMNode extends AbstractVMNode implements IRootVMNode {
      * Default implementation does not examine the event and assumes that every
      * event should be processed to generate a delta.
      */
+    @Override
     public boolean isDeltaEvent(Object rootObject, Object event) {
         if (event instanceof ModelProxyInstalledEvent) {
             return rootObject.equals( ((ModelProxyInstalledEvent)event).getRootElement() ); 
@@ -56,16 +60,19 @@ public class RootVMNode extends AbstractVMNode implements IRootVMNode {
      * Default implementation creates a delta assuming that the root layout node
      * is the input object into the view.  
      */
+    @Override
     public void createRootDelta(Object rootObject, Object event, final DataRequestMonitor<VMDelta> rm) {
         rm.setData(new VMDelta(rootObject, 0, IModelDelta.NO_CHANGE));
         rm.done();
     }
     
     
+    @Override
     public int getDeltaFlags(Object event) {
         return IModelDelta.NO_CHANGE;
     }
     
+    @Override
     public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor requestMonitor) {
         requestMonitor.done();
     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java
index 93c030ce014..6e5b98dc148 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenCountUpdate.java
@@ -46,7 +46,8 @@ public class VMChildrenCountUpdate extends VMViewerUpdate implements IChildrenCo
         fCountRequestMonitor = rm;
     }
 
-    public void setChildCount(int count) {
+    @Override
+	public void setChildCount(int count) {
         fCountRequestMonitor.setData(count);
     }
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java
index b0c977e4215..89fda8b4df0 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMChildrenUpdate.java
@@ -63,15 +63,18 @@ public class VMChildrenUpdate extends VMViewerUpdate implements IChildrenUpdate
         fElements = length > 0 ? new ArrayList<Object>(length) : new ArrayList<Object>();
     }
 
-    public int getOffset() {
+    @Override
+	public int getOffset() {
         return fOffset;
     }
 
-    public int getLength() {
+    @Override
+	public int getLength() {
         return fLength;
     }
 
-    public void setChild(Object element, int offset) {
+    @Override
+	public void setChild(Object element, int offset) {
         // Calculate the index in array based on configured offset.
         int idx = offset - (fOffset > 0 ? fOffset : 0);
         
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java
index f14e71c4f56..88c34695acb 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMHasChildrenUpdate.java
@@ -47,7 +47,8 @@ public class VMHasChildrenUpdate extends VMViewerUpdate implements IHasChildrenU
         fHasElemsRequestMonitor = rm;        
     }
 
-    public void setHasChilren(boolean hasChildren) {
+    @Override
+	public void setHasChilren(boolean hasChildren) {
         fHasElemsRequestMonitor.setData(hasChildren);
     }
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
index 6b7f593f47f..6b336e79056 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/VMViewerUpdate.java
@@ -80,33 +80,42 @@ public class VMViewerUpdate extends DsfExecutable implements IViewerUpdate {
          */
         final private IPresentationContext fPresentationContext;
 
-        public void cancel() {
+        @Override
+		public void cancel() {
             fCanceled = true;
         }
         
-        public boolean isCanceled() { 
+        @Override
+		public boolean isCanceled() { 
             return fCanceled; 
         }
 
-        public IPresentationContext getPresentationContext() {
+        @Override
+		public IPresentationContext getPresentationContext() {
             return fPresentationContext;
         }
 
-        public Object getElement() {
+        @Override
+		public Object getElement() {
             return fElementPath.getSegmentCount() != 0 ? fElementPath.getLastSegment() : fViewerInput;
         }
 
-        public TreePath getElementPath() {
+        @Override
+		public TreePath getElementPath() {
             return fElementPath;
         }
 
-        public Object getViewerInput() {
+        @Override
+		public Object getViewerInput() {
             return fViewerInput;
         }
         
-        public void done() { assert false; } // not used
-        public void setStatus(IStatus status) {assert false; } // not used
-        public IStatus getStatus() { assert false; return null; } // not used
+        @Override
+		public void done() { assert false; } // not used
+        @Override
+		public void setStatus(IStatus status) {assert false; } // not used
+        @Override
+		public IStatus getStatus() { assert false; return null; } // not used
 
     }
     
@@ -166,21 +175,30 @@ public class VMViewerUpdate extends DsfExecutable implements IViewerUpdate {
         return fRequestMonitor;
     }
     
-    public Object getViewerInput() { return fClientUpdate.getViewerInput(); }
-    public Object getElement() { return fClientUpdate.getElement(); }
-    public TreePath getElementPath() { return fClientUpdate.getElementPath(); }
-    public IPresentationContext getPresentationContext() { return fClientUpdate.getPresentationContext(); }
-    public IStatus getStatus() { return fRequestMonitor.getStatus(); }
-    public void setStatus(IStatus status) { fRequestMonitor.setStatus(status); }
+    @Override
+	public Object getViewerInput() { return fClientUpdate.getViewerInput(); }
+    @Override
+	public Object getElement() { return fClientUpdate.getElement(); }
+    @Override
+	public TreePath getElementPath() { return fClientUpdate.getElementPath(); }
+    @Override
+	public IPresentationContext getPresentationContext() { return fClientUpdate.getPresentationContext(); }
+    @Override
+	public IStatus getStatus() { return fRequestMonitor.getStatus(); }
+    @Override
+	public void setStatus(IStatus status) { fRequestMonitor.setStatus(status); }
     
-    public boolean isCanceled() { 
+    @Override
+	public boolean isCanceled() { 
         return fClientUpdate.isCanceled();
     }
-    public void cancel() {
+    @Override
+	public void cancel() {
         fClientUpdate.cancel();
     }
 
-    public void done() { 
+    @Override
+	public void done() { 
     	setSubmitted();
         if ( isCanceled() ) {
             fRequestMonitor.cancel();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMAdapter.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMAdapter.java
index c2fd5d44d6a..f616cf1c9bb 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMAdapter.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMAdapter.java
@@ -49,7 +49,8 @@ abstract public class AbstractDMVMAdapter extends AbstractVMAdapter
         // Add ourselves as listener for DM events events.
         try {
             session.getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+				public void run() {
                     if (DsfSession.isSessionActive(getSession().getId())) {
                         getSession().addServiceEventListener(AbstractDMVMAdapter.this, null);
                         fRegisteredAsEventListener = true;
@@ -65,7 +66,8 @@ abstract public class AbstractDMVMAdapter extends AbstractVMAdapter
     public void dispose() {
         try {
             getSession().getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+				public void run() {
                     if (fRegisteredAsEventListener && getSession().isActive()) {
                         fSession.removeServiceEventListener(AbstractDMVMAdapter.this);
                     }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java
index 30dfe80dbd9..c2fd67e66a9 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/datamodel/AbstractDMVMNode.java
@@ -59,7 +59,8 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode
             fDmc = dmc;
         }
         
-        public IDMContext getDMContext() { return fDmc; }
+        @Override
+		public IDMContext getDMContext() { return fDmc; }
         
         /**
          * The IAdaptable implementation.  If the adapter is the DM context, 
@@ -176,10 +177,12 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode
         return true;
     }
 
-    public void update(final IHasChildrenUpdate[] updates) {
+    @Override
+	public void update(final IHasChildrenUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     for (IHasChildrenUpdate update : updates) {
                         if (!checkUpdate(update)) continue;
                         updateHasElementsInSessionThread(update);
@@ -198,10 +201,12 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode
         update.done();
     }
 
-    public void update(final IChildrenCountUpdate[] updates) {
+    @Override
+	public void update(final IChildrenCountUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     for (IChildrenCountUpdate update : updates) {
                         if (!checkUpdate(update)) continue;
                         updateElementCountInSessionThread(update);                        
@@ -220,10 +225,12 @@ abstract public class AbstractDMVMNode extends AbstractVMNode implements IVMNode
         update.done();
     }
         
-    public void update(final IChildrenUpdate[] updates) {
+    @Override
+	public void update(final IChildrenUpdate[] updates) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     // After every dispatch, must check if update still valid. 
                     for (IChildrenUpdate update : updates) {
                         if (!checkUpdate(update)) continue;
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java
index d0bb2df7bc3..1151cbf9734 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/PropertiesBasedLabelProvider.java
@@ -126,7 +126,8 @@ public class PropertiesBasedLabelProvider
 	 * 
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider#update(org.eclipse.debug.internal.ui.viewers.model.provisional.ILabelUpdate[])
 	 */
-    public void update(final ILabelUpdate[] labelUpdates) {
+    @Override
+	public void update(final ILabelUpdate[] labelUpdates) {
         IElementPropertiesProvider propertiesProvider = getElementPropertiesProvider(labelUpdates[0].getElement());
         if (propertiesProvider == null) {
             for (ILabelUpdate update : labelUpdates) {
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMDelegatingPropertiesUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMDelegatingPropertiesUpdate.java
index 97638aa411e..96cc502c3ec 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMDelegatingPropertiesUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMDelegatingPropertiesUpdate.java
@@ -34,15 +34,18 @@ public class VMDelegatingPropertiesUpdate extends VMViewerUpdate implements IPro
         fParentUpdate = parentUpdate;
     }
 
-    public Set<String> getProperties() {
+    @Override
+	public Set<String> getProperties() {
         return fParentUpdate.getProperties();
     }
 
-    public void setProperty(String property, Object value) {
+    @Override
+	public void setProperty(String property, Object value) {
         fParentUpdate.setProperty(property, value);
     }
     
-    public void setAllProperties(Map<String, Object> properties) {
+    @Override
+	public void setAllProperties(Map<String, Object> properties) {
         fParentUpdate.setAllProperties(properties);
     }
     
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java
index 05b615d1bea..b5ed20075cd 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/properties/VMPropertiesUpdate.java
@@ -70,7 +70,8 @@ public class VMPropertiesUpdate extends VMViewerUpdate implements IPropertiesUpd
     }
     
     
-    public Set<String> getProperties() {
+    @Override
+	public Set<String> getProperties() {
         return fProperties;
     }
 
@@ -81,7 +82,8 @@ public class VMPropertiesUpdate extends VMViewerUpdate implements IPropertiesUpd
         return fValues;
     }
     
-    public synchronized void setProperty(String property, Object value) {
+    @Override
+	public synchronized void setProperty(String property, Object value) {
         if (!fCreatedOwnMap) {
             fCreatedOwnMap = true;
             Map<String, Object> curValues = fValues;
@@ -93,7 +95,8 @@ public class VMPropertiesUpdate extends VMViewerUpdate implements IPropertiesUpd
         fValues.put(property, value);
     }
     
-    public synchronized void setAllProperties(Map<String, Object> properties) {
+    @Override
+	public synchronized void setAllProperties(Map<String, Object> properties) {
         if (fCreatedOwnMap) {
             fValues.putAll(properties);
         }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
index 579bc6c18fe..40cf9c16406 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AbstractCachingVMProvider.java
@@ -255,15 +255,24 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
                 ", oldProperties=" + fArchiveProperties + "]"; //$NON-NLS-1$ //$NON-NLS-2$ 
         }
 
-        public IVMNode getNode() { return ((ElementDataKey)fKey).fNode; }
-        public Object getViewerInput() { return ((ElementDataKey)fKey).fViewerInput; }
-        public TreePath getElementPath() { return ((ElementDataKey)fKey).fPath; }
-        public boolean isDirty() { return fDirty; }
-        public Boolean getHasChildren() { return fHasChildren; }
-        public Integer getChildCount() { return fChildrenCount; }
-        public Map<Integer, Object> getChildren() { return fChildren; }
-        public Map<String, Object> getProperties() { return fProperties; }
-        public java.util.Map<String,Object> getArchiveProperties() { return fArchiveProperties; }
+        @Override
+		public IVMNode getNode() { return ((ElementDataKey)fKey).fNode; }
+        @Override
+		public Object getViewerInput() { return ((ElementDataKey)fKey).fViewerInput; }
+        @Override
+		public TreePath getElementPath() { return ((ElementDataKey)fKey).fPath; }
+        @Override
+		public boolean isDirty() { return fDirty; }
+        @Override
+		public Boolean getHasChildren() { return fHasChildren; }
+        @Override
+		public Integer getChildCount() { return fChildrenCount; }
+        @Override
+		public Map<Integer, Object> getChildren() { return fChildren; }
+        @Override
+		public Map<String, Object> getProperties() { return fProperties; }
+        @Override
+		public java.util.Map<String,Object> getArchiveProperties() { return fArchiveProperties; }
     }
 
     /**
@@ -397,11 +406,13 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
         return new IVMUpdatePolicy[] { new AutomaticUpdatePolicy() };
     }
        
-    public IVMUpdatePolicy[] getAvailableUpdatePolicies() {
+    @Override
+	public IVMUpdatePolicy[] getAvailableUpdatePolicies() {
         return fAvailableUpdatePolicies;
     }
 
-    public IVMUpdatePolicy getActiveUpdatePolicy() {
+    @Override
+	public IVMUpdatePolicy getActiveUpdatePolicy() {
         String updateModeId = (String)getPresentationContext().getProperty(SELECTED_UPDATE_MODE);
         if (updateModeId != null) {
             for (IVMUpdatePolicy updateMode : getAvailableUpdatePolicies()) {
@@ -415,7 +426,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
         return getAvailableUpdatePolicies()[0];
     }
 
-    public void setActiveUpdatePolicy(IVMUpdatePolicy updatePolicy) {
+    @Override
+	public void setActiveUpdatePolicy(IVMUpdatePolicy updatePolicy) {
         getPresentationContext().setProperty(SELECTED_UPDATE_MODE, updatePolicy.getID());
 
         // Repaint the view to allow elements using the PROP_UPDATE_POLICY_ID 
@@ -427,7 +439,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
         }
     }
     
-    public void refresh() {
+    @Override
+	public void refresh() {
         IElementUpdateTester elementTester =  getActiveUpdatePolicy().getElementUpdateTester(ManualUpdatePolicy.REFRESH_EVENT);
         
         for (final IVMModelProxy proxyStrategy : getActiveModelProxies()) {
@@ -441,7 +454,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
         }
     }
     
-    public ICacheEntry getCacheEntry(IVMNode node, Object viewerInput, TreePath path) {
+    @Override
+	public ICacheEntry getCacheEntry(IVMNode node, Object viewerInput, TreePath path) {
         ElementDataKey key = makeEntryKey(node, viewerInput, path);
         return getElementDataEntry(key, false);
     }
@@ -819,11 +833,13 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
             }
         }
         
-        public synchronized void viewerUpdatesComplete() {
+        @Override
+		public synchronized void viewerUpdatesComplete() {
             done();
         }
 
-        public void modelChanged(IModelDelta delta, IModelProxy proxy) {
+        @Override
+		public void modelChanged(IModelDelta delta, IModelProxy proxy) {
             synchronized (this) {
                 if (!fViewerChangeStarted) {
                     done();
@@ -831,7 +847,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
             }
         }
         
-        public void viewerUpdatesBegin() {
+        @Override
+		public void viewerUpdatesBegin() {
             synchronized(this) {
                 fViewerChangeStarted = true;
             }
@@ -845,8 +862,10 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
             }
         }
         
-        public void updateStarted(IViewerUpdate update) {}
-        public void updateComplete(IViewerUpdate update) {}
+        @Override
+		public void updateStarted(IViewerUpdate update) {}
+        @Override
+		public void updateComplete(IViewerUpdate update) {}
         
     }
     
@@ -1072,7 +1091,8 @@ public class AbstractCachingVMProvider extends AbstractVMProvider
     /**
      * @since 2.0
      */
-    public void update(IPropertiesUpdate[] updates) {
+    @Override
+	public void update(IPropertiesUpdate[] updates) {
         if (updates.length == 0)
             return;
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java
index 13412529958..bbe8b68e2d5 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/AutomaticUpdatePolicy.java
@@ -26,11 +26,13 @@ public class AutomaticUpdatePolicy implements IVMUpdatePolicy {
     public static String AUTOMATIC_UPDATE_POLICY_ID = "org.eclipse.cdt.dsf.ui.viewmodel.update.defaultUpdatePolicy";  //$NON-NLS-1$
     
     public static IElementUpdateTester fgUpdateTester = new IElementUpdateTester() {
-        public int getUpdateFlags(Object viewerInput, TreePath path) {
+        @Override
+		public int getUpdateFlags(Object viewerInput, TreePath path) {
             return FLUSH | ARCHIVE; 
         }  
         
-        public boolean includes(IElementUpdateTester tester) {
+        @Override
+		public boolean includes(IElementUpdateTester tester) {
             return tester.equals(this);
         }
 
@@ -40,23 +42,28 @@ public class AutomaticUpdatePolicy implements IVMUpdatePolicy {
         }
     };
     
-    public String getID() {
+    @Override
+	public String getID() {
         return AUTOMATIC_UPDATE_POLICY_ID;
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
         return ViewModelUpdateMessages.AutomaticUpdatePolicy_name;
     }
 
-    public IElementUpdateTester getElementUpdateTester(Object event) {
+    @Override
+	public IElementUpdateTester getElementUpdateTester(Object event) {
         return fgUpdateTester;
     }
 
-    public Object[] getInitialRootElementChildren(Object rootElement) {
+    @Override
+	public Object[] getInitialRootElementChildren(Object rootElement) {
         return null;
     }
     
-    public Map<String, Object> getInitialRootElementProperties(Object rootElement) {
+    @Override
+	public Map<String, Object> getInitialRootElementProperties(Object rootElement) {
         return null;
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ManualUpdatePolicy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ManualUpdatePolicy.java
index b5569ea9ed6..57d2ced3f52 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ManualUpdatePolicy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/ManualUpdatePolicy.java
@@ -40,27 +40,31 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
 
     private static class BlankDataElement implements IElementContentProvider, IElementLabelProvider {
         
-        public void update(IHasChildrenUpdate[] updates) {
+        @Override
+		public void update(IHasChildrenUpdate[] updates) {
             for (IHasChildrenUpdate update : updates) {
                 update.setHasChilren(false);
                 update.done();
             }
         }
         
-        public void update(IChildrenCountUpdate[] updates) {
+        @Override
+		public void update(IChildrenCountUpdate[] updates) {
             for (IChildrenCountUpdate update : updates) {
                 update.setChildCount(0);
                 update.done();
             }
         }
         
-        public void update(IChildrenUpdate[] updates) {
+        @Override
+		public void update(IChildrenUpdate[] updates) {
             for (IChildrenUpdate update : updates) {
                 update.done();
             }
         }
         
-        public void update(ILabelUpdate[] updates) {
+        @Override
+		public void update(ILabelUpdate[] updates) {
             RGB staleDataForeground = JFaceResources.getColorRegistry().getRGB(
                 IDsfDebugUIConstants.PREF_COLOR_STALE_DATA_FOREGROUND);
             RGB staleDataBackground = JFaceResources.getColorRegistry().getRGB(
@@ -86,7 +90,8 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
             fElements = elements;
         }
 
-        public int getUpdateFlags(Object viewerInput, TreePath path) {
+        @Override
+		public int getUpdateFlags(Object viewerInput, TreePath path) {
             if (fElements.contains(viewerInput)) {
                 return FLUSH;
             }
@@ -98,7 +103,8 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
             return 0;
         }
         
-        public boolean includes(IElementUpdateTester tester) {
+        @Override
+		public boolean includes(IElementUpdateTester tester) {
             return 
                 tester instanceof UserEditEventUpdateTester &&
                 fElements.equals(((UserEditEventUpdateTester)tester).fElements);
@@ -111,11 +117,13 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
     }
     
     private static IElementUpdateTester fgUpdateTester = new IElementUpdateTester() {
-        public int getUpdateFlags(Object viewerInput, TreePath path) {
+        @Override
+		public int getUpdateFlags(Object viewerInput, TreePath path) {
             return DIRTY; 
         }  
         
-        public boolean includes(IElementUpdateTester tester) {
+        @Override
+		public boolean includes(IElementUpdateTester tester) {
             return tester.equals(this);
         }
         
@@ -126,11 +134,13 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
     };
 
     private static IElementUpdateTester fgRefreshUpdateTester = new IElementUpdateTester() {
-        public int getUpdateFlags(Object viewerInput, TreePath path) {
+        @Override
+		public int getUpdateFlags(Object viewerInput, TreePath path) {
             return FLUSH | ARCHIVE; 
         }  
         
-        public boolean includes(IElementUpdateTester tester) {
+        @Override
+		public boolean includes(IElementUpdateTester tester) {
             return tester.equals(this) || tester.equals(fgUpdateTester) || tester instanceof UserEditEventUpdateTester;
         }
 
@@ -140,15 +150,18 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
         }
     };
     
-    public String getID() {
+    @Override
+	public String getID() {
         return MANUAL_UPDATE_POLICY_ID;
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
         return ViewModelUpdateMessages.ManualUpdatePolicy_name;
     }
 
-    public IElementUpdateTester getElementUpdateTester(Object event) {
+    @Override
+	public IElementUpdateTester getElementUpdateTester(Object event) {
         if (event.equals(REFRESH_EVENT)) {
             return fgRefreshUpdateTester;
         } else if (event instanceof UserEditEvent) {
@@ -157,13 +170,15 @@ public class ManualUpdatePolicy implements IVMUpdatePolicy {
         return fgUpdateTester;
     }
 
-    public Object[] getInitialRootElementChildren(Object rootElement) {
+    @Override
+	public Object[] getInitialRootElementChildren(Object rootElement) {
         // Return an dummy element to show in the view.  The user will 
         // need to refresh the view to retrieve this data from the model.
         return new Object[] { new BlankDataElement() };
     }
 
-    public Map<String, Object> getInitialRootElementProperties(Object rootElement) {
+    @Override
+	public Map<String, Object> getInitialRootElementProperties(Object rootElement) {
         // Return an empty set of properties for the root element.  The user will 
         // need to refresh the view to retrieve this data from the model.
         return Collections.emptyMap();
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/UpdatePolicyDecorator.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/UpdatePolicyDecorator.java
index ed44d6bd4d7..24b255df735 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/UpdatePolicyDecorator.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/ui/viewmodel/update/UpdatePolicyDecorator.java
@@ -27,15 +27,18 @@ public abstract class UpdatePolicyDecorator implements IVMUpdatePolicy {
     	return fBasePolicy;
     }
    
-    public final String getID() {
+    @Override
+	public final String getID() {
     	return fBasePolicy.getID();
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
     	return fBasePolicy.getName();
     }
 
-    public IElementUpdateTester getElementUpdateTester(Object event) {
+    @Override
+	public IElementUpdateTester getElementUpdateTester(Object event) {
         return fBasePolicy.getElementUpdateTester(event);
     }
 }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java
index a4f95756dbc..17bcf06979f 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/AbstractCache.java
@@ -36,8 +36,10 @@ public abstract class AbstractCache<V> implements ICache<V> {
     private static final IStatus INVALID_STATUS = new Status(IStatus.ERROR, DsfPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "Cache invalid", null); //$NON-NLS-1$
     
     private class RequestCanceledListener implements RequestMonitor.ICanceledListener {
+        @Override
         public void requestCanceled(final RequestMonitor canceledRm) {
             fExecutor.getDsfExecutor().execute(new Runnable() {
+                @Override
                 public void run() {
                     handleCanceledRm(canceledRm);
                 }
@@ -61,6 +63,7 @@ public abstract class AbstractCache<V> implements ICache<V> {
         fExecutor = executor;
     }
 
+    @Override
     public DsfExecutor getExecutor() {
         return fExecutor.getDsfExecutor();
     }
@@ -95,10 +98,12 @@ public abstract class AbstractCache<V> implements ICache<V> {
     @ThreadSafe
     abstract protected void canceled();
     
+    @Override
     public boolean isValid() {
         return fValid;
     }
 
+    @Override
     public V getData() {
         if (!fValid) {
             throw new IllegalStateException("Cache is not valid.  Cache data can be read only when cache is valid."); //$NON-NLS-1$
@@ -106,6 +111,7 @@ public abstract class AbstractCache<V> implements ICache<V> {
         return fData;
     }
     
+    @Override
     public IStatus getStatus() {
         if (!fValid) {
             throw new IllegalStateException("Cache is not valid.  Cache status can be read only when cache is valid."); //$NON-NLS-1$
@@ -113,6 +119,7 @@ public abstract class AbstractCache<V> implements ICache<V> {
         return fStatus;
     }
     
+    @Override
     public void update(RequestMonitor rm) { 
         assert fExecutor.getDsfExecutor().isInExecutorThread();
 
@@ -266,6 +273,7 @@ public abstract class AbstractCache<V> implements ICache<V> {
         if (canceledRms != null) {
             final List<RequestMonitor> _canceledRms = canceledRms;
             fExecutor.getDsfExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     for (RequestMonitor canceledRm : _canceledRms) {
                         handleCanceledRm(canceledRm);
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DefaultDsfExecutor.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DefaultDsfExecutor.java
index a59e00c78aa..c7965e9c9d5 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DefaultDsfExecutor.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/DefaultDsfExecutor.java
@@ -58,6 +58,7 @@ public class DefaultDsfExecutor extends ScheduledThreadPoolExecutor
         }
         
         Thread fThread;
+        @Override
         public Thread newThread(Runnable r) {
             assert fThread == null;  // Should be called only once.
             fThread = new Thread(new ThreadGroup(fThreadName), r, fThreadName, 0); 
@@ -84,6 +85,7 @@ public class DefaultDsfExecutor extends ScheduledThreadPoolExecutor
         }
     }
     
+    @Override
     public boolean isInExecutorThread() {
         return Thread.currentThread().equals( ((DsfThreadFactory)getThreadFactory()).fThread );
     }
@@ -363,6 +365,7 @@ public class DefaultDsfExecutor extends ScheduledThreadPoolExecutor
         @Override
         protected Object getExecutable() { return fRunnable; }
         
+        @Override
         public void run() {
             traceExecution();
 
@@ -405,6 +408,7 @@ public class DefaultDsfExecutor extends ScheduledThreadPoolExecutor
         @Override
         protected Object getExecutable() { return fCallable; }
 
+        @Override
         public T call() throws Exception {
             traceExecution();
             
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateExecutor.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateExecutor.java
index 7028213d5c2..2040b1b7fb7 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateExecutor.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateExecutor.java
@@ -53,6 +53,7 @@ public class ImmediateExecutor implements Executor {
         return fInstance;
     }
     
+    @Override
     public void execute(Runnable command) {
         // Check if executable wasn't executed already.
         if (DEBUG_EXECUTOR && command instanceof DsfExecutable) {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateInDsfExecutor.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateInDsfExecutor.java
index 6db6e56d7a9..a9261daa84d 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateInDsfExecutor.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/ImmediateInDsfExecutor.java
@@ -32,11 +32,13 @@ public class ImmediateInDsfExecutor implements Executor {
         fDsfExecutor = dsfExecutor;
     }
     
+    @Override
     public void execute(final Runnable command) {
         if (fDsfExecutor.isInExecutorThread()) {
             command.run();
         } else {
             fDsfExecutor.execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     command.run();
                 }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java
index cf89fecd8b7..f38d729bf33 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Query.java
@@ -97,6 +97,7 @@ abstract public class Query<V> extends DsfRunnable
      */
     public Query() {}
 
+    @Override
     public V get() throws InterruptedException, ExecutionException { 
         IStatus status;
         V data;
@@ -116,6 +117,7 @@ abstract public class Query<V> extends DsfRunnable
         return data;
     }
 
+    @Override
     public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         long timeLeft = unit.toMillis(timeout);
         long timeoutTime = System.currentTimeMillis() + unit.toMillis(timeout);
@@ -146,6 +148,7 @@ abstract public class Query<V> extends DsfRunnable
      * Don't try to interrupt the DSF executor thread, just ignore the request 
      * if set.
      */
+    @Override
     public boolean cancel(boolean mayInterruptIfRunning) {
         boolean completed = false;
         synchronized (fRm) {
@@ -158,8 +161,10 @@ abstract public class Query<V> extends DsfRunnable
         return !completed; 
     }
 
+    @Override
     public boolean isCancelled() { return fRm.isCanceled(); }
 
+    @Override
     public boolean isDone() {
         synchronized (fRm) {
             // If future is canceled, return right away.
@@ -170,6 +175,7 @@ abstract public class Query<V> extends DsfRunnable
     
     abstract protected void execute(DataRequestMonitor<V> rm);
     
+    @Override
     public void run() {
         if (fRm.setExecuted()) {
             execute(fRm);
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java
index 8c5c09eb979..36e9f8c6170 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RangeCache.java
@@ -57,6 +57,7 @@ abstract public class RangeCache<V> {
             fCount = count;
         }
         
+        @Override
         public int compareTo(RangeCache<V>.Request o) {
             if (fOffset > o.fOffset) {
                 return 1;
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java
index 7bc6c32322b..9475b85e8b8 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/RequestMonitor.java
@@ -149,6 +149,7 @@ public class RequestMonitor extends DsfExecutable {
         // is canceled.
         if (fParentRequestMonitor != null) {
             fCanceledListener = new ICanceledListener() {
+                @Override
                 public void requestCanceled(RequestMonitor rm) {
                     cancel();
                 }
@@ -297,6 +298,7 @@ public class RequestMonitor extends DsfExecutable {
         
         try {
             fExecutor.execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     RequestMonitor.this.handleCompleted();
                 }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java
index 79c868780a8..8246f66fdb6 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/concurrent/Sequence.java
@@ -266,6 +266,7 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> {
         
         if (fRequestMonitor != null) {
             fRequestMonitor.addCancelListener(new ICanceledListener() {
+                @Override
                 public void requestCanceled(RequestMonitor rm) {
                     fSync.doCancel();
                 }
@@ -298,6 +299,7 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> {
      * The get method blocks until sequence is complete, but always returns null.
      * @see java.concurrent.Future#get
      */
+    @Override
     public Object get() throws InterruptedException, ExecutionException { 
         fSync.doGet();
         return null;
@@ -308,6 +310,7 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> {
      * reached, but always returns null.
      * @see java.concurrent.Future#get
      */
+    @Override
     public Object get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
     	fSync.doGet(unit.toNanos(timeout));
         return null;
@@ -322,6 +325,7 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> {
      * 
      * @see RequestMonitor#cancel()
      */
+    @Override
     public boolean cancel(boolean mayInterruptIfRunning) {
         // Cancel the request monitor first, to avoid a situation where
         // the request monitor is not canceled but the status is set
@@ -332,11 +336,14 @@ abstract public class Sequence extends DsfRunnable implements Future<Object> {
         return fSync.doCancel();
     }
 
+    @Override
     public boolean isCancelled() { return fSync.doIsCancelled(); }
 
+    @Override
     public boolean isDone() { return fSync.doIsDone(); }
 
     
+    @Override
     public void run() {
         // Change the state to running.
         if (fSync.doRun()) {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java
index 86005e31502..2f5fa1fffc8 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMContext.java
@@ -116,7 +116,9 @@ abstract public class AbstractDMContext extends PlatformObject
         return retVal.toString(); 
     }
     
+    @Override
     public String getSessionId() { return fSession.getId(); }
+    @Override
     public IDMContext[] getParents() { return fParents; }
         
     /**
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMEvent.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMEvent.java
index 10122288033..9977d607911 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMEvent.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/AbstractDMEvent.java
@@ -27,6 +27,7 @@ abstract public class AbstractDMEvent<V extends IDMContext> implements IDMEvent<
         fModelContext = context;
     }
     
+    @Override
     public V getDMContext() {
         return fModelContext;
     }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java
index 3cda9d77a71..d20344d8e45 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/datamodel/CompositeDMContext.java
@@ -49,6 +49,7 @@ public class CompositeDMContext implements IDMContext {
      * the fact that this method may not return a reliable result is acceptable.
      * </p>
      */
+    @Override
     public String getSessionId() {
         IDMContext[] parents = getParents(); 
         if (parents.length > 0) {
@@ -62,6 +63,7 @@ public class CompositeDMContext implements IDMContext {
      * Returns the list of parents that this composite context is based on.  Subclasses
      * may override this method to calculate their own set of parents.
      */
+    @Override
     public IDMContext[] getParents() {
         return fParents;
     }
@@ -73,6 +75,7 @@ public class CompositeDMContext implements IDMContext {
      * @see #getSessionId()
      */
     @SuppressWarnings("unchecked")
+    @Override
     public Object getAdapter(Class adapterType) {
         IDMContext[] parents = getParents(); 
         if (parents.length > 0) {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfLaunch.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfLaunch.java
index e0d81ea81cc..9617c9c07d5 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfLaunch.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfLaunch.java
@@ -37,6 +37,7 @@ public class DsfLaunch extends Launch {
     @Override
     protected void fireChanged() {
         DebugPlugin.getDefault().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 DsfLaunch.super.fireChanged();
             }
@@ -46,6 +47,7 @@ public class DsfLaunch extends Launch {
     @Override
     protected void fireTerminate() {
         DebugPlugin.getDefault().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 DsfLaunch.super.fireTerminate();
             }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java
index 7ef3eb1f150..2f3ad3a91d9 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlock.java
@@ -106,6 +106,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 
         try {
             fRetrieval.getExecutor().execute(new Runnable() {
+                @Override
                 public void run() {
                     fRetrieval.getSession().addServiceEventListener(DsfMemoryBlock.this, null);
                 }
@@ -138,6 +139,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
      */
+    @Override
     public IDebugTarget getDebugTarget() {
         return fDebugTarget;
     }
@@ -145,6 +147,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
      */
+    @Override
     public String getModelIdentifier() {
         return fModelId;
     }
@@ -152,6 +155,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
      */
+    @Override
     public ILaunch getLaunch() {
         return fLaunch;
     }
@@ -163,6 +167,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IMemoryBlock#getStartAddress()
      */
+    @Override
     public long getStartAddress() {
     	// Not implemented (obsolete)
     	return 0;
@@ -171,6 +176,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IMemoryBlock#getLength()
      */
+    @Override
     public long getLength() {
     	// Not implemented (obsolete)
         return 0;
@@ -179,6 +185,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IMemoryBlock#getBytes()
      */
+    @Override
     public byte[] getBytes() throws DebugException {
     	// Not implemented (obsolete)
     	return new byte[0];
@@ -187,6 +194,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IMemoryBlock#supportsValueModification()
      */
+    @Override
     public boolean supportsValueModification() {
     	return fRetrieval.supportsValueModification();
     }
@@ -194,6 +202,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IMemoryBlock#setValue(long, byte[])
      */
+    @Override
     public void setValue(long offset, byte[] bytes) throws DebugException {
     	// Not implemented (obsolete)
     }
@@ -205,6 +214,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getExpression()
 	 */
+    @Override
 	public String getExpression() {
 		return fExpression;
 	}
@@ -212,6 +222,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigBaseAddress()
 	 */
+    @Override
 	public BigInteger getBigBaseAddress() throws DebugException {
         return fBaseAddress;
 	}
@@ -219,6 +230,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockStartAddress()
 	 */
+    @Override
 	public BigInteger getMemoryBlockStartAddress() throws DebugException {
 		// Null indicates that memory can be retrieved at addresses lower than the block base address
 		return null;
@@ -227,6 +239,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockEndAddress()
 	 */
+    @Override
 	public BigInteger getMemoryBlockEndAddress() throws DebugException {
 		// Null indicates that memory can be retrieved at addresses higher the block base address
 		return null;
@@ -235,6 +248,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBigLength()
 	 */
+    @Override
 	public BigInteger getBigLength() throws DebugException {
 		// -1 indicates that memory block is unbounded
 		return BigInteger.valueOf(-1);
@@ -243,6 +257,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressSize()
 	 */
+    @Override
 	public int getAddressSize() throws DebugException {
 		return fRetrieval.getAddressSize();
 	}
@@ -250,6 +265,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportBaseAddressModification()
 	 */
+    @Override
 	public boolean supportBaseAddressModification() throws DebugException {
 		return fRetrieval.supportBaseAddressModification();
 	}
@@ -257,6 +273,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#supportsChangeManagement()
 	 */
+    @Override
 	public boolean supportsChangeManagement() {
 		return true;
 	}
@@ -264,6 +281,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setBaseAddress(java.math.BigInteger)
 	 */
+    @Override
 	public void setBaseAddress(BigInteger address) throws DebugException {
 		fBlockAddress = address;
 	}
@@ -271,12 +289,14 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromOffset(java.math.BigInteger, long)
 	 */
+    @Override
 	public MemoryByte[] getBytesFromOffset(BigInteger offset, long units) throws DebugException {
 		return getBytesFromAddress(fBlockAddress.add(offset), units);
 	}
 	
 	private boolean fUseCachedData = false;
 	
+    @Override
 	public void clearCache() {
 		fUseCachedData = false;
 	}
@@ -302,6 +322,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
      * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getBytesFromAddress(java.math.BigInteger, long)
      */
     @SuppressWarnings("null")
+    @Override
     public MemoryByte[] getBytesFromAddress(BigInteger address, long units) throws DebugException {
 
         if (isUseCacheData() && fBlockAddress.compareTo(address) == 0 && units * getAddressableSize() <= fBlock.length)
@@ -486,6 +507,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#setValue(java.math.BigInteger, byte[])
 	 */
+    @Override
 	public void setValue(BigInteger offset, byte[] bytes) throws DebugException {
 		writeMemoryBlock(offset.longValue(), bytes);
 	}
@@ -493,6 +515,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#connect(java.lang.Object)
 	 */
+    @Override
 	public void connect(Object client) {
 		if (!fConnections.contains(client))
 			fConnections.add(client);
@@ -503,6 +526,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#disconnect(java.lang.Object)
 	 */
+    @Override
 	public void disconnect(Object client) {
 		if (fConnections.contains(client))
 			fConnections.remove(client);
@@ -513,6 +537,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getConnections()
 	 */
+    @Override
 	public Object[] getConnections() {
 		return fConnections.toArray();
 	}
@@ -528,9 +553,11 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#dispose()
 	 */
+    @Override
 	public void dispose() throws DebugException {
 		try {
     		fRetrieval.getExecutor().execute(new Runnable() {
+    		    @Override
     		    public void run() {
     		        fRetrieval.getSession().removeServiceEventListener(DsfMemoryBlock.this);
     		    }
@@ -543,6 +570,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getMemoryBlockRetrieval()
 	 */
+    @Override
 	public IMemoryBlockRetrieval getMemoryBlockRetrieval() {
 		return fRetrieval;
 	}
@@ -550,6 +578,7 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockExtension#getAddressableSize()
 	 */
+    @Override
 	public int getAddressableSize() throws DebugException {
 		return fRetrieval.getAddressableSize();
 	}
@@ -694,20 +723,24 @@ public class DsfMemoryBlock extends PlatformObject implements IMemoryBlockExtens
 		}
 	}
 
+    @Override
 	public String[] getUpdatePolicies() {
 		return new String[] {UPDATE_POLICY_AUTOMATIC, UPDATE_POLICY_MANUAL, UPDATE_POLICY_BREAKPOINT};
 	}
     
+    @Override
     public String getUpdatePolicy()
     {
     	return fUpdatePolicy;
     }
     
+    @Override
     public void setUpdatePolicy(String policy)
     {
     	fUpdatePolicy = policy;
     }
     
+    @Override
     public String getUpdatePolicyDescription(String id) {
 		return id;
 	}
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java
index 49d4f49a4fa..739871c4760 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/model/DsfMemoryBlockRetrieval.java
@@ -217,6 +217,7 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
             if (memento != null && memento.trim().length() != 0) {
                 // Submit the runnable to install the monitors on dispatch thread.
                 getExecutor().submit(new Runnable() {
+                    @Override
                     public void run() {
                         try {
                             createBlocksFromConfiguration(memoryCtx, memento);
@@ -368,6 +369,7 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
 	 * 
 	 * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#supportsStorageRetrieval()
 	 */
+    @Override
 	public boolean supportsStorageRetrieval() {
 		return true;
 	}
@@ -375,6 +377,7 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IMemoryBlockRetrieval#getMemoryBlock(long, long)
 	 */
+    @Override
 	public IMemoryBlock getMemoryBlock(final long startAddress,	final long length) throws DebugException {
 	    throw new DebugException(new Status(
 	        IStatus.ERROR, DsfPlugin.PLUGIN_ID, DebugException.NOT_SUPPORTED, 
@@ -391,6 +394,7 @@ public class DsfMemoryBlockRetrieval extends PlatformObject implements IMemoryBl
 	 * @see org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension#getExtendedMemoryBlock(java.lang.String,
 	 *      java.lang.Object)
 	 */
+    @Override
 	public IMemoryBlockExtension getExtendedMemoryBlock(String expression, Object context) throws DebugException {
         // Drill for the actual DMC
         IMemoryDMContext memoryDmc = null;
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractDsfDebugServicesFactory.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractDsfDebugServicesFactory.java
index d8e7487f425..240c0d84cb0 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractDsfDebugServicesFactory.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractDsfDebugServicesFactory.java
@@ -23,6 +23,7 @@ import org.eclipse.cdt.dsf.service.DsfSession;
 public abstract class AbstractDsfDebugServicesFactory implements IDsfDebugServicesFactory {
 
     @SuppressWarnings("unchecked")
+    @Override
 	public <V> V createService(Class<V> clazz, DsfSession session, Object ... optionalArguments) {
        	if (IBreakpoints.class.isAssignableFrom(clazz)) {
     		return (V)createBreakpointService(session);
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractInstruction.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractInstruction.java
index 6adeec12c10..1f5297687f2 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractInstruction.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/AbstractInstruction.java
@@ -20,6 +20,7 @@ public abstract class AbstractInstruction implements IInstructionWithSize {
     /*
      * @see org.eclipse.cdt.dsf.debug.service.IInstructionWithSize#getSize()
      */
+    @Override
     public Integer getSize() {
         // unkown size
         return null;
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java
index 282811452c1..26805a03335 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java
@@ -297,6 +297,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi
                 
                 // Submit the runnable to plant the breakpoints on dispatch thread.
                 getExecutor().submit(new Runnable() {
+                    @Override
                 	public void run() {
                 		installInitialBreakpoints(breakpointsDmc, initialPlatformBPs, rm);
                 	}
@@ -754,6 +755,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi
     // IBreakpointManagerListener implementation
     ///////////////////////////////////////////////////////////////////////////
 
+    @Override
 	public void breakpointManagerEnablementChanged(boolean enabled) {
 		for (IBreakpoint breakpoint : fBreakpointManager.getBreakpoints()) {
 		    breakpointChanged(breakpoint, null);
@@ -761,6 +763,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi
 	}
 
 	@ThreadSafe
+    @Override
 	public void breakpointAdded(final IBreakpoint breakpoint) {
 		if (fAttributeTranslator.supportsBreakpoint(breakpoint)) {
 			try {
@@ -769,6 +772,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi
                     fAttributeTranslator.getBreakpointAttributes(breakpoint, fBreakpointManager.isEnabled());
 
                 getExecutor().execute(new DsfRunnable() {
+                    @Override
 					public void run() {
 					    //TODO pp: need to track pending requests 
 					    
@@ -800,6 +804,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi
     // IBreakpointListener implementation
     ///////////////////////////////////////////////////////////////////////////
 
+    @Override
 	public void breakpointChanged(final IBreakpoint breakpoint, final IMarkerDelta delta) {
 		if (fAttributeTranslator.supportsBreakpoint(breakpoint)) {
 			try {
@@ -809,6 +814,7 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi
 
 				// Modify the breakpoint in all the target contexts
 		        getExecutor().execute( new DsfRunnable() { 
+		            @Override
 		            public void run() {
 
 		            	// If the breakpoint is currently being updated, queue the request and exit
@@ -864,11 +870,13 @@ public class BreakpointsMediator extends AbstractDsfService implements IBreakpoi
 
 	}
 
+    @Override
 	public void breakpointRemoved(final IBreakpoint breakpoint, IMarkerDelta delta) {
 
     	if (fAttributeTranslator.supportsBreakpoint(breakpoint)) {
             try {
                 getExecutor().execute(new DsfRunnable() {
+                    @Override
                 	public void run() {
                         //TODO pp: need to track pending requests 
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
index b13ad6fb339..d77e185869b 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator2.java
@@ -130,14 +130,17 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
     		fAttributes = attrs;
     	}
     	
+        @Override
     	public Map<String, Object> getAttributes() {
 			return fAttributes;
 		}
     	
+        @Override
     	public IBreakpointDMContext getTargetBreakpoint() {
 			return fTargetBPContext;
 		}
     	
+        @Override
     	public IStatus getStatus() {
 			return fStatus;
 		}
@@ -632,6 +635,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
      * @noreference This method is not intended to be referenced by clients.
      */
     @ThreadSafeAndProhibitedFromDsfExecutor("getExecutor()")
+    @Override
 	public void breakpointsAdded(final IBreakpoint[] bps) {
 		doBreakpointsAdded(bps, null, null);
 	}
@@ -652,6 +656,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
 
 		try {
             getExecutor().execute(new DsfRunnable() {
+                @Override
 				public void run() {
 					Collection<IBreakpointsTargetDMContext> dmcs = new ArrayList<IBreakpointsTargetDMContext>();
 					if (bpsTargetDmc == null)
@@ -797,6 +802,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
      * @noreference This method is not intended to be referenced by clients.
      */
 	@ThreadSafeAndProhibitedFromDsfExecutor("getExecutor()")
+    @Override
 	public void breakpointsChanged(IBreakpoint[] bps, IMarkerDelta[] deltas) {
 		if (fAttributeTranslator2 == null)
 			return;
@@ -808,6 +814,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
 		
 		try {
 	        getExecutor().execute( new DsfRunnable() { 
+	            @Override
 	            public void run() {
 	            	Map<String, Object> tmp = new HashMap<String, Object>(1);
 					tmp.put(IBreakpoint.ENABLED, true);
@@ -942,8 +949,10 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
     @ThreadSafeAndProhibitedFromDsfExecutor("getExecutor()")
+    @Override
 	public void breakpointsRemoved(final IBreakpoint[] bps, IMarkerDelta delta[]) {
 		getExecutor().execute(new DsfRunnable() {
+		    @Override
 			public void run() {
 				for (IBreakpoint bp : bps)
 					fBreakpointAttributes.remove(bp);
@@ -973,6 +982,7 @@ public class BreakpointsMediator2 extends AbstractDsfService implements IBreakpo
 		
 		try {
 	        getExecutor().execute(new DsfRunnable() {
+	            @Override
 	        	public void run() {
 					Collection<IBreakpointsTargetDMContext> contexts = new ArrayList<IBreakpointsTargetDMContext>();
 					if (bpsTargetDmc == null)
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java
index dfc73102656..ba32cdcdd4d 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java
@@ -74,19 +74,19 @@ public interface IExpressions extends IFormattedValues {
          * valid address can be returned for a given expression location.  
          */
         public static final IAddress INVALID_ADDRESS = new IAddress() {
-            public IAddress add(BigInteger offset) { return this; }
-            public IAddress add(long offset) { return this; }
-            public BigInteger getMaxOffset() { return BigInteger.ZERO; }
-            public BigInteger distanceTo(IAddress other) { return BigInteger.ZERO; }
-            public BigInteger getValue() { return BigInteger.ZERO; }
-            public boolean isZero() { return false; }
-            public boolean isMax() { return false; }
-            public String toString(int radix) { return "INVALID"; }
-            public String toHexAddressString() { return toString(); }
-            public String toBinaryAddressString()  { return toString(); }
-            public int getCharsNum() { return 0; }
-            public int getSize() { return 0; }
-            public int compareTo(Object o) { return 0; }
+            @Override public IAddress add(BigInteger offset) { return this; }
+            @Override public IAddress add(long offset) { return this; }
+            @Override public BigInteger getMaxOffset() { return BigInteger.ZERO; }
+            @Override public BigInteger distanceTo(IAddress other) { return BigInteger.ZERO; }
+            @Override public BigInteger getValue() { return BigInteger.ZERO; }
+            @Override public boolean isZero() { return false; }
+            @Override public boolean isMax() { return false; }
+            @Override public String toString(int radix) { return "INVALID"; }
+            @Override public String toHexAddressString() { return toString(); }
+            @Override public String toBinaryAddressString()  { return toString(); }
+            @Override public int getCharsNum() { return 0; }
+            @Override public int getSize() { return 0; }
+            @Override public int compareTo(Object o) { return 0; }
         };
         
         /**
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/BufferedCommandControl.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/BufferedCommandControl.java
index 7ee804f25f1..63ff432f65c 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/BufferedCommandControl.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/BufferedCommandControl.java
@@ -33,26 +33,31 @@ public class BufferedCommandControl implements ICommandControl {
     private int fDepth;
     
     private ICommandListener fCommandListener = new ICommandListener() {
-        public void commandQueued(ICommandToken token) {
+        @Override
+       public void commandQueued(ICommandToken token) {
             for (ICommandListener processor : fCommandProcessors) {
                 processor.commandQueued(token);
             }
         };
             
+        @Override
         public void commandRemoved(ICommandToken token) {
             for (ICommandListener processor : fCommandProcessors) {
                 processor.commandRemoved(token);
             }
         };
             
+        @Override
         public void commandSent(final ICommandToken token) {
             for (ICommandListener processor : fCommandProcessors) {
                 processor.commandSent(token);
             }
         };
         
+        @Override
         public void commandDone(final ICommandToken token, final ICommandResult result) {
             buffer(fDepth, new DsfRunnable() {
+                @Override
                 public void run() {
                     for (ICommandListener processor : fCommandProcessors) {
                         processor.commandDone(token, result);
@@ -63,8 +68,10 @@ public class BufferedCommandControl implements ICommandControl {
     };
 
     private IEventListener fEventListener = new IEventListener() {
+        @Override
         public void eventReceived(final Object output) {
             buffer(fDepth, new DsfRunnable() {
+                @Override
                 public void run() {
                     for (IEventListener processor : fEventProcessors) {
                         processor.eventReceived(output);
@@ -84,6 +91,7 @@ public class BufferedCommandControl implements ICommandControl {
         assert fDepth > 0;
     }
     
+    @Override
     public void addCommandListener(ICommandListener listener) {
         if (fCommandProcessors.isEmpty()) {
             fControlDelegate.addCommandListener(fCommandListener);
@@ -92,6 +100,7 @@ public class BufferedCommandControl implements ICommandControl {
     }
 
 
+    @Override
     public void removeCommandListener(ICommandListener listener) {
         fCommandProcessors.remove(listener);
         if (fCommandProcessors.isEmpty()) {
@@ -99,6 +108,7 @@ public class BufferedCommandControl implements ICommandControl {
         }
     }
 
+    @Override
     public void addEventListener(IEventListener listener) {
         if (fEventProcessors.isEmpty()) {
             fControlDelegate.addEventListener(fEventListener);
@@ -106,6 +116,7 @@ public class BufferedCommandControl implements ICommandControl {
         fEventProcessors.add(listener);
     }
 
+    @Override
     public void removeEventListener(IEventListener listener) {
         fEventProcessors.remove(listener);
         if (fEventProcessors.isEmpty()) {
@@ -113,6 +124,7 @@ public class BufferedCommandControl implements ICommandControl {
         }
     }
 
+    @Override
     public <V extends ICommandResult> ICommandToken queueCommand(final ICommand<V> command, final DataRequestMonitor<V> rm) {
         return fControlDelegate.queueCommand(
             command, 
@@ -120,6 +132,7 @@ public class BufferedCommandControl implements ICommandControl {
                 @Override
                 protected void handleCompleted() {
                     buffer(fDepth, new DsfRunnable() {
+                        @Override
                         public void run() {
                             rm.setData(getData());
                             rm.setStatus(getStatus());
@@ -130,6 +143,7 @@ public class BufferedCommandControl implements ICommandControl {
             });
     }
 
+    @Override
     public void removeCommand(ICommandToken token) {
         fControlDelegate.removeCommand(token);
     }
@@ -139,6 +153,7 @@ public class BufferedCommandControl implements ICommandControl {
             runnable.run();
         } else {
             fExecutor.execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     buffer(depth - 1, runnable);
                 }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java
index 20851ae8086..91f21a21fbf 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/command/CommandCache.java
@@ -402,6 +402,7 @@ public class CommandCache implements ICommandListener
             			super.done();
             		} else {
             			fSession.getExecutor().execute(new DsfRunnable() {
+            			    @Override
             				public void run() {
             					superDone();
             				}
@@ -571,6 +572,7 @@ public class CommandCache implements ICommandListener
     	fCachedContexts.clear();
     }
 
+    @Override
     public void commandRemoved(ICommandToken token) {
         /*
          *  Do nothing. 
@@ -580,6 +582,7 @@ public class CommandCache implements ICommandListener
     /* (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.service.command.ICommandListener#commandQueued(org.eclipse.cdt.dsf.debug.service.command.ICommandToken)
      */
+    @Override
     public void commandQueued(ICommandToken token) {
         /*
          *  Do nothing. 
@@ -589,6 +592,7 @@ public class CommandCache implements ICommandListener
     /* (non-Javadoc)
      * @see org.eclipse.cdt.dsf.debug.service.command.ICommandListener#commandDone(org.eclipse.cdt.dsf.debug.service.command.ICommandToken, org.eclipse.cdt.dsf.debug.service.command.ICommandResult)
      */
+    @Override
     public void commandDone(ICommandToken token, ICommandResult result) {
         /*
          *  We handle the done with a runnable where we initiated the command
@@ -603,6 +607,7 @@ public class CommandCache implements ICommandListener
      * 
      * @see org.eclipse.cdt.dsf.debug.service.command.ICommandListener#commandSent(org.eclipse.cdt.dsf.debug.service.command.ICommandToken)
      */
+    @Override
     public void commandSent(ICommandToken token) {
         
         // Cast the generic ?'s to concrete types in the cache implementation.
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
index d37e05bfd75..f7131ef8218 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java
@@ -64,6 +64,7 @@ public class DsfSourceLookupParticipant implements ISourceLookupParticipant {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant#init(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
      */
+    @Override
     public void init(ISourceLookupDirector director) {
         fDirector = director;
     }
@@ -71,6 +72,7 @@ public class DsfSourceLookupParticipant implements ISourceLookupParticipant {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant#dispose()
      */
+    @Override
     public void dispose() {
         fServicesTracker.dispose();
         fDirector = null;
@@ -79,6 +81,7 @@ public class DsfSourceLookupParticipant implements ISourceLookupParticipant {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant#findSourceElements(java.lang.Object)
      */
+    @Override
     public Object[] findSourceElements(Object object) throws CoreException {
         CoreException single = null;
         MultiStatus multiStatus = null;
@@ -171,6 +174,7 @@ public class DsfSourceLookupParticipant implements ISourceLookupParticipant {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant#sourceContainersChanged(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
      */
+    @Override
     public void sourceContainersChanged(ISourceLookupDirector director) {
         fLookupCache.clear();
     }
@@ -178,6 +182,7 @@ public class DsfSourceLookupParticipant implements ISourceLookupParticipant {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceLookupParticipant#getSourceName(java.lang.Object)
 	 */
+    @Override
 	public String getSourceName(Object object) throws CoreException {
 		if ( !(object instanceof IDMContext) || 
              !((IDMContext)object).getSessionId().equals(fSessionId) ) 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java
index 2f7bd302c01..c8c08072686 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/AbstractDsfService.java
@@ -62,6 +62,7 @@ abstract public class AbstractDsfService
         fSession = session;
     }
 
+    @Override
     public DsfExecutor getExecutor() { return fSession.getExecutor(); }
 
 	/**
@@ -75,18 +76,23 @@ abstract public class AbstractDsfService
 	 * @see org.eclipse.cdt.dsf.service.IDsfService#getProperties()
 	 */
     @SuppressWarnings("rawtypes")
+    @Override
     public Dictionary getProperties() { return fProperties; }
     
+    @Override
     public String getServiceFilter() { return fFilter; }
     
+    @Override
     public int getStartupNumber() { return fStartupNumber; }
     
+    @Override
     public void initialize(RequestMonitor rm) {
         fTracker = new DsfServicesTracker(getBundleContext(), fSession.getId());
         fStartupNumber = fSession.getAndIncrementServiceStartupCounter();
         rm.done();
     }
         
+    @Override
     public void shutdown(RequestMonitor rm) {
         fTracker.dispose();
         fTracker = null;
@@ -96,11 +102,13 @@ abstract public class AbstractDsfService
     /**
 	 * @since 2.0
 	 */
+    @Override
     public boolean isRegistered() {
         return getServiceRegistration() != null;
     }
 
     /** Returns the session object for this service */
+    @Override
     public DsfSession getSession() { return fSession; }
 
     /**
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java
index d789271f92a..18b28162ce0 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfServicesTracker.java
@@ -95,6 +95,7 @@ public class DsfServicesTracker {
     private final String fServiceFilter;
 
     private final ServiceListener fListner = new ServiceListener() {
+        @Override
         public void serviceChanged(final ServiceEvent event) {
             // Only listen to unregister events.
             if (event.getType() != ServiceEvent.UNREGISTERING) {
@@ -113,6 +114,7 @@ public class DsfServicesTracker {
             } else {
                 try {
                     session.getExecutor().execute(new DsfRunnable() {
+                        @Override
                        public void run() {
                            handleUnregisterEvent(event);
                        }; 
@@ -247,6 +249,7 @@ public class DsfServicesTracker {
             try {
                 if (!session.getExecutor().isInExecutorThread()) {
                     session.getExecutor().execute(new DsfRunnable() {
+                        @Override
                         public void run() {
                             doDispose();
                         }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
index 60452e44144..b2f15a3a89b 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/service/DsfSession.java
@@ -210,7 +210,7 @@ public class DsfSession
         synchronized(fgActiveSessions) {
             final DsfSession newSession = new DsfSession(executor, ownerId, Integer.toString(fgSessionIdCounter++));
             fgActiveSessions.add(newSession);
-            executor.submit( new DsfRunnable() { public void run() {
+            executor.submit( new DsfRunnable() { @Override public void run() {
                 SessionStartedListener[] listeners = fSessionStartedListeners.toArray(
                     new SessionStartedListener[fSessionStartedListeners.size()]);
                 for (int i = 0; i < listeners.length; i++) {
@@ -234,7 +234,7 @@ public class DsfSession
                 throw new IllegalArgumentException();
             }
             fgActiveSessions.remove(session);
-            session.getExecutor().submit( new DsfRunnable() { public void run() {
+            session.getExecutor().submit( new DsfRunnable() { @Override public void run() {
                 SessionEndedListener[] listeners = fSessionEndedListeners.toArray(
                     new SessionEndedListener[fSessionEndedListeners.size()]);
                 for (int i = 0; i < listeners.length; i++) {
@@ -386,6 +386,7 @@ public class DsfSession
         	DsfPlugin.debug(msg);
         }
         getExecutor().submit(new DsfRunnable() { 
+            @Override
             public void run() { doDispatchEvent(event, serviceProperties);}
             @Override
             public String toString() { return "Event: " + event + ", from service " + serviceProperties; }  //$NON-NLS-1$ //$NON-NLS-2$
@@ -467,6 +468,7 @@ public class DsfSession
         
         // Build a list of listeners;
         SortedMap<ListenerEntry,List<Method>> listeners = new TreeMap<ListenerEntry,List<Method>>(new Comparator<ListenerEntry>() {
+            @Override
                 public int compare(ListenerEntry o1, ListenerEntry o2) {
                     if (o1.fListener == o2.fListener) {
                         return 0;