Bug 317173: Fix new warnings of missing @Override now that we use java 6, in org.eclipse.cdt.dsf.gdb.ui

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java

@@ -202,6 +202,7 @@ public class GdbAdapterFactory
 
             fDebugModelProvider = new IDebugModelProvider() {
                 // @see org.eclipse.debug.core.model.IDebugModelProvider#getModelIdentifiers()
+                @Override
                 public String[] getModelIdentifiers() {
                     return new String[] { GdbLaunchDelegate.GDB_DEBUG_MODEL_ID, ICBreakpoint.C_BREAKPOINTS_DEBUG_MODEL_ID };
                 }
@@ -329,6 +330,7 @@ public class GdbAdapterFactory
      * This method only actually returns adapters for the launch object.
      */
     @SuppressWarnings("rawtypes")
+    @Override
     public Object getAdapter(Object adaptableObject, Class adapterType) {
         if (!(adaptableObject instanceof GdbLaunch)) return null;
 
@@ -379,6 +381,7 @@ public class GdbAdapterFactory
     }
 
     @SuppressWarnings("rawtypes")
+    @Override
     public Class[] getAdapterList() {
         return new Class[] {
             IElementContentProvider.class, IModelProxyFactory.class, ISuspendTrigger.class,
@@ -386,6 +389,7 @@ public class GdbAdapterFactory
             };
     }
 
+    @Override
     public void launchesRemoved(ILaunch[] launches) {
         // Dispose the set of adapters for a launch only after the launch is
         // removed.
@@ -396,12 +400,15 @@ public class GdbAdapterFactory
         }
     }
 
+    @Override
     public void launchesTerminated(ILaunch[] launches) {
     }
 
+    @Override
     public void launchesAdded(ILaunch[] launches) {
     }
     
+    @Override
     public void launchesChanged(ILaunch[] launches) {
     }
     

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbPinProvider.java

@@ -61,9 +61,11 @@ public class GdbPinProvider implements IPinProvider {
 		GdbPinElementColorDescriptor(int color) {
 			fColor = color;
 		}
+        @Override
 		public int getOverlayColor() {
 			return fColor;
 		}
+        @Override
 		public ImageDescriptor getToolbarIconDescriptor() {
 			return null;
 		}
@@ -89,6 +91,7 @@ public class GdbPinProvider implements IPinProvider {
 		fSession = session;
 		
 		session.getExecutor().execute(new Runnable() {			
+            @Override
 			public void run() {
 				fSession.addServiceEventListener(GdbPinProvider.this, null);
 			}
@@ -101,6 +104,7 @@ public class GdbPinProvider implements IPinProvider {
 	public void dispose() {
 		try {
 			fSession.getExecutor().execute(new Runnable() {			
+                @Override
 				public void run() {
 					fSession.removeServiceEventListener(GdbPinProvider.this);
 				}
@@ -190,6 +194,7 @@ public class GdbPinProvider implements IPinProvider {
 	 * (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.ui.IPinProvider#isPinnable(org.eclipse.ui.IWorkbenchPart, java.lang.Object)
 	 */
+    @Override
 	public boolean isPinnable(IWorkbenchPart part, Object debugContext) {
 		if (debugContext instanceof IAdaptable) {
 			return ((IAdaptable) debugContext).getAdapter(IDMContext.class) != null;
@@ -201,6 +206,7 @@ public class GdbPinProvider implements IPinProvider {
 	 * (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.ui.IPinProvider#pin(org.eclipse.ui.IWorkbenchPart, java.lang.Object, org.eclipse.cdt.debug.ui.IPinModelListener)
 	 */
+    @Override
 	public IPinElementHandle pin(IWorkbenchPart part, Object debugContext, IPinModelListener listener) {
 		Object pinContext = debugContext;
 		String label = ""; //$NON-NLS-1$
@@ -242,6 +248,7 @@ public class GdbPinProvider implements IPinProvider {
 	 * (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.ui.IPinProvider#unpin(org.eclipse.ui.IWorkbenchPart, org.eclipse.cdt.debug.ui.IPinProvider.IPinElementHandle)
 	 */
+    @Override
 	public void unpin(IWorkbenchPart part, IPinElementHandle handle) {
 		// remove the handle from the cache
 		gsPinnedHandles.remove(handle);		
@@ -260,6 +267,7 @@ public class GdbPinProvider implements IPinProvider {
 	 * (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.ui.IPinProvider#isPinnedTo(java.lang.Object, org.eclipse.cdt.debug.ui.IPinProvider.IPinElementHandle)
 	 */
+    @Override
 	public boolean isPinnedTo(Object debugContext, IPinElementHandle handle) {
 		Object handleDebugContext = handle.getDebugContext();
 		

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbSuspendTrigger.java

@@ -39,7 +39,8 @@ public class GdbSuspendTrigger extends DsfSuspendTrigger {
     protected void getLaunchTopContainers(final DataRequestMonitor<IContainerDMContext[]> rm) {
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+				public void run() {
                     IProcesses processService = getServicesTracker().getService(IProcesses.class);
                     ICommandControlService controlService = getServicesTracker().getService(ICommandControlService.class);
                     if (processService == null || controlService == null) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/ConnectActionDelegate.java

@@ -27,6 +27,7 @@ public class ConnectActionDelegate extends AbstractVMProviderActionDelegate {
 	/*
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
+    @Override
 	public void run(IAction action) {
 		if (action.isEnabled()) {
 			// disable the action so it cannot be run again until an event or 

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/DsfTerminateCommand.java

@@ -42,6 +42,7 @@ public class DsfTerminateCommand implements ITerminateHandler {
     }
 
     // Run control may not be avilable after a connection is terminated and shut down.
+    @Override
     public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1 || 
             !(request.getElements()[0] instanceof IDMVMContext) ) 
@@ -64,6 +65,7 @@ public class DsfTerminateCommand implements ITerminateHandler {
         try {
             fExecutor.execute(
                 new DsfRunnable() { 
+                    @Override
                     public void run() {
                         // Get the processes service and the exec context.
                     	IProcesses procService = fTracker.getService(IProcesses.class);
@@ -88,6 +90,7 @@ public class DsfTerminateCommand implements ITerminateHandler {
         }
     }
 
+    @Override
     public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1 || 
         	!(request.getElements()[0] instanceof IDMVMContext)) {
@@ -106,6 +109,7 @@ public class DsfTerminateCommand implements ITerminateHandler {
 
         try {
             fExecutor.execute(new DsfRunnable() { 
+                @Override
                 public void run() {
                 	IProcesses procService = fTracker.getService(IProcesses.class);
                     if (procService != null) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/FetchMoreChildrenAction.java

@@ -38,6 +38,7 @@ public class FetchMoreChildrenAction extends AbstractVMProviderActionDelegate
 
 	private ISelection selection;
 	
+    @Override
 	public void run(IAction action) {
 		IncompleteChildrenVMC incompleteChildrenVmc = getIncompleteChildrenVMC();
 
@@ -53,6 +54,7 @@ public class FetchMoreChildrenAction extends AbstractVMProviderActionDelegate
 				final FetchMoreChildrenEvent fetchMoreChildrenEvent = new FetchMoreChildrenEvent(exprCtx, path);
 				final AbstractVMProvider vmProvider = (AbstractVMProvider) getVMProvider();
 				vmProvider.getExecutor().execute(new DsfRunnable() {
+	                @Override
 					public void run() {
 						vmProvider.handleEvent(fetchMoreChildrenEvent);
 					}
@@ -89,6 +91,7 @@ public class FetchMoreChildrenAction extends AbstractVMProviderActionDelegate
 		getAction().setEnabled(enabled);
 	}
 
+    @Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 		if (targetPart instanceof IViewPart) {
 			init((IViewPart) targetPart);

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbConnectCommand.java

@@ -84,6 +84,7 @@ public class GdbConnectCommand implements IConnect {
         fTracker.dispose();
     }
 
+    @Override
     public boolean canConnect() {
        	Query<Boolean> canConnectQuery = new Query<Boolean>() {
             @Override
@@ -210,6 +211,7 @@ public class GdbConnectCommand implements IConnect {
 
     			final String finalBinaryPath = binaryPath;
     			fExecutor.execute(new DsfRunnable() {
+                    @Override
     				public void run() {
     					IGDBProcesses procService = fTracker.getService(IGDBProcesses.class);
     					ICommandControlService commandControl = fTracker.getService(ICommandControlService.class);
@@ -239,6 +241,7 @@ public class GdbConnectCommand implements IConnect {
     	}
     }
 
+    @Override
     public void connect(RequestMonitor requestMonitor)
     {
     	// Create a fake rm to avoid null pointer exceptions
@@ -255,6 +258,7 @@ public class GdbConnectCommand implements IConnect {
     	// thread to prompt the user for the process to choose.
     	// This is why we simply use a DsfRunnable.
     	fExecutor.execute(new DsfRunnable() {
+            @Override
     		public void run() {
     			final IProcesses procService = fTracker.getService(IProcesses.class);
     			ICommandControlService commandControl = fTracker.getService(ICommandControlService.class);

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbDisconnectCommand.java

@@ -37,6 +37,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler {
         fTracker.dispose();
     }
 
+    @Override
     public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1) {
             request.setEnabled(false);
@@ -67,6 +68,7 @@ public class GdbDisconnectCommand implements IDisconnectHandler {
         });
 	}
 
+    @Override
 	public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1) {
             request.done();

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/GdbRestartCommand.java

@@ -45,6 +45,7 @@ public class GdbRestartCommand implements IRestartHandler {
         fTracker.dispose();
     }
 
+    @Override
     public void canExecute(final IEnabledStateRequest request) {
         if (request.getElements().length != 1) {
             request.setEnabled(false);
@@ -75,6 +76,7 @@ public class GdbRestartCommand implements IRestartHandler {
         });
 	}
     
+    @Override
     public boolean execute(final IDebugCommandRequest request) {
         if (request.getElements().length != 1) {
             request.done();
@@ -92,6 +94,7 @@ public class GdbRestartCommand implements IRestartHandler {
         
         fExecutor.submit(new DsfRunnable() {
         	@SuppressWarnings("unchecked")
+            @Override
 			public void run() {
             	IGDBProcesses procService = fTracker.getService(IGDBProcesses.class);
 

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/ProcessInfo.java

@@ -32,18 +32,22 @@ class ProcessInfo implements IProcessExtendedInfo, Comparable<ProcessInfo> {
 		this.ownerId = owner;
 	}
 	
+    @Override
 	public String getName() {
 		return name;
 	}
 
+    @Override
 	public int getPid() {
 		return pid;
 	}
 
+    @Override
 	public String[] getCores() {
 		return cores;
 	}
 
+    @Override
 	public String getOwner() {
 		return ownerId;
 	}
@@ -52,6 +56,7 @@ class ProcessInfo implements IProcessExtendedInfo, Comparable<ProcessInfo> {
 	 * Sort by name, then by pid.
 	 * No need to sort any further since pids are unique.
 	 */
+    @Override
 	public int compareTo(ProcessInfo other) {
 	    int nameCompare = getName().compareTo(other.getName());
 	    if (nameCompare != 0) return nameCompare;

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/actions/ReverseDebuggingPropertyTester.java

@@ -31,6 +31,7 @@ public class ReverseDebuggingPropertyTester extends PropertyTester {
 
     private static final String ENABLED = "isReverseDebuggingEnabled"; //$NON-NLS-1$
 
+    @Override
     public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
     	if (ENABLED.equals(property)) {
     		if (receiver instanceof IDMVMContext) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBTracepointPropertyPage.java

@@ -356,6 +356,7 @@ public class GDBTracepointPropertyPage extends FieldEditorPreferencePage impleme
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
 	 */
+    @Override
 	public IAdaptable getElement() {
 		return fElement;
 	}
@@ -363,6 +364,7 @@ public class GDBTracepointPropertyPage extends FieldEditorPreferencePage impleme
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
 	 */
+    @Override
 	public void setElement(IAdaptable element) {
 		fElement = element;
 	}
@@ -380,6 +382,7 @@ public class GDBTracepointPropertyPage extends FieldEditorPreferencePage impleme
 			/**
 			 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
 			 */
+            @Override
 			public void propertyChange(PropertyChangeEvent event) {
 				changedProperties.add(event.getProperty());
 			}
@@ -392,6 +395,7 @@ public class GDBTracepointPropertyPage extends FieldEditorPreferencePage impleme
 	protected void setBreakpointProperties(final List<String> changedProperties) {
 		IWorkspaceRunnable wr = new IWorkspaceRunnable() {
 
+            @Override
 			public void run( IProgressMonitor monitor ) throws CoreException {
 				ICTracepoint tracepoint = getTracepoint();
 				Iterator<String> changed = changedProperties.iterator();

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GdbThreadFilterEditor.java

@@ -72,6 +72,7 @@ public class GdbThreadFilterEditor {
          * 
          * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
          */
+        @Override
         public void checkStateChanged(CheckStateChangedEvent event) {
             Object element = event.getElement();
             if (element instanceof IContainerDMContext) {
@@ -140,6 +141,7 @@ public class GdbThreadFilterEditor {
          * 
          * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
          */
+        @Override
         public Object[] getChildren(Object parent) {
             if (parent instanceof IContainerDMContext) {
                 return syncGetThreads((IContainerDMContext) parent);
@@ -165,6 +167,7 @@ public class GdbThreadFilterEditor {
          * 
          * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
          */
+        @Override
         public Object getParent(Object element) {
             if (element instanceof IContainerDMContext) {
                 return DebugPlugin.getDefault().getLaunchManager();
@@ -180,6 +183,7 @@ public class GdbThreadFilterEditor {
          * 
          * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
          */
+        @Override
         public boolean hasChildren(Object element) {
             return getChildren(element).length > 0;
         }
@@ -189,6 +193,7 @@ public class GdbThreadFilterEditor {
          * 
          * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
          */
+        @Override
         public Object[] getElements(Object inputElement) {
             return getChildren(inputElement);
         }
@@ -198,6 +203,7 @@ public class GdbThreadFilterEditor {
          * 
          * @see org.eclipse.jface.viewers.IContentProvider#dispose()
          */
+        @Override
         public void dispose() {
         }
 
@@ -207,6 +213,7 @@ public class GdbThreadFilterEditor {
          * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
          *      java.lang.Object, java.lang.Object)
          */
+        @Override
         public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
         }
     }

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/ToggleTracepointsTargetFactory.java

@@ -53,6 +53,7 @@ public class ToggleTracepointsTargetFactory implements IToggleBreakpointsTargetF
 	public ToggleTracepointsTargetFactory() {
 	}
 
+    @Override
 	public IToggleBreakpointsTarget createToggleTarget(String targetID) {
 		if (TOGGLE_C_TRACEPOINT_TARGET_ID.equals(targetID)) {
 			return fgDisassemblyToggleTracepointsTarget;
@@ -60,10 +61,12 @@ public class ToggleTracepointsTargetFactory implements IToggleBreakpointsTargetF
 		return null;
 	}
 
+    @Override
 	public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) {
 		return null;
 	}
 
+    @Override
 	public String getToggleTargetDescription(String targetID) {
 		if (TOGGLE_C_TRACEPOINT_TARGET_ID.equals(targetID)) {
 			return Messages.ToggleTracepointsTargetFactory_description;
@@ -71,6 +74,7 @@ public class ToggleTracepointsTargetFactory implements IToggleBreakpointsTargetF
 		return null;
 	}
 
+    @Override
 	public String getToggleTargetName(String targetID) {
 		if (TOGGLE_C_TRACEPOINT_TARGET_ID.equals(targetID)) {
 			return Messages.ToggleTracepointsTargetFactory_name;
@@ -78,6 +82,7 @@ public class ToggleTracepointsTargetFactory implements IToggleBreakpointsTargetF
 		return null;
 	}
 
+    @Override
 	public Set<String> getToggleTargets(IWorkbenchPart part, ISelection selection) {
 		if (part instanceof IDisassemblyPart) {
 			return TOGGLE_TARGET_IDS_ALL;

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbReverseToggleCommand.java

@@ -149,10 +149,12 @@ public class GdbReverseToggleCommand extends AbstractDebugCommand implements IRe
 		return true;
 	}
     
+    @Override
     public boolean toggleNeedsUpdating() {
     	return true;
     }
 
+    @Override
     public boolean isReverseToggled(Object context) {
     	IDMContext dmc;
 

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/commands/GdbSaveTraceDataCommand.java

@@ -69,6 +69,7 @@ public class GdbSaveTraceDataCommand extends AbstractDebugCommand implements ISa
 
 		final String[] fileName = new String[1];
 		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
+            @Override
 			public void run() {
 				fileName[0] = promptForFileName();
 			};

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java

@@ -45,6 +45,7 @@ public class ConsolePageParticipant implements IConsolePageParticipant, IDebugCo
     private IPageBookViewPage fPage;
     private IConsoleView fView;
 
+    @Override
 	public void init(IPageBookViewPage page, IConsole console) {
         fPage = page;
         fConsole = console;
@@ -98,10 +99,12 @@ public class ConsolePageParticipant implements IConsolePageParticipant, IDebugCo
 	}
 	
 	@SuppressWarnings("rawtypes")
+    @Override
 	public Object getAdapter(Class adapter) {
 		return null;
 	}
 	
+    @Override
 	public void dispose() {
         if (isConsoleInferior(fConsole) || isConsoleGdbCli(fConsole)) {
 			DebugUITools.getDebugContextManager().getContextService(fPage.getSite().getWorkbenchWindow()).removeDebugContextListener(this);
@@ -109,9 +112,11 @@ public class ConsolePageParticipant implements IConsolePageParticipant, IDebugCo
 		fConsole = null;
 	}
 
+    @Override
 	public void activated() {
 	}
 
+    @Override
 	public void deactivated() {
 	}
 
@@ -186,6 +191,7 @@ public class ConsolePageParticipant implements IConsolePageParticipant, IDebugCo
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent)
 	 */
+    @Override
 	public void debugContextChanged(DebugContextEvent event) {
 		if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
 			IProcess consoleProcess = getConsoleProcess();

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsoleSaveAction.java

@@ -48,6 +48,7 @@ public class ConsoleSaveAction extends Action{
 		}
 
 		Runnable saveJob = new Runnable() {
+            @Override
 			public void run() {
 				saveContent(fileName);
 			}

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/TracingConsole.java

@@ -70,6 +70,7 @@ public class TracingConsole extends IOConsole {
 	protected void init() {
         super.init();
         fSession.getExecutor().submit(new DsfRunnable() {
+            @Override
         	public void run() {
         		fSession.addServiceEventListener(TracingConsole.this, null);
         	}
@@ -84,6 +85,7 @@ public class TracingConsole extends IOConsole {
 		}
         try {
         	fSession.getExecutor().submit(new DsfRunnable() {
+                @Override
         		public void run() {
         			fSession.removeServiceEventListener(TracingConsole.this);
         		}
@@ -99,6 +101,7 @@ public class TracingConsole extends IOConsole {
     private void setStreamInService() {
     	try {
     		fSession.getExecutor().submit(new DsfRunnable() {
+                @Override
     			public void run() {
     				DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(), fSession.getId());
     				IGDBControl control = tracker.getService(IGDBControl.class);
@@ -146,6 +149,7 @@ public class TracingConsole extends IOConsole {
     	String name = getName();
     	if (!name.equals(newName)) {
     		Runnable r = new Runnable() {
+                @Override
     			public void run() {
     				setName(newName);
     			}

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/TracingConsoleManager.java

@@ -108,21 +108,25 @@ public class TracingConsoleManager implements ILaunchesListener2, IPropertyChang
 		}
 	}
 
+    @Override
 	public void launchesAdded(ILaunch[] launches) {
 		for (ILaunch launch : launches) {
 			addConsole(launch);
 		}
 	}
 
+    @Override
 	public void launchesChanged(ILaunch[] launches) {
 	}
 
+    @Override
 	public void launchesRemoved(ILaunch[] launches) {
 		for (ILaunch launch : launches) {
 			removeConsole(launch);
 		}
 	}
 	
+    @Override
 	public void launchesTerminated(ILaunch[] launches) {
 		for (ILaunch launch : launches) {
 			// Since we already had a console, don't get rid of it
@@ -131,6 +135,7 @@ public class TracingConsoleManager implements ILaunchesListener2, IPropertyChang
 		}
 	}
 	
+    @Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (event.getProperty().equals(IGdbDebugPreferenceConstants.PREF_TRACES_ENABLE)) {
 			fTracingEnabled = (Boolean)event.getNewValue();

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CArgumentsTab.java

@@ -68,6 +68,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+    @Override
 	public void createControl(Composite parent) {
     Font font = parent.getFont();
     Composite comp = new Composite(parent, SWT.NONE);
@@ -111,6 +112,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab {
 		fPrgmArgumentsText.setLayoutData(gd);
     fPrgmArgumentsText.setFont(font);
 		fPrgmArgumentsText.addModifyListener(new ModifyListener() {
+            @Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -187,6 +189,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+    @Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, (String) null);
@@ -195,6 +198,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+    @Override
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		try {
 			fPrgmArgumentsText.setText(configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "")); //$NON-NLS-1$
@@ -209,6 +213,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+    @Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		configuration.setAttribute(
 			ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
@@ -239,6 +244,7 @@ public class CArgumentsTab extends CLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
 	 */
+    @Override
 	public String getName() {
 		return LaunchMessages.getString("CArgumentsTab.Arguments"); //$NON-NLS-1$
 	}

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CDebuggerTab.java

@@ -91,6 +91,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 	private Composite fContents;
 
     private IContentChangeListener fContentListener = new IContentChangeListener() {
+        @Override
         public void contentChanged() {
             contentsChanged();
         }
@@ -116,6 +117,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 	    return TAB_ID;
 	}
 
+    @Override
 	public void createControl(Composite parent) {
 		fContainer = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
 		fContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -162,6 +164,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		}
 	}
 
+    @Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
 		setLaunchConfigurationWorkingCopy(config);
 		ICDebuggerPage dynamicTab = getDynamicTab();
@@ -199,6 +202,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		}
 	}
 
+    @Override
 	public void initializeFrom(ILaunchConfiguration config) {
 		setInitializing(true);
 
@@ -217,6 +221,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		setInitializing(false);
 	}
 
+    @Override
 	public void performApply(ILaunchConfigurationWorkingCopy config) {
 		if (getDebuggerId() != null) {
 			config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, getDebuggerId());
@@ -322,6 +327,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 			gridData.widthHint = 100;
 			fStopInMainSymbol.setLayoutData(gridData);
 			fStopInMainSymbol.addModifyListener(new ModifyListener() {
+                @Override
 				public void modifyText(ModifyEvent evt) {
 					update();
 				}
@@ -536,6 +542,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		return LaunchImages.get(LaunchImages.IMG_VIEW_DEBUGGER_TAB);
 	}
 
+    @Override
 	public String getName() {
 		return LaunchMessages.getString("AbstractCDebuggerTab.Debugger"); //$NON-NLS-1$
 	}
@@ -551,6 +558,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		fDCombo = new Combo(comboComp, SWT.READ_ONLY | SWT.DROP_DOWN);
 		fDCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		fDCombo.addSelectionListener(new SelectionListener() {
+            @Override
 		    public void widgetSelected(SelectionEvent e) {
 		        if (!isInitializing()) {
 		            setInitializeDefault(true);
@@ -558,6 +566,7 @@ public class CDebuggerTab extends CLaunchConfigurationTab {
 		        }
 		    }
 
+            @Override
 		    public void widgetDefaultSelected(SelectionEvent e) {
 		    }
 		});

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CMainTab.java

@@ -107,6 +107,7 @@ public class CMainTab extends CAbstractMainTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+    @Override
 	public void createControl(Composite parent) {
 		Composite comp = new Composite(parent, SWT.NONE);
 		setControl(comp);
@@ -149,6 +150,7 @@ public class CMainTab extends CAbstractMainTab {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		fProgText.setLayoutData(gd);
 		fProgText.addModifyListener(new ModifyListener() {
+            @Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -208,6 +210,7 @@ public class CMainTab extends CAbstractMainTab {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		fCoreText.setLayoutData(gd);
 		fCoreText.addModifyListener(new ModifyListener() {
+            @Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -237,11 +240,13 @@ public class CMainTab extends CAbstractMainTab {
 		});
 		
 		fCoreTypeCombo.addSelectionListener(new SelectionListener() {
+            @Override
 			public void widgetSelected(SelectionEvent e) {
 				updateCoreFileLabel();
 				updateLaunchConfigurationDialog();
 			}
 
+            @Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});
@@ -268,6 +273,7 @@ public class CMainTab extends CAbstractMainTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+    @Override
 	public void initializeFrom(ILaunchConfiguration config) {
 		filterPlatform = getPlatform(config);
 		updateProjectFromConfig(config);
@@ -500,6 +506,7 @@ public class CMainTab extends CAbstractMainTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+    @Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
 		// We set empty attributes for project & program so that when one config is
 		// compared to another, the existence of empty attributes doesn't cause and
@@ -592,6 +599,7 @@ public class CMainTab extends CAbstractMainTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
 	 */
+    @Override
 	public String getName() {
 		return LaunchMessages.getString("CMainTab.Main"); //$NON-NLS-1$
 	}

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/CoreFilePrompter.java

@@ -34,6 +34,7 @@ public class CoreFilePrompter implements IStatusHandler {
 	 * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus,
 	 *      java.lang.Object)
 	 */
+    @Override
 	public Object handleStatus(IStatus status, Object params) throws CoreException {
 		final Shell shell = GdbUIPlugin.getShell();
 		if (shell == null) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GDBSolibBlock.java

@@ -54,6 +54,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC
 		fAutoSolib = autoSolib;
 	}
 
+    @Override
 	public void createControl( Composite parent ) {
 		Composite subComp = ControlFactory.createCompositeEx( parent, 1, GridData.FILL_HORIZONTAL );
 		((GridLayout)subComp.getLayout()).makeColumnsEqualWidth = false;
@@ -89,6 +90,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC
 		fControl = subComp;
 	}
 
+    @Override
 	public void initializeFrom( ILaunchConfiguration configuration ) {
 		if ( fSolibSearchPathBlock != null )
 			fSolibSearchPathBlock.initializeFrom( configuration );
@@ -104,6 +106,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC
 		}
 	}
 
+    @Override
 	public void performApply( ILaunchConfigurationWorkingCopy configuration ) {
 		if ( fSolibSearchPathBlock != null )
 			fSolibSearchPathBlock.performApply( configuration );
@@ -121,6 +124,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC
 		}
 	}
 
+    @Override
 	public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) {
 		if ( fSolibSearchPathBlock != null )
 			fSolibSearchPathBlock.setDefaults( configuration );
@@ -131,6 +135,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC
 	protected void updateButtons() {
 	}
 
+    @Override
 	public void dispose() {
 		deleteObservers();
 		if ( fSolibSearchPathBlock != null ) {
@@ -140,6 +145,7 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC
 		}
 	}
 
+    @Override
 	public void update( Observable o, Object arg ) {
 		changed();
 	}
@@ -161,10 +167,12 @@ public class GDBSolibBlock extends Observable implements IMILaunchConfigurationC
 		}
 	}
 
+    @Override
 	public Control getControl() {
 		return fControl;
 	}
 
+    @Override
 	public boolean isValid( ILaunchConfiguration launchConfig ) {
 		// TODO Auto-generated method stub
 		return false;

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbCoreDebuggerPage.java

@@ -53,6 +53,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 	private IMILaunchConfigurationComponent fSolibBlock;
 	private boolean fIsInitializing = false;
 
+    @Override
 	public void createControl(Composite parent) {
 		Composite comp = new Composite(parent, SWT.NONE);
 		comp.setLayout(new GridLayout());
@@ -64,6 +65,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 		setControl(parent);
 	}
 
+    @Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 		IPreferenceStore preferenceStore = GdbUIPlugin.getDefault().getPreferenceStore();
 		String defaultGdbCommand = preferenceStore.getString(IGdbDebugPreferenceConstants.PREF_DEFAULT_GDB_COMMAND);
@@ -88,6 +90,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 		return valid;
 	}
 
+    @Override
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		setInitializing(true);
 		IPreferenceStore preferenceStore = GdbUIPlugin.getDefault().getPreferenceStore();
@@ -114,6 +117,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 		setInitializing(false); 
 	}
 
+    @Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME, 
 				                   fGDBCommandText.getText().trim());
@@ -124,6 +128,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 			fSolibBlock.performApply(configuration);
 	}
 
+    @Override
 	public String getName() {
 		return LaunchUIMessages.getString("GDBDebuggerPage.tab_name"); //$NON-NLS-1$
 	}
@@ -149,6 +154,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 	 * 
 	 * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
 	 */
+    @Override
 	public void update(Observable o, Object arg) {
 		if (!isInitializing())
 			updateLaunchConfigurationDialog();
@@ -181,7 +187,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 		label.setLayoutData(gd);
 		fGDBCommandText = ControlFactory.createTextField(subComp, SWT.SINGLE | SWT.BORDER);
 		fGDBCommandText.addModifyListener(new ModifyListener() {
-
+            @Override
 			public void modifyText(ModifyEvent evt) {
 				if (!isInitializing())
 					updateLaunchConfigurationDialog();
@@ -218,7 +224,7 @@ public class GdbCoreDebuggerPage extends AbstractCDebuggerPage implements Observ
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		fGDBInitText.setLayoutData(gd);
 		fGDBInitText.addModifyListener(new ModifyListener() {
-
+            @Override
 			public void modifyText(ModifyEvent evt) {
 				if (!isInitializing())
 					updateLaunchConfigurationDialog();

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/GdbDebuggerPage.java

@@ -68,6 +68,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 	private IMILaunchConfigurationComponent fSolibBlock;
 	private boolean fIsInitializing = false;
 
+    @Override
 	public void createControl(Composite parent) {
 		Composite comp = new Composite(parent, SWT.NONE);
 		comp.setLayout(new GridLayout());
@@ -79,6 +80,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 		setControl(parent);
 	}
 
+    @Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 		IPreferenceStore preferenceStore = GdbUIPlugin.getDefault().getPreferenceStore();
 		configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME,
@@ -130,6 +132,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 		}
 	}
 
+    @Override
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		setInitializing(true);
 		IPreferenceStore preferenceStore = GdbUIPlugin.getDefault().getPreferenceStore();
@@ -194,6 +197,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 		return IGDBLaunchConfigurationConstants.DEBUGGER_TRACEPOINT_MODE_DEFAULT;
 	}
 
+    @Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME,
 				fGDBCommandText.getText().trim());
@@ -217,6 +221,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 			fSolibBlock.performApply(configuration);
 	}
 
+    @Override
 	public String getName() {
 		return LaunchUIMessages.getString("GDBDebuggerPage.tab_name"); //$NON-NLS-1$
 	}
@@ -242,6 +247,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 	 *
 	 * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
 	 */
+    @Override
 	public void update(Observable o, Object arg) {
 		if (!isInitializing())
 			updateLaunchConfigurationDialog();
@@ -274,7 +280,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 		label.setLayoutData(gd);
 		fGDBCommandText = ControlFactory.createTextField(subComp, SWT.SINGLE | SWT.BORDER);
 		fGDBCommandText.addModifyListener(new ModifyListener() {
-
+            @Override
 			public void modifyText(ModifyEvent evt) {
 				if (!isInitializing())
 					updateLaunchConfigurationDialog();
@@ -311,7 +317,7 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		fGDBInitText.setLayoutData(gd);
 		fGDBInitText.addModifyListener(new ModifyListener() {
-
+            @Override
 			public void modifyText(ModifyEvent evt) {
 				if (!isInitializing())
 					updateLaunchConfigurationDialog();
@@ -378,10 +384,12 @@ public class GdbDebuggerPage extends AbstractCDebuggerPage implements Observer {
 		fTracepointModeCombo.add(TP_AUTOMATIC);
 
 		fTracepointModeCombo.addSelectionListener(new SelectionListener() {
+            @Override
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
 			}
 
+            @Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompter.java

@@ -48,6 +48,7 @@ public class ProcessPrompter implements IStatusHandler {
 	 * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus,
 	 *      java.lang.Object)
 	 */
+    @Override
 	public Object handleStatus(IStatus status, Object info) throws CoreException {
 		Shell shell = GdbUIPlugin.getShell();
 		if (shell == null) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/ProcessPrompterDialog.java

@@ -103,6 +103,7 @@ public class ProcessPrompterDialog extends TwoPaneElementSelector {
     	
     	// Now add a listener to prevent selection
     	list.addListener(SWT.EraseItem, new Listener() {
+            @Override
     	    public void handleEvent(Event event) {
     	    	if ((event.detail & SWT.SELECTED) != 0) {
     	    		event.detail &= ~SWT.SELECTED;

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/SolibSearchPathBlock.java

@@ -269,6 +269,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+    @Override
 	public void createControl(Composite parent) {
 		fShell = parent.getShell();
 		Composite comp = ControlFactory.createCompositeEx(parent, 2, GridData.FILL_BOTH);
@@ -287,6 +288,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+    @Override
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		IProject project = null;
 		try {
@@ -340,6 +342,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+    @Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 		configuration.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, Collections.EMPTY_LIST);
 	}
@@ -347,6 +350,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+    @Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		if (fDirList != null) {
 			
@@ -410,6 +414,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#dispose()
 	 */
+    @Override
 	public void dispose() {
 		deleteObservers();
 	}
@@ -417,6 +422,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#getControl()
 	 */
+    @Override
 	public Control getControl() {
 		return fControl;
 	}
@@ -424,6 +430,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.internal.ui.IMILaunchConfigurationComponent#isValid(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+    @Override
 	public boolean isValid(ILaunchConfiguration launchConfig) {
 		// TODO Auto-generated method stub
 		return false;
@@ -459,31 +466,31 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 		final HashSet<IPath> libs = new HashSet<IPath>(10);
 		if (generateLibraryList(dirList.toArray(new IPath[dirList.size()]), libs)) {
 			ITreeContentProvider cp = new ITreeContentProvider() {
-	
+                @Override
 				public Object[] getChildren(Object parentElement) {
 					return getElements(parentElement);
 				}
-	
+                @Override
 				public Object getParent(Object element) {
 					if (libs.contains(element))
 						return libs;
 					return null;
 				}
-	
+                @Override
 				public boolean hasChildren(Object element) {
 					return false;
 				}
-	
+                @Override
 				public Object[] getElements(Object inputElement) {
 					if (inputElement instanceof Set) {
 						return ((Set)inputElement).toArray();
 					}
 					return new Object[0];
 				}
-	
+                @Override
 				public void dispose() {
 				}
-	
+                @Override
 				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 				}	
 			};
@@ -517,6 +524,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 		boolean result = true;
 
 		IRunnableWithProgress runnable = new IRunnableWithProgress() {
+            @Override
 			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 
 				for (int i = 0; i < paths.length; ++i) {
@@ -614,6 +622,7 @@ public class SolibSearchPathBlock extends Observable implements IMILaunchConfigu
 		return (name.indexOf(".so.") >= 0); //$NON-NLS-1$
 	}
 
+    @Override
 	public void dialogFieldChanged(DialogField field) {
 		setChanged();
 		notifyObservers();

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/launching/WorkingDirectoryBlock.java

@@ -71,6 +71,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab {
 	 */
 	private class WidgetListener extends SelectionAdapter implements ModifyListener {
 
+        @Override
 		public void modifyText(ModifyEvent e) {
 			updateLaunchConfigurationDialog();
 		}
@@ -97,6 +98,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+    @Override
 	public void createControl(Composite parent) {
 		Font font = parent.getFont();
 
@@ -305,6 +307,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+    @Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
 		//		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
 		// (String)null);
@@ -315,6 +318,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+    @Override
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		setLaunchConfiguration(configuration);
 		try {
@@ -338,6 +342,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+    @Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		String wd = null;
 		if (!isDefaultWorkingDirectory()) {
@@ -364,6 +369,7 @@ public class WorkingDirectoryBlock extends CLaunchConfigurationTab {
 	 * 
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
 	 */
+    @Override
 	public String getName() {
 		return LaunchUIMessages.getString("WorkingDirectoryBlock.Working_Directory_8"); //$NON-NLS-1$
 	}

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java

@@ -65,6 +65,7 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements
 		setDescription(MessagesForPreferences.GdbDebugPreferencePage_description);
 	}
 
+    @Override
 	public void init(IWorkbench workbench) {
 	}
 

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/CollectActionPage.java

@@ -51,13 +51,16 @@ public class CollectActionPage extends PlatformObject implements IBreakpointActi
 		return fCollectAction;
 	}
 
+    @Override
 	public void actionDialogCanceled() {
 	}
 
+    @Override
 	public void actionDialogOK() {
 		fCollectAction.setCollectString(fCollectString.getText());
 	}
 
+    @Override
 	public Composite createComposite(IBreakpointAction action, Composite composite, int style) {
 		fCollectAction = (CollectAction) action;
 		return createCollectActionComposite(composite, style);

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/EvaluateActionPage.java

@@ -52,13 +52,16 @@ public class EvaluateActionPage extends PlatformObject implements IBreakpointAct
 		return fEvalAction;
 	}
 
+    @Override
 	public void actionDialogCanceled() {
 	}
 
+    @Override
 	public void actionDialogOK() {
 		fEvalAction.setEvalString(fEvalString.getText());
 	}
 
+    @Override
 	public Composite createComposite(IBreakpointAction action, Composite composite, int style) {
 		fEvalAction = (EvaluateAction) action;
 		return createEvaluateActionComposite(composite, style);

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointActionsPreferencePage.java

@@ -61,6 +61,7 @@ public class TracepointActionsPreferencePage extends PreferencePage implements I
 	}
 
 
+    @Override
 	public void init(IWorkbench workbench) {
 	}
 

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/WhileSteppingActionPage.java

@@ -125,9 +125,11 @@ public class WhileSteppingActionPage extends PlatformObject implements IBreakpoi
 		return fWhileSteppingAction;
 	}
 
+    @Override
 	public void actionDialogCanceled() {
 	}
 
+    @Override
 	public void actionDialogOK() {
 		// Make sure we are dealing with an int
 		int count = 1;
@@ -141,6 +143,7 @@ public class WhileSteppingActionPage extends PlatformObject implements IBreakpoi
 		fWhileSteppingAction.setSubActionsContent(actionsList.getActionNames());
 	}
 
+    @Override
 	public Composite createComposite(IBreakpointAction action, Composite composite, int style) {
 		fWhileSteppingAction = (WhileSteppingAction)action;
 		return createWhileSteppingActionComposite(composite, style);

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceControlView.java

@@ -124,6 +124,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 		@Override
 		public void run() {
 			asyncExec(new Runnable() {
+                @Override
 				public void run() {
 					exitVisualizationMode();
 					updateActionEnablement();
@@ -152,6 +153,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 		super.init(site);
 		site.getPage().addSelectionListener(IDebugUIConstants.ID_DEBUG_VIEW, 
 				                            fDebugViewListener = new ISelectionListener() {
+            @Override
 			public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 				updateDebugContext();
 			}});
@@ -221,6 +223,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 			if (ctx != null) {
 				getSession().getExecutor().execute(
 						new DsfRunnable() {	
+			                @Override
 							public void run() {
 								final IGDBTraceControl traceControl = getService(IGDBTraceControl.class);
 								if (traceControl != null) {
@@ -247,6 +250,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 													
 													final String finalStatus = traceStatus;
 													asyncExec(new Runnable() {
+										                @Override
 														public void run() {
 															fStatusText.setText(finalStatus);
 															updateActionEnablement();
@@ -257,6 +261,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 									fTracingSupported = false;
 
 									asyncExec(new Runnable() {
+						                @Override
 										public void run() {
 											fStatusText.setText(EMPTY_STRING);
 											updateActionEnablement();
@@ -287,6 +292,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 		
 		getSession().getExecutor().execute(
 				new DsfRunnable() {	
+	                @Override
 					public void run() {
 						final IGDBTraceControl traceControl = getService(IGDBTraceControl.class);
 						if (traceControl != null) {
@@ -316,6 +322,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 					try {
 						final DsfSession session = getSession();
 						session.getExecutor().execute(new DsfRunnable() {
+			                @Override
 							public void run() {
 								session.removeServiceEventListener(TraceControlView.this);
 							}
@@ -336,6 +343,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 				try {
 					final DsfSession session = getSession();
 					session.getExecutor().execute(new DsfRunnable() {
+		                @Override
 						public void run() {
 							session.removeServiceEventListener(TraceControlView.this);
 						}
@@ -363,6 +371,7 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 			try {
 				final DsfSession session = getSession();
 				session.getExecutor().execute(new DsfRunnable() {
+	                @Override
 					public void run() {
 						session.addServiceEventListener(TraceControlView.this, null);
 					}
@@ -395,9 +404,11 @@ public class TraceControlView extends ViewPart implements IViewPart, SessionEnde
 		}
 	}
 
+    @Override
 	public void sessionEnded(DsfSession session) {
 		if (session.getId().equals(fDebugSessionId)) {
 			asyncExec(new Runnable() {
+                @Override
 				public void run() {
 					setDebugContext(null);
 				}});

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepoints/TraceVarDetailsDialog.java

@@ -168,6 +168,7 @@ public final class TraceVarDetailsDialog extends Dialog {
 		warningTextLabel = new Label(createButtonComposite, SWT.NONE);
 		warningTextLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		parent.addDisposeListener(new DisposeListener() {
+            @Override
 			public void widgetDisposed(DisposeEvent e) {
 				if (warningImage != null)
 					warningImage.dispose();
@@ -177,9 +178,11 @@ public final class TraceVarDetailsDialog extends Dialog {
 		// When the user goes into either input field, then pressing return
 		// should try to create the command
 		FocusListener clearWarningFocusListener = new FocusListener() {
+            @Override
 			public void focusGained(FocusEvent e) {
 				getShell().setDefaultButton(createButton);
 			}
+            @Override
 			public void focusLost(FocusEvent e) {
 			}
 		};
@@ -189,6 +192,7 @@ public final class TraceVarDetailsDialog extends Dialog {
 
 		// When the user modifies any entry in the input, we should clear any warning
 		ModifyListener clearWarningListener = new ModifyListener() {
+            @Override
 			public void modifyText(ModifyEvent e) {
 				setWarningVisible(false);
 			}

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbExpressionVMProvider.java

@@ -70,6 +70,7 @@ public class GdbExpressionVMProvider extends ExpressionVMProvider {
         }
 
         fPreferencesListener = new IPropertyChangeListener() {
+            @Override
 			public void propertyChange(final PropertyChangeEvent event) {
 				handlePropertyChanged(store, event);
 			}};
@@ -190,6 +191,7 @@ public class GdbExpressionVMProvider extends ExpressionVMProvider {
 							final FetchMoreChildrenEvent fetchMoreChildrenEvent = new FetchMoreChildrenEvent(
 									exprCtx, path);
             				getExecutor().execute(new DsfRunnable() {
+            	                @Override
             					public void run() {
             						handleEvent(fetchMoreChildrenEvent, rm);
             					}
@@ -225,6 +227,7 @@ public class GdbExpressionVMProvider extends ExpressionVMProvider {
 	        }
 	        
 			getExecutor().execute(new DsfRunnable() {
+                @Override
 			    public void run() {
 			        handleEvent(event);
 			    }

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMNode.java

@@ -108,10 +108,12 @@ public class GdbVariableVMNode extends VariableVMNode {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#getSize()
 		 */
+        @Override
 		public void getSize(final ICWatchpointTarget.GetSizeRequest request) {
 			final IExpressionDMContext exprDmc = DMContexts.getAncestorOfType(getDMContext(), IExpressionDMContext.class);
 			if (exprDmc != null) {
 	            getSession().getExecutor().execute(new Runnable() {
+	                @Override
 	                public void run() {
 	                    final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
 	                    if (expressionService != null) {
@@ -144,6 +146,7 @@ public class GdbVariableVMNode extends VariableVMNode {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.internal.core.IWatchpointTarget#canCreateWatchpoint(org.eclipse.cdt.debug.internal.core.IWatchpointTarget.CanCreateWatchpointRequest)
 		 */
+        @Override
 		public void canSetWatchpoint(final ICWatchpointTarget.CanCreateWatchpointRequest request) {
 			// If the expression is an l-value, then we say it supports a
 			// watchpoint. The logic here is basically the same as what's in
@@ -152,6 +155,7 @@ public class GdbVariableVMNode extends VariableVMNode {
 			final IExpressionDMContext exprDmc = DMContexts.getAncestorOfType(getDMContext(), IExpressionDMContext.class);
 			if (exprDmc != null) {
 	            getSession().getExecutor().execute(new Runnable() {
+	                @Override
 	                public void run() {
 	                    final IExpressions expressionService = getServicesTracker().getService(IExpressions.class);
 	                    if (expressionService != null) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/GdbVariableVMProvider.java

@@ -62,6 +62,7 @@ public class GdbVariableVMProvider extends VariableVMProvider {
         }
 
         fPreferencesListener = new IPropertyChangeListener() {
+            @Override
 			public void propertyChange(final PropertyChangeEvent event) {
 				handlePropertyChanged(store, event);
 			}};
@@ -127,6 +128,7 @@ public class GdbVariableVMProvider extends VariableVMProvider {
 							final FetchMoreChildrenEvent fetchMoreChildrenEvent = new FetchMoreChildrenEvent(
 									exprCtx, path);
             				getExecutor().execute(new DsfRunnable() {
+            	                @Override
             					public void run() {
             						handleEvent(fetchMoreChildrenEvent, rm);
             					}
@@ -162,6 +164,7 @@ public class GdbVariableVMProvider extends VariableVMProvider {
 	        }
 	        
 			getExecutor().execute(new DsfRunnable() {
+                @Override
 			    public void run() {
 			        handleEvent(event);
 			    }

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/breakpoints/GdbBreakpointVMProvider.java

@@ -104,6 +104,7 @@ public class GdbBreakpointVMProvider extends BreakpointVMProvider {
         
         try {
             fSession.getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     IBreakpointsExtension bpService = fServicesTracker.getService(IBreakpointsExtension.class);
                     if (bpService == null) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/commands/RetargetDebugContextCommand.java

@@ -59,6 +59,7 @@ abstract public class RetargetDebugContextCommand extends AbstractHandler implem
         update();
     }
 
+    @Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		fCommandId = event.getCommand().getId();
 		
@@ -137,6 +138,7 @@ abstract public class RetargetDebugContextCommand extends AbstractHandler implem
         fTargetAdapter = null;
     }
     
+    @Override
     public void debugContextChanged(DebugContextEvent event) {
         fDebugContext = event.getContext();
         update();

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ContainerVMNode.java

@@ -328,6 +328,7 @@ public class ContainerVMNode extends AbstractContainerVMNode
      */
     private final String MEMENTO_NAME = "CONTAINER_MEMENTO_NAME"; //$NON-NLS-1$
     
+    @Override
     public void compareElements(IElementCompareRequest[] requests) {
     	for (final IElementCompareRequest request : requests) {
 
@@ -347,6 +348,7 @@ public class ContainerVMNode extends AbstractContainerVMNode
     					if (procDmc != null) {
     						try {
     							getSession().getExecutor().execute(new DsfRunnable() {
+    				                @Override
     								public void run() {
     									final IProcesses processService = getServicesTracker().getService(IProcesses.class);
     									if (processService != null) {
@@ -384,6 +386,7 @@ public class ContainerVMNode extends AbstractContainerVMNode
      * (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) {
 
@@ -401,6 +404,7 @@ public class ContainerVMNode extends AbstractContainerVMNode
     				if (procDmc != null) {
     					try {
     						getSession().getExecutor().execute(new DsfRunnable() {
+    			                @Override
     							public void run() {
     								final IProcesses processService = getServicesTracker().getService(IProcesses.class);
     								if (processService != null) {

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/LaunchVMProvider.java

@@ -144,6 +144,7 @@ public class LaunchVMProvider extends AbstractLaunchVMProvider
         super.refresh();
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
+                @Override
                 public void run() {
                     DsfServicesTracker tracker = new DsfServicesTracker(GdbUIPlugin.getBundleContext(), getSession().getId());
                     IProcesses processesService = tracker.getService(IProcesses.class);

dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/viewmodel/launch/ThreadVMNode.java

@@ -287,6 +287,7 @@ public class ThreadVMNode extends AbstractThreadVMNode
     /*
      * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[])
      */
+    @Override
     public void compareElements(IElementCompareRequest[] requests) {
         
         for ( IElementCompareRequest request : requests ) {
@@ -314,6 +315,7 @@ public class ThreadVMNode extends AbstractThreadVMNode
     /*
      * @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 ( IElementMementoRequest request : requests ) {