Move some leftover plugins from Java 5 to Java 7.

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

build/org.eclipse.cdt.autotools.docs/.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

core/org.eclipse.cdt.alltests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

core/org.eclipse.cdt.alltests/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 #Fri Apr 25 15:24:03 EDT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -62,4 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

core/org.eclipse.cdt.alltests/META-INF/MANIFEST.MF

@@ -23,4 +23,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.debug.ui.tests
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

cross/org.eclipse.cdt.launch.remote/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="discouraged" pattern="**/internal/**"/>

cross/org.eclipse.cdt.launch.remote/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,8 @@
 #Tue Jun 01 14:51:21 MSD 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
@@ -68,4 +68,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF

@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.cdt.internal.launch.remote;x-internal:=true,
  org.eclipse.cdt.launch.remote;x-internal:=true,
  org.eclipse.cdt.launch.remote.launching;x-internal:=true,

dsf/org.eclipse.cdt.examples.dsf.pda.ui/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

dsf/org.eclipse.cdt.examples.dsf.pda.ui/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 #Tue Jun 24 11:03:46 PDT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -62,4 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF

@@ -24,5 +24,5 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda.ui,
  org.eclipse.cdt.examples.dsf.pda.ui.breakpoints,
  org.eclipse.cdt.examples.dsf.pda.ui.editor,
  org.eclipse.cdt.examples.dsf.pda.ui.launcher
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %providerName

dsf/org.eclipse.cdt.examples.dsf.pda/.classpath

@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="pdavm/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 #Tue Jun 24 11:03:29 PDT 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -67,4 +67,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF

@@ -19,6 +19,6 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda,
  org.eclipse.cdt.examples.dsf.pda.service,
  org.eclipse.cdt.examples.dsf.pda.service.commands,
  org.eclipse.cdt.examples.dsf.pda.sourcelookup
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %providerName
 Import-Package: com.ibm.icu.text

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDALineBreakpoint.java

@@ -52,6 +52,7 @@ public class PDALineBreakpoint extends LineBreakpoint {
 	 */
 	public PDALineBreakpoint(final IResource resource, final int lineNumber) throws CoreException {
 		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IMarker marker = resource.createMarker("org.eclipse.cdt.examples.dsf.pda.markerType.lineBreakpoint");
 				setMarker(marker);
@@ -67,6 +68,7 @@ public class PDALineBreakpoint extends LineBreakpoint {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.model.IBreakpoint#getModelIdentifier()
 	 */
+	@Override
 	public String getModelIdentifier() {
 		return PDAPlugin.ID_PDA_DEBUG_MODEL;
 	}

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDAWatchpoint.java

@@ -63,6 +63,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
 	 */
 	public PDAWatchpoint(final IResource resource, final int lineNumber, final String functionName, final String varName, final boolean access, final boolean modification) throws CoreException {
 		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IMarker marker = resource.createMarker("org.eclipse.cdt.examples.dsf.pda.markerType.watchpoint");
 				setMarker(marker);
@@ -81,6 +82,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IWatchpoint#isAccess()
      */
+    @Override
     public boolean isAccess() throws CoreException {
         return getMarker().getAttribute(ACCESS, true);
     }
@@ -88,6 +90,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IWatchpoint#setAccess(boolean)
      */
+    @Override
     public void setAccess(boolean access) throws CoreException {
         setAttribute(ACCESS, access);
     }
@@ -95,6 +98,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IWatchpoint#isModification()
      */
+    @Override
     public boolean isModification() throws CoreException {
         return getMarker().getAttribute(MODIFICATION, true);
     }
@@ -102,6 +106,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IWatchpoint#setModification(boolean)
      */
+    @Override
     public void setModification(boolean modification) throws CoreException {
         setAttribute(MODIFICATION, modification); 
     }
@@ -109,6 +114,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IWatchpoint#supportsAccess()
      */
+    @Override
     public boolean supportsAccess() {
         return true;
     }
@@ -116,6 +122,7 @@ public class PDAWatchpoint extends PDALineBreakpoint implements IWatchpoint {
     /* (non-Javadoc)
      * @see org.eclipse.debug.core.model.IWatchpoint#supportsModification()
      */
+    @Override
     public boolean supportsModification() {
         return true;
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java

@@ -80,6 +80,7 @@ public class PDALaunchDelegate extends LaunchConfigurationDelegate {
         return null;
     }
 
+    @Override
     public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
         String program = configuration.getAttribute(PDAPlugin.ATTR_PDA_PROGRAM, (String)null);
         if (program == null) {

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpointAttributeTranslator.java

@@ -67,10 +67,12 @@ public class PDABreakpointAttributeTranslator implements IBreakpointAttributeTra
 
     // PDA breakpoints translator doesn't keep any state and it doesn't 
     // need to initialize or clean up.
+    @Override
     public void initialize(BreakpointsMediator2 mediator) {
     }
 
 
+    @Override
     public void dispose() {
     }
 
@@ -208,6 +210,7 @@ public class PDABreakpointAttributeTranslator implements IBreakpointAttributeTra
         }
     }
 
+    @Override
     public boolean canUpdateAttributes(IBreakpoint bp, IBreakpointsTargetDMContext context, 
         Map<String, Object> attributes) 
     {
@@ -222,11 +225,13 @@ public class PDABreakpointAttributeTranslator implements IBreakpointAttributeTra
         return false;
     }
 
+    @Override
     public boolean supportsBreakpoint(IBreakpoint bp) {
         return bp.getModelIdentifier().equals(PDAPlugin.ID_PDA_DEBUG_MODEL) ||
             bp instanceof ICLineBreakpoint || bp instanceof ICWatchpoint;
     }
 
+    @Override
     public void updateBreakpointsStatus(
         Map<IBreakpoint, Map<IBreakpointsTargetDMContext, ITargetBreakpointInfo[]>> bpsInfo,
         BreakpointEventType eventType) 
@@ -251,6 +256,7 @@ public class PDABreakpointAttributeTranslator implements IBreakpointAttributeTra
         }
     }
 
+    @Override
     public void resolveBreakpoint(IBreakpointsTargetDMContext context, IBreakpoint breakpoint,
         Map<String, Object> bpAttributes, DataRequestMonitor<List<Map<String, Object>>> drm) 
     {
@@ -262,6 +268,7 @@ public class PDABreakpointAttributeTranslator implements IBreakpointAttributeTra
         drm.done();
     }
 
+    @Override
     public Map<String, Object> getAllBreakpointAttributes(IBreakpoint platformBP, boolean bpManagerEnabled)
         throws CoreException 
     {
@@ -272,6 +279,7 @@ public class PDABreakpointAttributeTranslator implements IBreakpointAttributeTra
         return marker.getAttributes();
     }
 
+    @Override
     public Map<String, Object> convertAttributes(Map<String, Object> platformBPAttr) {
         return platformBPAttr;
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpoints.java

@@ -162,6 +162,7 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
         return PDAPlugin.getBundleContext();
     }
 
+    @Override
     public void getBreakpoints(final IBreakpointsTargetDMContext context, final DataRequestMonitor<IBreakpointDMContext[]> rm) {
         // Validate the context
         if (!fCommandControl.getContext().equals(context)) {
@@ -173,10 +174,12 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
         rm.done();
     }
 
+    @Override
     public void getBreakpointDMData(IBreakpointDMContext dmc, DataRequestMonitor<IBreakpointDMData> rm) {
         PDAPlugin.failRequest(rm, NOT_SUPPORTED, "Retrieving breakpoint data is not supported");
     }
 
+    @Override
     public void insertBreakpoint(IBreakpointsTargetDMContext context, Map<String, Object> attributes, 
         DataRequestMonitor<IBreakpointDMContext> rm) 
     {
@@ -328,6 +331,7 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
             });
     }
 
+    @Override
     public void removeBreakpoint(IBreakpointDMContext bpCtx, RequestMonitor rm) {
         if (!fBreakpoints.contains(bpCtx)) {
             PDAPlugin.failRequest(rm, REQUEST_FAILED, "Breakpoint already removed");
@@ -364,6 +368,7 @@ public class PDABreakpoints extends AbstractDsfService implements IBreakpoints
                 new DataRequestMonitor<PDACommandResult>(getExecutor(), rm));        
     }
 
+    @Override
     public void updateBreakpoint(final IBreakpointDMContext bpCtx, Map<String, Object> attributes, final RequestMonitor rm) {
         if (!fBreakpoints.contains(bpCtx)) {
             PDAPlugin.failRequest(rm, REQUEST_FAILED, "Breakpoint not installed");

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDACommandControl.java

@@ -131,7 +131,8 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
 
         // Add a listener for PDA events to track the started/terminated state.
         addEventListener(new IEventListener() {
-            public void eventReceived(Object output) {
+            @Override
+	    public void eventReceived(Object output) {
                 if ("started 1".equals(output)) {
                     setStarted();
                 } else if ("terminated".equals(output)) {
@@ -222,7 +223,8 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
                             // Process the reply in the executor thread.
                             try {
                                 getExecutor().execute(new DsfRunnable() {
-                                    public void run() {
+                                    @Override
+				    public void run() {
                                         processCommandDone(commandHandle, response);
                                     }
                                 });
@@ -238,7 +240,8 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
                             // Process error it in the executor thread
                             try {
                                 getExecutor().execute(new DsfRunnable() {
-                                    public void run() {
+                                    @Override
+				    public void run() {
                                         processCommandException(commandHandle, e);
                                     }
                                 });
@@ -278,7 +281,8 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
                         try {
                             // Process the event in executor thread.
                             getExecutor().execute(new DsfRunnable() {
-                                public void run() {
+                                @Override
+				public void run() {
                                     processEventReceived(event);
                                 }
                             });
@@ -295,7 +299,8 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
                 // has exited.  Call setTerminated() in executor thread.
                 try {
                     getExecutor().execute(new DsfRunnable() {
-                        public void run() {
+                        @Override
+			public void run() {
                             setTerminated();
                         }
                     });
@@ -306,9 +311,11 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
         
     }
     
+    @Override
     public <V extends ICommandResult> ICommandToken queueCommand(final ICommand<V> command, DataRequestMonitor<V> rm) {
         ICommandToken token = new ICommandToken() {
-            public ICommand<?> getCommand() {
+            @Override
+	    public ICommand<?> getCommand() {
                 return command;
             }
         };
@@ -332,7 +339,8 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
             // In a separate dispatch cycle.  This allows command listeners to respond to the 
             // command queued event.  
             getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+		public void run() {
                     processQueues();
                 }
             });
@@ -342,6 +350,7 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
         return token;
     }
 
+    @Override
     public void removeCommand(ICommandToken token) {
         // Removes given command from the queue and notify the listeners
         for (Iterator<CommandHandle> itr = fCommandQueue.iterator(); itr.hasNext();) {
@@ -355,18 +364,22 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
         }
     }
     
+    @Override
     public void addCommandListener(ICommandListener processor) { 
         fCommandListeners.add(processor); 
     }
     
+    @Override
     public void removeCommandListener(ICommandListener processor) { 
         fCommandListeners.remove(processor); 
     }
     
+    @Override
     public void addEventListener(IEventListener processor) { 
         fEventListeners.add(processor); 
     }
     
+    @Override
     public void removeEventListener(IEventListener processor) { 
         fEventListeners.remove(processor); 
     }
@@ -456,11 +469,13 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
      * Return the PDA Debugger top-level Data Model context. 
      * @see PDAVirtualMachineDMContext
      */
+    @Override
     @ThreadSafe
     public PDAVirtualMachineDMContext getContext() {
         return fDMContext;
     }
 
+    @Override
     public String getId() {
         return fBackend.getPorgramName();
     }
@@ -479,6 +494,7 @@ public class PDACommandControl extends AbstractDsfService implements ICommandCon
     /**
      * Returns whether the PDA debugger has started and is processing commands.
      */
+    @Override
     public boolean isActive() {
         return fStarted && !isTerminated();
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java

@@ -56,7 +56,8 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
             fExpression = expressin;
         }
 
-        public String getExpression() { 
+        @Override
+	public String getExpression() { 
             return fExpression;
         }
         
@@ -89,31 +90,38 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
             fExpression = expression;
         }
         
-        public BasicType getBasicType() {
+        @Override
+	public BasicType getBasicType() {
             return BasicType.basic;
         }
 
-        public String getEncoding() {
+        @Override
+	public String getEncoding() {
             return null;
         }
 
-        public Map<String, Integer> getEnumerations() {
+        @Override
+	public Map<String, Integer> getEnumerations() {
             return null;
         }
 
-        public String getName() {
+        @Override
+	public String getName() {
             return fExpression;
         }
 
-        public IRegisterDMContext getRegister() {
+        @Override
+	public IRegisterDMContext getRegister() {
             return null;
         }
 
-        public String getTypeId() {
+        @Override
+	public String getTypeId() {
             return null;
         }
 
-        public String getTypeName() {
+        @Override
+	public String getTypeName() {
             return null;
         }
 
@@ -147,7 +155,8 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
             return baseToString() + ".invalid_expr[" + fExpression + "]"; 
         }
     
-        public String getExpression() {
+        @Override
+	public String getExpression() {
             return fExpression;
         }
     }
@@ -206,11 +215,13 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
         super.shutdown(rm);
     }
 
+    @Override
     public void canWriteExpression(IExpressionDMContext expressionContext, DataRequestMonitor<Boolean> rm) {
         rm.setData(true);
         rm.done();
     }
 
+    @Override
     public IExpressionDMContext createExpression(IDMContext ctx, String expression) {
         // Create an expression based on the given context and string expression.  
         PDAThreadDMContext threadCtx = DMContexts.getAncestorOfType(ctx, PDAThreadDMContext.class);
@@ -232,14 +243,17 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
         return new InvalidExpressionDMContext(getSession().getId(), ctx, expression);
     }
 
+    @Override
     public void getBaseExpressions(IExpressionDMContext exprContext, DataRequestMonitor<IExpressionDMContext[]> rm) {
         PDAPlugin.failRequest(rm, NOT_SUPPORTED, "Not supported");
     }
 
+    @Override
     public void getExpressionAddressData(IExpressionDMContext dmc, DataRequestMonitor<IExpressionDMAddress> rm) {
         PDAPlugin.failRequest(rm, NOT_SUPPORTED, "Not supported");
     }
 
+    @Override
     public void getExpressionData(final IExpressionDMContext exprCtx, final DataRequestMonitor<IExpressionDMData> rm) {
         // Since expression data doesn't contain any more information than the 
         // context, it doesn't require any debugger commmands.
@@ -251,6 +265,7 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
         }
     }
 
+    @Override
     public void getSubExpressionCount(final IExpressionDMContext exprCtx, final DataRequestMonitor<Integer> rm) {
         if (exprCtx instanceof ExpressionDMContext) {
             final PDAThreadDMContext threadCtx = DMContexts.getAncestorOfType(exprCtx, PDAThreadDMContext.class);
@@ -283,10 +298,12 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
         }
     }
 
+    @Override
     public void getSubExpressions(IExpressionDMContext exprCtx, DataRequestMonitor<IExpressionDMContext[]> rm) {
         getSubExpressions(exprCtx, -1, -1, rm);
     }
 
+    @Override
     public void getSubExpressions(final IExpressionDMContext exprCtx, final int startIndexArg, final int lengthArg,
         final DataRequestMonitor<IExpressionDMContext[]> rm) 
     {
@@ -328,6 +345,7 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
         }
     }
 
+    @Override
     public void getAvailableFormats(IFormattedDataDMContext dmc, final DataRequestMonitor<String[]> rm) {
         getFormattedExpressionValue(
             new FormattedValueDMContext(this, dmc, NATURAL_FORMAT),
@@ -352,11 +370,13 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
             });
     }
 
+    @Override
     public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext exprCtx, String formatId) {
         // Creates a context that can be used to retrieve a formatted value.
         return new FormattedValueDMContext(this, exprCtx, formatId);
     }
 
+    @Override
     public void getFormattedExpressionValue(FormattedValueDMContext formattedCtx, 
         final DataRequestMonitor<FormattedValueDMData> rm) 
     {
@@ -436,6 +456,7 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
     }
 
     
+    @Override
     public void writeExpression(final IExpressionDMContext exprCtx, final String exprValue, String formatId, 
         final RequestMonitor rm) 
     {
@@ -535,6 +556,7 @@ public class PDAExpressions extends AbstractDsfService implements ICachingServic
         fCommandCache.reset(DMContexts.getAncestorOfType(e.getDMContext(), PDAThreadDMContext.class));
     }    
 
+    @Override
     public void flushCache(IDMContext context) {
         fCommandCache.reset(context);
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java

@@ -127,8 +127,10 @@ public class PDARegisters extends AbstractDsfService
         public RegisterGroupDMData(String name) {
             fName = name;
         }
-        public String getName() { return fName; }
+        @Override
-        public String getDescription() { return "Description of the " + fName + " register group"; }
+	public String getName() { return fName; }
+        @Override
+	public String getDescription() { return "Description of the " + fName + " register group"; }
     }
     
     private static class RegisterDMData implements IRegisterDMData {
@@ -139,16 +141,25 @@ public class PDARegisters extends AbstractDsfService
             fRegister = reg;
         }
         
-        public boolean isReadable() { return true; }
+        @Override
-        public boolean isReadOnce() { return false; }
+	public boolean isReadable() { return true; }
-        public boolean isWriteable() { return fRegister.fWritable; }
+        @Override
-        public boolean isWriteOnce() { return false; }
+	public boolean isReadOnce() { return false; }
-        public boolean hasSideEffects() { return false; }
+        @Override
-        public boolean isVolatile() { return true; }
+	public boolean isWriteable() { return fRegister.fWritable; }
+        @Override
+	public boolean isWriteOnce() { return false; }
+        @Override
+	public boolean hasSideEffects() { return false; }
+        @Override
+	public boolean isVolatile() { return true; }
 
-        public boolean isFloat() { return false; }
+        @Override
-        public String getName() { return fRegister.fName; }
+	public boolean isFloat() { return false; }
-        public String getDescription() { return "Description of the " + fRegister.fName + " register"; }
+        @Override
+	public String getName() { return fRegister.fName; }
+        @Override
+	public String getDescription() { return "Description of the " + fRegister.fName + " register"; }
     }
     
     private static class Mnemonic implements IMnemonic {
@@ -161,8 +172,10 @@ public class PDARegisters extends AbstractDsfService
         final private BigInteger fValue;
         final private int fNumBits;
         
-        public String getShortName() { return fName; }
+        @Override
-        public String getLongName()  { return fName; }
+	public String getShortName() { return fName; }
+        @Override
+	public String getLongName()  { return fName; }
         
         public BigInteger getValue() { return fValue; }
         public int getBitCount() { return fNumBits; }
@@ -193,8 +206,10 @@ public class PDARegisters extends AbstractDsfService
             
             fBitGroups = new IBitGroup[] { 
                 new IBitGroup() {
-                    public int startBit() { return fBitField.fOffset; }
+                    @Override
-                    public int bitCount() { return fBitField.fCount; }
+		    public int startBit() { return fBitField.fOffset; }
+                    @Override
+		    public int bitCount() { return fBitField.fCount; }
                 }
             };
 
@@ -212,22 +227,34 @@ public class PDARegisters extends AbstractDsfService
         }
         
         
-        public IBitGroup[] getBitGroup()      { return fBitGroups;  }
+        @Override
-        public IMnemonic[] getMnemonics()     { return fMnemonics;  }
+	public IBitGroup[] getBitGroup()      { return fBitGroups;  }
+        @Override
+	public IMnemonic[] getMnemonics()     { return fMnemonics;  }
         
-        public boolean isZeroBasedNumbering() { return true; }
+        @Override
-        public boolean isZeroBitLeftMost()    { return true; }
+	public boolean isZeroBasedNumbering() { return true; }
-        public boolean isReadable()           { return true; }
+        @Override
-        public boolean isReadOnce()           { return false; }
+	public boolean isZeroBitLeftMost()    { return true; }
-        public boolean isWriteable()          { return true; }
+        @Override
-        public boolean isWriteOnce()          { return false; }
+	public boolean isReadable()           { return true; }
-        public boolean hasSideEffects()       { return false; }
+        @Override
+	public boolean isReadOnce()           { return false; }
+        @Override
+	public boolean isWriteable()          { return true; }
+        @Override
+	public boolean isWriteOnce()          { return false; }
+        @Override
+	public boolean hasSideEffects()       { return false; }
         public boolean isFloat()              { return false; }
         
-        public String  getName()         { return fBitField.fName; }
+        @Override
-        public String  getDescription()  { return "Description of the " + fBitField.fName + " bit field"; }
+	public String  getName()         { return fBitField.fName; }
+        @Override
+	public String  getDescription()  { return "Description of the " + fBitField.fName + " bit field"; }
 
-        public IMnemonic getCurrentMnemonicValue() { return fMnemonicValue; }
+        @Override
+	public IMnemonic getCurrentMnemonicValue() { return fMnemonicValue; }
     }
     
     private static class RegisterChangedDMEvent extends AbstractDMEvent<IRegisterDMContext> implements IRegisterChangedDMEvent {
@@ -296,6 +323,7 @@ public class PDARegisters extends AbstractDsfService
         super.shutdown(requestMonitor);
     }
     
+    @Override
     public void getRegisterGroups(IDMContext ctx, final DataRequestMonitor<IRegisterGroupDMContext[]> rm ) {
     	final PDAVirtualMachineDMContext dmc = DMContexts.getAncestorOfType(ctx, PDAVirtualMachineDMContext.class);
         if (dmc == null) {
@@ -318,6 +346,7 @@ public class PDARegisters extends AbstractDsfService
             }); 
     }
     
+    @Override
     public void getRegisters(final IDMContext ctx, final DataRequestMonitor<IRegisterDMContext[]> rm) {
         final PDAThreadDMContext execDmc = DMContexts.getAncestorOfType(ctx, PDAThreadDMContext.class);
         if ( execDmc == null ) { 
@@ -347,6 +376,7 @@ public class PDARegisters extends AbstractDsfService
         
     }
     
+    @Override
     public void getBitFields( IDMContext dmc , DataRequestMonitor<IBitFieldDMContext[]> rm ) {
     	
     	RegisterDMContext registerDmc = DMContexts.getAncestorOfType(dmc, RegisterDMContext.class);
@@ -367,6 +397,7 @@ public class PDARegisters extends AbstractDsfService
         rm.done();
     }
 
+    @Override
     public void writeRegister(final IRegisterDMContext regCtx, String regValue, String formatId, final RequestMonitor rm) {
         if (regCtx instanceof RegisterDMContext) {
             IExpressionDMContext exprCtx = createRegisterExpressionDmc( (RegisterDMContext)regCtx );
@@ -386,6 +417,7 @@ public class PDARegisters extends AbstractDsfService
         
     }
 
+    @Override
     public void writeBitField(final IBitFieldDMContext bitFieldCtx, String bitFieldValue, String formatId, final RequestMonitor rm) {
         if (bitFieldCtx instanceof BitFieldDMContext) {
             IExpressionDMContext exprCtx = createBitFieldExpressionDmc( (BitFieldDMContext)bitFieldCtx );
@@ -404,6 +436,7 @@ public class PDARegisters extends AbstractDsfService
         }
     }
     
+    @Override
     public void writeBitField(IBitFieldDMContext bitFieldCtx, IMnemonic mnemonic, RequestMonitor rm) {
         if (mnemonic instanceof Mnemonic) {
             writeBitField(bitFieldCtx, ((Mnemonic)mnemonic).fValue.toString(), NATURAL_FORMAT, rm);
@@ -412,6 +445,7 @@ public class PDARegisters extends AbstractDsfService
         }
     }
 
+    @Override
     public void getAvailableFormats(IFormattedDataDMContext dmc, DataRequestMonitor<String[]> rm) {
         IExpressionDMContext exprCtx = null;
         if ( dmc instanceof RegisterDMContext ) {
@@ -426,6 +460,7 @@ public class PDARegisters extends AbstractDsfService
         }
     }
 
+    @Override
     public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext dmc, String formatId) {
         IExpressionDMContext exprCtx = null;
         if ( dmc instanceof RegisterDMContext ) {
@@ -440,22 +475,27 @@ public class PDARegisters extends AbstractDsfService
         }
     }
 
+    @Override
     public void findRegisterGroup(IDMContext ctx, String name, DataRequestMonitor<IRegisterGroupDMContext> rm) {
         PDAPlugin.failRequest(rm, NOT_SUPPORTED, "Finding context not supported"); //$NON-NLS-1$
     }
     
+    @Override
     public void findRegister(IDMContext ctx, String name, DataRequestMonitor<IRegisterDMContext> rm) {
         PDAPlugin.failRequest(rm, NOT_SUPPORTED, "Finding context not supported"); //$NON-NLS-1$
     }
 
+    @Override
     public void findBitField(IDMContext ctx, String name, DataRequestMonitor<IBitFieldDMContext> rm) {
         PDAPlugin.failRequest(rm, NOT_SUPPORTED, "Finding context not supported"); //$NON-NLS-1$
     }
     
+    @Override
     public void getFormattedExpressionValue(FormattedValueDMContext dmc, DataRequestMonitor<FormattedValueDMData> rm) {
         fExpressions.getFormattedExpressionValue(dmc, rm);
     }
     
+    @Override
     public void getRegisterGroupData(IRegisterGroupDMContext regGroupDmc, DataRequestMonitor<IRegisterGroupDMData> rm) {
         if (regGroupDmc instanceof RegisterGroupDMContext) {
             rm.setData(new RegisterGroupDMData( ((RegisterGroupDMContext)regGroupDmc).fName ));
@@ -465,6 +505,7 @@ public class PDARegisters extends AbstractDsfService
         }
     }
 
+    @Override
     public void getRegisterData(IRegisterDMContext regDmc , DataRequestMonitor<IRegisterDMData> rm) {
         if (regDmc instanceof RegisterDMContext) {
             rm.setData(new RegisterDMData( ((RegisterDMContext)regDmc).fRegister ));
@@ -474,6 +515,7 @@ public class PDARegisters extends AbstractDsfService
         }
     }
     
+    @Override
     public void getBitFieldData(IBitFieldDMContext dmc, final DataRequestMonitor<IBitFieldDMData> rm) {
         if ( !(dmc instanceof BitFieldDMContext) ) {
             PDAPlugin.failRequest(rm, INVALID_HANDLE, "Invalid context");  //$NON-NLS-1$
@@ -521,6 +563,7 @@ public class PDARegisters extends AbstractDsfService
         getSession().dispatchEvent(new RegisterChangedDMEvent(dmc), getProperties());
     }
 
+    @Override
     public void eventReceived(Object output) {
         if (!(output instanceof String)) return;
         if ("registers".equals(output)) {
@@ -528,6 +571,7 @@ public class PDARegisters extends AbstractDsfService
         }
     }
     
+    @Override
     public void flushCache(IDMContext context) {
         fExpressions.flushCache(context);
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java

@@ -76,7 +76,8 @@ public class PDARunControl extends AbstractDsfService
             fReason = reason;
         }
         
-        public StateChangeReason getReason() {
+        @Override
+	public StateChangeReason getReason() {
             return fReason;
         }
         
@@ -97,11 +98,13 @@ public class PDARunControl extends AbstractDsfService
             fReason = reason;
         }
 
-        public StateChangeReason getReason() {
+        @Override
+	public StateChangeReason getReason() {
             return fReason;
         }
 
-        public IExecutionDMContext[] getTriggeringContexts() {
+        @Override
+	public IExecutionDMContext[] getTriggeringContexts() {
             return EMPTY_TRIGGERING_CONTEXTS_ARRAY;
         }
         
@@ -122,7 +125,8 @@ public class PDARunControl extends AbstractDsfService
             fReason = reason;
         }
         
-        public StateChangeReason getReason() {
+        @Override
+	public StateChangeReason getReason() {
             return fReason;
         }
 
@@ -150,11 +154,13 @@ public class PDARunControl extends AbstractDsfService
             }
         }
     
-        public StateChangeReason getReason() {
+        @Override
+	public StateChangeReason getReason() {
             return fReason;
         }
 
-        public IExecutionDMContext[] getTriggeringContexts() {
+        @Override
+	public IExecutionDMContext[] getTriggeringContexts() {
             return fTriggeringThreads;
         }
 
@@ -174,7 +180,8 @@ public class PDARunControl extends AbstractDsfService
         ExecutionDMData(StateChangeReason reason) {
             fReason = reason;
         }
-        public StateChangeReason getStateChangeReason() { return fReason; }
+        @Override
+	public StateChangeReason getStateChangeReason() { return fReason; }
     }
     
     private static class ThreadStartedEvent extends AbstractDMEvent<IExecutionDMContext> 
@@ -285,6 +292,7 @@ public class PDARunControl extends AbstractDsfService
         super.shutdown(rm);
     }
     
+    @Override
     public void eventReceived(Object output) {
         if (!(output instanceof String)) return;
         String event = (String)output;
@@ -421,6 +429,7 @@ public class PDARunControl extends AbstractDsfService
         fThreads.remove(threadCtx.getID());
     }    
     
+    @Override
     public void canResume(IExecutionDMContext context, DataRequestMonitor<Boolean> rm) {
         rm.setData(doCanResume(context));
         rm.done();
@@ -457,6 +466,7 @@ public class PDARunControl extends AbstractDsfService
         return false;        
     }
 
+    @Override
     public void canSuspend(IExecutionDMContext context, DataRequestMonitor<Boolean> rm) {
         rm.setData(doCanSuspend(context));
         rm.done();
@@ -478,6 +488,7 @@ public class PDARunControl extends AbstractDsfService
         return false;
     }
 
+	@Override
 	public boolean isSuspended(IExecutionDMContext context) {
         if (context instanceof PDAThreadDMContext) {
             PDAThreadDMContext threadContext = (PDAThreadDMContext)context; 
@@ -492,6 +503,7 @@ public class PDARunControl extends AbstractDsfService
 		return fVMSuspended;
 	}
 
+	@Override
 	public boolean isStepping(IExecutionDMContext context) {
 	    if (!isSuspended(context)) {
             if (context instanceof PDAThreadDMContext) {
@@ -509,6 +521,7 @@ public class PDARunControl extends AbstractDsfService
 	    return false;
     }
 
+	@Override
 	public void resume(IExecutionDMContext context, final RequestMonitor rm) {
 		assert context != null;
 
@@ -547,6 +560,7 @@ public class PDARunControl extends AbstractDsfService
         }
 	}
 	
+	@Override
 	public void suspend(IExecutionDMContext context, final RequestMonitor rm){
 		assert context != null;
 
@@ -585,11 +599,13 @@ public class PDARunControl extends AbstractDsfService
         }
     }
     
+    @Override
     public void canStep(IExecutionDMContext context, StepType stepType, DataRequestMonitor<Boolean> rm) {
         rm.setData(doCanStep(context, stepType));
         rm.done();
     }
     
+    @Override
     public void step(IExecutionDMContext context, StepType stepType, final RequestMonitor rm) {
     	assert context != null;
     	
@@ -633,6 +649,7 @@ public class PDARunControl extends AbstractDsfService
         }
     }
 
+    @Override
     public void getExecutionContexts(final IContainerDMContext containerDmc, final DataRequestMonitor<IExecutionDMContext[]> rm) {
         IExecutionDMContext[] threads = new IExecutionDMContext[fThreads.size()];
         int i = 0;
@@ -643,6 +660,7 @@ public class PDARunControl extends AbstractDsfService
         rm.done();
     }
     
+	@Override
 	public void getExecutionData(IExecutionDMContext dmc, DataRequestMonitor<IExecutionDMData> rm) {
 	    if (dmc instanceof PDAThreadDMContext) {
 	        ThreadInfo info = fThreads.get(((PDAThreadDMContext)dmc).getID());

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java

@@ -67,7 +67,8 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
             fLevel = level;
         }
 
-        public int getLevel() { return fLevel; }
+        @Override
+	public int getLevel() { return fLevel; }
 
         @Override
         public boolean equals(Object other) {
@@ -97,26 +98,32 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
             fFrame = frame;
         }
 
-        public String getFile() {
+        @Override
+	public String getFile() {
             return fFrame.fFilePath.lastSegment();
         }
 
-        public String getFunction() {
+        @Override
+	public String getFunction() {
             return fFrame.fFunction;
         }
 
-        public int getLine() {
+        @Override
+	public int getLine() {
             return fFrame.fLine + 1;
         }
 
-        public int getColumn() {
+        @Override
+	public int getColumn() {
             return 0;
         }
 
-        public IAddress getAddress() {
+        @Override
+	public IAddress getAddress() {
             return null;
         }
 
+		@Override
 		public String getModule() {
 			return "";//$NON-NLS-1$
 		}
@@ -165,11 +172,13 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
             fVariable = variable;
         }
 
-        public String getName() {
+        @Override
+	public String getName() {
             return fVariable;
         }
 
-        public String getValue() {
+        @Override
+	public String getValue() {
             return null;
         }
     }
@@ -226,10 +235,12 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
     }
 
 
+    @Override
     public void getArguments(IFrameDMContext frameCtx, DataRequestMonitor<IVariableDMContext[]> rm) {
         PDAPlugin.failRequest(rm, IDsfStatusConstants.NOT_SUPPORTED, "PDA debugger does not support function arguments.");
     }
 
+    @Override
     public void getFrameData(final IFrameDMContext frameCtx, final DataRequestMonitor<IFrameDMData> rm) {
         final PDAThreadDMContext threadCtx = 
             DMContexts.getAncestorOfType(frameCtx, PDAThreadDMContext.class);
@@ -269,6 +280,7 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
     }
 
 
+    @Override
     public void getFrames(IDMContext context, final DataRequestMonitor<IFrameDMContext[]> rm) {
         // Can only create stack frames for an execution context as a parent, 
         // however the argument context is a generic context type, so it could 
@@ -299,6 +311,7 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
             });
     }
 
+    @Override
     public void getFrames(IDMContext context, final int startIndex, final int endIndex, final DataRequestMonitor<IFrameDMContext[]> rm) {
         // Validate index range.
         assert startIndex >=0 && (endIndex < 0 || startIndex <= endIndex);
@@ -331,6 +344,7 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
             });
     }
     
+    @Override
     public void getLocals(IFrameDMContext context, final DataRequestMonitor<IVariableDMContext[]> rm) {
         if (!(context instanceof FrameDMContext)) {
             rm.setStatus(new Status(IStatus.ERROR, PDAPlugin.PLUGIN_ID, INVALID_HANDLE, "Invalid context" + context, null));
@@ -373,6 +387,7 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
 
     }
 
+    @Override
     public void getStackDepth(IDMContext context, final int maxDepth, final DataRequestMonitor<Integer> rm) {
         final PDAThreadDMContext threadCtx = 
             DMContexts.getAncestorOfType(context, PDAThreadDMContext.class);
@@ -399,6 +414,7 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
             });
     }
 
+    @Override
     public void getTopFrame(IDMContext context, final DataRequestMonitor<IFrameDMContext> rm) {
         // Can only create stack frames for an execution context as a parent, 
         // however the argument context is a generic context type, so it could 
@@ -416,6 +432,7 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
         rm.done();
     }
 
+    @Override
     public void getVariableData(IVariableDMContext variableCtx, DataRequestMonitor<IVariableDMData> rm) {
         if ( !(variableCtx instanceof VariableDMContext) ) {
             PDAPlugin.failRequest(rm, IDsfStatusConstants.INVALID_HANDLE, "Invalid context " + variableCtx);
@@ -461,6 +478,7 @@ public class PDAStack extends AbstractDsfService implements IStack, ICachingServ
         fCommandCache.reset(e.getDMContext());
     }
 
+	@Override
 	public void flushCache(IDMContext context) {
         fCommandCache.reset(context);	
 	}

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAVirtualMachineDMContext.java

@@ -51,6 +51,7 @@ public class PDAVirtualMachineDMContext extends PlatformObject
         fProgram = program;
     }
 
+    @Override
     public String getSessionId() {
         return fSessionId;
     }
@@ -59,6 +60,7 @@ public class PDAVirtualMachineDMContext extends PlatformObject
         return fProgram;
     }
     
+    @Override
     public IDMContext[] getParents() {
         return EMPTY_PARENTS_ARRAY;
     }
@@ -68,6 +70,7 @@ public class PDAVirtualMachineDMContext extends PlatformObject
         return "pda[" + getSessionId() + "]";
     }
 
+    @Override
     public String getCommandControlId() {
         return getProgram();
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/AbstractPDACommand.java

@@ -31,10 +31,12 @@ abstract public class AbstractPDACommand<V extends PDACommandResult> implements
         fRequest = request;
     }
     
+    @Override
     public IDMContext getContext() {
         return fContext;
     }
     
+    @Override
     public ICommand<? extends ICommandResult> coalesceWith(ICommand<? extends ICommandResult> command) {
         return null;
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDACommandResult.java

@@ -29,6 +29,7 @@ public class PDACommandResult implements ICommandResult {
         fResponseText = response;
     }
     
+    @Override
     public <V extends ICommandResult> V getSubsetResult(ICommand<V> command) {
         return null;
     }

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourceLookupDirector.java

@@ -18,6 +18,7 @@ import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
  * PDA source lookup director.
  */
 public class PDASourceLookupDirector extends AbstractSourceLookupDirector {
+	@Override
 	public void initializeParticipants() {
 	    // No need to add participants here, the source display adapter will
 	    // add the participant with the correct session ID.

dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourcePathComputerDelegate.java

@@ -40,6 +40,7 @@ import org.eclipse.debug.core.sourcelookup.containers.WorkspaceSourceContainer;
  */
 public class PDASourcePathComputerDelegate implements ISourcePathComputerDelegate {
 	
+	@Override
 	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException {
 		String path = configuration.getAttribute(PDAPlugin.ATTR_PDA_PROGRAM, (String)null);
 		ISourceContainer sourceContainer = null;

dsf/org.eclipse.cdt.examples.dsf/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src_ant"/>
 	<classpathentry kind="output" path="bin"/>

dsf/org.eclipse.cdt.examples.dsf/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 #Tue Jun 24 11:03:17 PDT 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -68,4 +68,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF

@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.dsf.ui,
  org.apache.ant;bundle-version="1.7.0";resolution:=optional
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileBrowserAction.java

@@ -33,6 +33,7 @@ public class FileBrowserAction extends ActionDelegate
         }
     }
 
+    @Override
     public void init(IWorkbenchWindow window) {
         fWindow = window;
     }

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileBrowserDialog.java

@@ -70,7 +70,8 @@ public class FileBrowserDialog extends Dialog {
         text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
         
         fViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-            public void selectionChanged(SelectionChangedEvent event) {
+            @Override
+	    public void selectionChanged(SelectionChangedEvent event) {
                 /*
                  * Update the file name in the text control, to match the 
                  * selection in the tree.  Do this only if the user is not
@@ -90,7 +91,8 @@ public class FileBrowserDialog extends Dialog {
         });
         
         text.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
+            @Override
+	    public void modifyText(ModifyEvent e) {
                 if (!fDisableTextChangeNotifications) {
                     fModelAdapter.getVMProvider().selectionTextChanged(text.getText());
                 }

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileBrowserVMProvider.java

@@ -35,7 +35,8 @@ public class FileBrowserVMProvider extends AbstractVMProvider
             /**
              * The input object provides the viewer access to the viewer model adapter.
              */
-            @SuppressWarnings("unchecked")
+            @Override
+	    @SuppressWarnings("unchecked")
             public Object getAdapter(Class adapter) {
                 if ( adapter.isInstance(getVMAdapter()) ) {
                     return getVMAdapter();
@@ -87,7 +88,8 @@ public class FileBrowserVMProvider extends AbstractVMProvider
         // and then call root layout node.
         try {
             getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+		public void run() {
                     if (isDisposed()) return;
                     handleEvent(text);
                 }});

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FileVMNode.java

@@ -67,6 +67,7 @@ class FileVMNode
     }
 
 
+    @Override
     public void dispose() {
         // All resources garbage collected.
     }
@@ -84,6 +85,7 @@ class FileVMNode
         return fChildNodes;
     }
     
+    @Override
     public void update(final IHasChildrenUpdate[] updates) {
         new Job("") { //$NON-NLS-1$
             {
@@ -109,6 +111,7 @@ class FileVMNode
         }.schedule();
     }
     
+    @Override
     public void update(final IChildrenCountUpdate[] updates) {
         new Job("") { //$NON-NLS-1$
             {
@@ -127,6 +130,7 @@ class FileVMNode
         }.schedule();
     }
     
+    @Override
     public void update(final IChildrenUpdate[] updates) {
         new Job("") { //$NON-NLS-1$
             {
@@ -150,6 +154,7 @@ class FileVMNode
         }.schedule();
     }
     
+    @Override
     public void update(final ILabelUpdate[] updates) {
         new Job("") { //$NON-NLS-1$
             {
@@ -195,11 +200,13 @@ class FileVMNode
         return vmc.getFile().getName();     
     }
 
+    @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();
     }
     
+    @Override
     public int getDeltaFlags(Object e) {
         /*
          * @see buildDelta()
@@ -212,6 +219,7 @@ class FileVMNode
         return retVal;
     }
 
+    @Override
     public void buildDelta(final Object event, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
         /*
          * The FileLayoutNode is recursive, with itself as the only child.  In this 
@@ -306,6 +314,7 @@ class FileVMNode
         return nodes;
     }
 
+    @Override
     public IVMProvider getVMProvider() {
         return fProvider;
     }

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/filebrowser/FilesystemRootsVMNode.java

@@ -47,6 +47,7 @@ class FilesystemRootsVMNode extends AbstractVMNode
         return "FilesystemRootsVMNode"; 
     }
     
+    @Override
     public void update(final IChildrenUpdate[] updates) {
         new Job("") { //$NON-NLS-1$
             {
@@ -70,6 +71,7 @@ class FilesystemRootsVMNode extends AbstractVMNode
         }.schedule();
     }
     
+    @Override
     public void update(final IHasChildrenUpdate[] updates) {
         for (IHasChildrenUpdate update : updates) {
             /*
@@ -82,6 +84,7 @@ class FilesystemRootsVMNode extends AbstractVMNode
         }
     }
 
+    @Override
     public void update(final IChildrenCountUpdate[] updates) {
         new Job("") { //$NON-NLS-1$
             {
@@ -101,6 +104,7 @@ class FilesystemRootsVMNode extends AbstractVMNode
         }.schedule();
     }
 
+    @Override
     public void update(final ILabelUpdate[] updates) {
         new Job("") { //$NON-NLS-1$
             {
@@ -130,6 +134,7 @@ class FilesystemRootsVMNode extends AbstractVMNode
         return vmc.getFile().getAbsolutePath();     
     }
 
+    @Override
     public int getDeltaFlags(Object e) {
         /*
          * @see buildDelta()
@@ -142,6 +147,7 @@ class FilesystemRootsVMNode extends AbstractVMNode
         return retVal;
     }
     
+    @Override
     public void buildDelta(final Object event, final VMDelta parentDelta, final int nodeOffset, final RequestMonitor requestMonitor) {
         if (event instanceof String) {
             new Job("") { //$NON-NLS-1$

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/AlarmsVMNode.java

@@ -73,6 +73,7 @@ class AlarmsVMNode extends AbstractDMVMNode
         update.done();
     }
 
+    @Override
     public void update(ILabelUpdate[] updates) {
         for (ILabelUpdate update : updates) {
             update.setLabel("ALARM TRIGGERED", 0);
@@ -85,6 +86,7 @@ class AlarmsVMNode extends AbstractDMVMNode
     }
     
     
+    @Override
     public int getDeltaFlags(Object e) {
         if (e instanceof AlarmService.AlarmTriggeredDMEvent) {
             return IModelDelta.ADDED | IModelDelta.SELECT | IModelDelta.EXPAND;
@@ -92,6 +94,7 @@ class AlarmsVMNode extends AbstractDMVMNode
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void buildDelta(Object e, VMDelta parentDelta, int nodeOffset, RequestMonitor requestMonitor) {
         // The alarm element is added when and selected upon a triggered event.  
         // Parent element is also expanded allow the alarm to be selected.

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimerService.java

@@ -158,7 +158,8 @@ public class TimerService extends AbstractDsfService
         // for canceling the scheduling of the runnable.
         Future<?> timerFuture = getExecutor().scheduleAtFixedRate(
             new Runnable() {
-                public void run() {
+                @Override
+		public void run() {
                     fTimers.put(newTimer, fTimers.get(newTimer) + 1);
                     getSession().dispatchEvent(new TimerTickDMEvent(newTimer), getProperties());
                 }

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMNode.java

@@ -83,6 +83,7 @@ class TimersVMNode extends AbstractDMVMNode
         return "TimersVMNode(" + getSession().getId() + ")";  //$NON-NLS-1$ //$NON-NLS-2$
     }
     
+    @Override
     public void update(ILabelUpdate[] updates) {
         fgLabelProvider.update(updates);
     }
@@ -103,11 +104,13 @@ class TimersVMNode extends AbstractDMVMNode
     }
 
 
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         // Switch to the session thread before processing the updates.
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+		public void run() {
                     for (IPropertiesUpdate update : updates) {
                         updatePropertiesInSessionThread(update);
                     }
@@ -143,6 +146,7 @@ class TimersVMNode extends AbstractDMVMNode
         update.done();
     }
 
+    @Override
     public int getDeltaFlags(Object e) {
         // This node generates delta if the timers have changed, or if the 
         // label has changed.
@@ -154,6 +158,7 @@ class TimersVMNode extends AbstractDMVMNode
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void buildDelta(Object e, VMDelta parentDelta, int nodeOffset, RequestMonitor requestMonitor) {
         if (e instanceof TimerService.TimerTickDMEvent) {
             // Add delta indicating that the given timer has changed.

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMProvider.java

@@ -51,7 +51,8 @@ public class TimersVMProvider extends AbstractDMVMProvider {
         // 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(TimersVMProvider.this, null);
                         fRegisteredEventListener = true;
@@ -77,7 +78,8 @@ public class TimersVMProvider extends AbstractDMVMProvider {
 		// completeness sake.
         try {
             getSession().getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+		public void run() {
                     if (fRegisteredEventListener && DsfSession.isSessionActive(getSession().getId())) {
                         getSession().removeServiceEventListener(TimersVMProvider.this);
                         fRegisteredEventListener = false;
@@ -140,7 +142,8 @@ public class TimersVMProvider extends AbstractDMVMProvider {
 
         try {
             getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+		public void run() {
                     if (isDisposed()) return;
                     handleEvent(event);
                 }
@@ -154,7 +157,8 @@ public class TimersVMProvider extends AbstractDMVMProvider {
 
         try {
             getExecutor().execute(new Runnable() {
-                public void run() {
+                @Override
+		public void run() {
                     if (isDisposed()) return;
                     handleEvent(event);
                 }

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersView.java

@@ -137,7 +137,8 @@ public class TimersView extends ViewPart {
                 /**
                  * The input object provides the viewer access to the viewer model adapter.
                  */
-                @SuppressWarnings("unchecked")
+                @Override
+		@SuppressWarnings("unchecked")
                 public Object getAdapter(Class adapter) {
                     if ( adapter.isInstance(fTimersVMAdapter) ) {
                         return fTimersVMAdapter;
@@ -163,7 +164,8 @@ public class TimersView extends ViewPart {
             // This operation needs to be performed in the session executor 
             // thread.  Block using Future.get() until this call completes.
             fSession.getExecutor().submit(new Runnable() { 
-                public void run() {
+                @Override
+		public void run() {
                     fSession.unregisterModelAdapter(IElementContentProvider.class);
                     fSession.unregisterModelAdapter(IModelProxyFactory.class);
                     fSession.unregisterModelAdapter(IColumnPresentationFactory.class);
@@ -186,7 +188,8 @@ public class TimersView extends ViewPart {
             
             // Finally end the session and the executor.
             fSession.getExecutor().submit(new Runnable() { 
-                public void run() {
+                @Override
+		public void run() {
                     DsfSession.endSession(fSession);
                     fSession = null;
                     fExecutor.shutdown();
@@ -230,7 +233,8 @@ public class TimersView extends ViewPart {
 			@Override
             public void run() {
                 fExecutor.execute(new Runnable() { 
-                    public void run() {
+                    @Override
+		    public void run() {
                         // Only need to create the new timer, the events will 
                         // cause the view to refresh.
                         fServices.getService(TimerService.class).startTimer();
@@ -252,7 +256,8 @@ public class TimersView extends ViewPart {
                     "Please enter trigger value", 
                     "", 
                     new IInputValidator() {
-                        public String isValid(String input) {
+                        @Override
+			public String isValid(String input) {
                             try {
                                 int i= Integer.parseInt(input);
                                 if (i <= 0)
@@ -272,7 +277,8 @@ public class TimersView extends ViewPart {
                 } catch (NumberFormatException x) { assert false; }
                 final int triggerValue = tmpTriggerValue;
                 fExecutor.execute(new Runnable() { 
-                    public void run() {
+                    @Override
+		    public void run() {
                         // Create the new trigger
                         fServices.getService(AlarmService.class).
                             createTrigger(triggerValue);
@@ -295,12 +301,14 @@ public class TimersView extends ViewPart {
                 // Based on the context from the selection, call the 
                 // appropriate service to remove the item.
                 if (selectedCtx instanceof TimerDMContext) {
-                    fExecutor.execute(new Runnable() { public void run() {
+                    fExecutor.execute(new Runnable() { @Override
+		    public void run() {
                         fServices.getService(TimerService.class).killTimer(
                             ((TimerDMContext)selectedCtx));
                     }});
                 } else if (selectedCtx instanceof AlarmService.TriggerDMContext) {
-                    fExecutor.execute(new Runnable() { public void run() {
+                    fExecutor.execute(new Runnable() { @Override
+		    public void run() {
                         fServices.getService(AlarmService.class).deleteTrigger(
                             (AlarmService.TriggerDMContext)selectedCtx);
                     }});

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersViewColumnPresentation.java

@@ -25,14 +25,18 @@ public class TimersViewColumnPresentation implements IColumnPresentation {
     public static final String COL_ID = ID + ".COL_ID"; //$NON-NLS-1$
     public static final String COL_VALUE = ID + ".COL_VALUE"; //$NON-NLS-1$
     
+    @Override
     public void init(IPresentationContext context) {}
 
+    @Override
     public void dispose() {}
 
+    @Override
     public String[] getAvailableColumns() {
         return new String[] { COL_ID, COL_VALUE };
     }
 
+    @Override
     public String getHeader(String id) {
         if (COL_ID.equals(id)) {
             return "ID"; //$NON-NLS-1$
@@ -42,18 +46,22 @@ public class TimersViewColumnPresentation implements IColumnPresentation {
         return null;
     }
 
+    @Override
     public String getId() {
         return ID;
     }
 
+    @Override
     public ImageDescriptor getImageDescriptor(String id) {
         return null;
     }
 
+    @Override
     public String[] getInitialColumns() {
         return getAvailableColumns();
     }
 
+    @Override
     public boolean isOptional() {
         return true;
     }

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TriggerCellModifier.java

@@ -53,11 +53,13 @@ public class TriggerCellModifier implements ICellModifier {
         fSession = session;
     }
 
+    @Override
     public boolean canModify(Object element, String property) {
         return TimersViewColumnPresentation.COL_VALUE.equals(property) && 
             getAlarmDMC(element) != null; 
     }
 
+    @Override
     public Object getValue(Object element, String property) {
         if (!TimersViewColumnPresentation.COL_VALUE.equals(property)) return ""; 
         
@@ -86,6 +88,7 @@ public class TriggerCellModifier implements ICellModifier {
     }
 
     
+    @Override
     public void modify(Object element, String property, Object value) {
         if (!TimersViewColumnPresentation.COL_VALUE.equals(property)) return;
 

dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TriggersVMNode.java

@@ -101,15 +101,18 @@ class TriggersVMNode extends AbstractDMVMNode
         update.done();
     }
 
+    @Override
     public void update(ILabelUpdate[] updates) {
         fgLabelProvider.update(updates);
     }
     
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         // Switch to the session thread before processing the updates.
         try {
             getSession().getExecutor().execute(new DsfRunnable() {
-                public void run() {
+                @Override
+		public void run() {
                     for (IPropertiesUpdate update : updates) {
                         updatePropertiesInSessionThread(update);
                     }
@@ -147,6 +150,7 @@ class TriggersVMNode extends AbstractDMVMNode
         update.done();
     }
     
+    @Override
     public CellEditor getCellEditor(IPresentationContext context, String columnId, 
         Object element, Composite parent) 
     {
@@ -159,6 +163,7 @@ class TriggersVMNode extends AbstractDMVMNode
 
     // Note: this method is synchronized because IElementEditor.getCellModifier can be called
     // on any thread, even though in practice it should be only called on the UI thread.
+    @Override
     public ICellModifier getCellModifier(IPresentationContext context, 
         Object element) 
     {
@@ -169,6 +174,7 @@ class TriggersVMNode extends AbstractDMVMNode
         return fAlarmCellModifier; 
     }
     
+    @Override
     public int getDeltaFlags(Object e) {
         // Since the label for triggers doesn't change, this node will generate 
         // delta info only if the list of alarms is changed.
@@ -179,6 +185,7 @@ class TriggersVMNode extends AbstractDMVMNode
     }
     
     
+    @Override
     public void buildDelta(Object event, VMDelta parentDelta, int nodeOffset, 
         RequestMonitor requestMonitor) 
     {

dsf/org.eclipse.cdt.tests.dsf/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

dsf/org.eclipse.cdt.tests.dsf/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 #Wed Mar 10 12:16:35 PST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -73,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF

@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.core;bundle-version="5.2.0",
  org.eclipse.test.performance;bundle-version="3.6.0",
  org.junit;bundle-version="3.8.2"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/ViewerUpdatesListener.java

@@ -325,6 +325,7 @@ public class ViewerUpdatesListener
         return true;
     }
     
+    @Override
     public void updateStarted(IViewerUpdate update) {
         synchronized (this) {
         	fContentUpdatesCounter++;
@@ -338,6 +339,7 @@ public class ViewerUpdatesListener
         }
     }
     
+    @Override
     public void updateComplete(IViewerUpdate update) {
         synchronized (this) {
         	fContentUpdatesCounter--;
@@ -378,6 +380,7 @@ public class ViewerUpdatesListener
         }
     }
     
+    @Override
     public void viewerUpdatesBegin() {
         if (fFailOnMultipleModelUpdateSequences && fContentSequenceComplete) {
             fMultipleModelUpdateSequencesObserved = true;
@@ -385,10 +388,12 @@ public class ViewerUpdatesListener
         fContentSequenceStarted = true;
     }
     
+    @Override
     public void viewerUpdatesComplete() {
         fContentSequenceComplete = true;
     }
 
+    @Override
     public void labelUpdateComplete(ILabelUpdate update) {
         synchronized (this) {
             fLabelUpdatesRunning.remove(update);
@@ -400,6 +405,7 @@ public class ViewerUpdatesListener
         }
     }
 
+    @Override
     public void labelUpdateStarted(ILabelUpdate update) {
         synchronized (this) {
             fLabelUpdatesRunning.add(update);
@@ -407,6 +413,7 @@ public class ViewerUpdatesListener
         }
     }
 
+    @Override
     public void labelUpdatesBegin() {
         if (fFailOnMultipleLabelUpdateSequences && fLabelSequenceComplete) {
             fMultipleLabelUpdateSequencesObserved = true;
@@ -414,10 +421,12 @@ public class ViewerUpdatesListener
         fLabelUpdatesStarted = true;
     }
 
+    @Override
     public void labelUpdatesComplete() {
         fLabelSequenceComplete = true;
     }
 
+    @Override
     public void propertiesUpdatesStarted(IPropertiesUpdate[] updates) {
         for (IPropertiesUpdate update : updates) {
             fPropertiesUpdatesRunning.add(update);
@@ -425,6 +434,7 @@ public class ViewerUpdatesListener
         }
     }
 
+    @Override
     public void propertiesUpdateCompleted(IPropertiesUpdate update) {
         synchronized (this) {
             fPropertiesUpdatesRunning.remove(update);
@@ -437,29 +447,36 @@ public class ViewerUpdatesListener
 
     }
     
+    @Override
     public void modelChanged(IModelDelta delta, IModelProxy proxy) {
         fModelChangedComplete = true;
     }
     
+    @Override
     public void stateRestoreUpdatesBegin(Object input) {
         fStateRestoreStarted = true;
     }
     
+    @Override
     public void stateRestoreUpdatesComplete(Object input) {
         fStateRestoreComplete = true;
     }
     
+    @Override
     public void stateSaveUpdatesBegin(Object input) {
         fStateSaveStarted = true;
     }
 
+    @Override
     public void stateSaveUpdatesComplete(Object input) {
         fStateSaveComplete = true;
     }
     
+    @Override
     public void stateUpdateComplete(Object input, IViewerUpdate update) {
     }
     
+    @Override
     public void stateUpdateStarted(Object input, IViewerUpdate update) {
     }
     

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/BreakpointMediatorTests.java

@@ -155,7 +155,8 @@ public class BreakpointMediatorTests {
         fExecutor.execute(seq);
         seq.get();
 
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoint.java

@@ -46,7 +46,8 @@ public class DsfTestBreakpoint extends Breakpoint {
     {
         final IResource resource = ResourcesPlugin.getWorkspace().getRoot();
         IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-            public void run(IProgressMonitor monitor) throws CoreException {
+            @Override
+	    public void run(IProgressMonitor monitor) throws CoreException {
                 IMarker marker = resource.createMarker("org.eclipse.cdt.tests.dsf.markerType.breakpoint");
                 setMarker(marker);
                 marker.setAttribute(IBreakpoint.ENABLED, enabled);
@@ -65,6 +66,7 @@ public class DsfTestBreakpoint extends Breakpoint {
         return (Integer)ensureMarker().getAttribute(ATTR_ID);
     }
     
+    @Override
     public String getModelIdentifier() {
         return DSF_TEST_BREAKPOINT_MODEL_ID;
     }

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpointAttributeTranslator2.java

@@ -29,16 +29,20 @@ import org.eclipse.debug.core.model.IBreakpoint;
  */
 public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttributeTranslator2 {
 
+    @Override
     public void initialize(BreakpointsMediator2 mediator) {
     }
 
+    @Override
     public void dispose() {
     }
 
+    @Override
     public boolean supportsBreakpoint(IBreakpoint bp) {
         return DsfTestBreakpoint.DSF_TEST_BREAKPOINT_MODEL_ID.equals(bp.getModelIdentifier());
     }
 
+    @Override
     public void resolveBreakpoint(IBreakpointsTargetDMContext context, IBreakpoint breakpoint,
         Map<String, Object> bpAttrs, DataRequestMonitor<List<Map<String, Object>>> drm) 
     {
@@ -56,6 +60,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
         drm.done();
     }
 
+    @Override
     public Map<String, Object> getAllBreakpointAttributes(IBreakpoint platformBP, boolean bpManagerEnabled)
         throws CoreException 
     {
@@ -67,6 +72,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
         return convertAttributes(platformBPAttr);
     }
 
+    @Override
     public Map<String, Object> convertAttributes(Map<String, Object> platformBPAttr) {
         Map<String, Object> debugAttrs = new HashMap<String, Object>(platformBPAttr.size());
         for (Map.Entry<String, Object> entry : platformBPAttr.entrySet()) {
@@ -82,6 +88,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
         return debugAttrs;
     }
 
+    @Override
     public void updateBreakpointsStatus(
         Map<IBreakpoint, Map<IBreakpointsTargetDMContext, ITargetBreakpointInfo[]>> bpsInfo,
         BreakpointEventType eventType) 
@@ -89,6 +96,7 @@ public class DsfTestBreakpointAttributeTranslator2 implements IBreakpointAttribu
         
     }
 
+    @Override
     public boolean canUpdateAttributes(IBreakpoint bp, IBreakpointsTargetDMContext context,
         Map<String, Object> attributes) 
     {

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/breakpoints/DsfTestBreakpoints.java

@@ -114,16 +114,25 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
             fAttributes = Collections.unmodifiableMap( new HashMap<String, Object>(attributes) );
         }
         
-        public IAddress[] getAddresses() { return null; }
+        @Override
-        public String getBreakpointType() { return null; }
+	public IAddress[] getAddresses() { return null; }
-        public String getFileName() { return null; }
+        @Override
-        public int getLineNumber() { return 0; }
+	public String getBreakpointType() { return null; }
-        public String getFunctionName() { return null; }
+        @Override
-        public String getCondition() { return null; }
+	public String getFileName() { return null; }
-        public int getIgnoreCount() { return 0; }
+        @Override
-        public String getExpression() { return null; }
+	public int getLineNumber() { return 0; }
+        @Override
+	public String getFunctionName() { return null; }
+        @Override
+	public String getCondition() { return null; }
+        @Override
+	public int getIgnoreCount() { return 0; }
+        @Override
+	public String getExpression() { return null; }
         
-        public boolean isEnabled() { return (Boolean)getAttributes().get(ATTR_ENABLED); }
+        @Override
+	public boolean isEnabled() { return (Boolean)getAttributes().get(ATTR_ENABLED); }
         public Map<String, Object> getAttributes() { return fAttributes; }
     }
     
@@ -136,11 +145,13 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
             fBreakpointArray = new IBreakpointDMContext[] { bp };
         }
 
-        public IBreakpointsTargetDMContext getDMContext() {
+        @Override
+	public IBreakpointsTargetDMContext getDMContext() {
             return DMContexts.getAncestorOfType(fBreakpoint, IBreakpointsTargetDMContext.class);
         }
         
-        public IBreakpointDMContext[] getBreakpoints() {
+        @Override
+	public IBreakpointDMContext[] getBreakpoints() {
             return fBreakpointArray; 
         }
     }
@@ -205,6 +216,7 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
         return DsfTestPlugin.getBundleContext();
     }
 
+    @Override
     public void getBreakpoints(final IBreakpointsTargetDMContext context, final DataRequestMonitor<IBreakpointDMContext[]> rm) {
         // Validate the context
         // TODO: check the target context
@@ -217,10 +229,12 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
         rm.done();
     }
 
+    @Override
     public void getBreakpointDMData(IBreakpointDMContext dmc, DataRequestMonitor<IBreakpointDMData> rm) {
         DsfTestPlugin.failRequest(rm, NOT_SUPPORTED, "Retrieving breakpoint data is not supported");
     }
 
+    @Override
     public void insertBreakpoint(IBreakpointsTargetDMContext context, Map<String, Object> attributes, 
         DataRequestMonitor<IBreakpointDMContext> rm) 
     {
@@ -275,6 +289,7 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
     }
 
 
+    @Override
     public void removeBreakpoint(IBreakpointDMContext bpCtx, RequestMonitor rm) {
         if (!fBreakpoints.containsKey(bpCtx)) {
             DsfTestPlugin.failRequest(rm, REQUEST_FAILED, "Breakpoint already removed");
@@ -294,6 +309,7 @@ public class DsfTestBreakpoints extends AbstractDsfService implements IBreakpoin
         }
     }
 
+    @Override
     public void updateBreakpoint(final IBreakpointDMContext bpCtx, Map<String, Object> attributes, final RequestMonitor rm) {
         if (!fBreakpoints.containsKey(bpCtx)) {
             DsfTestPlugin.failRequest(rm, REQUEST_FAILED, "Breakpoint not installed");

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/CacheTests.java

@@ -109,7 +109,8 @@ public class CacheTests {
     
     @After 
     public void shutdownExecutor() throws ExecutionException, InterruptedException {
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {
@@ -189,7 +190,8 @@ public class CacheTests {
         assertFalse(fTestCache.isValid());
 
         // Complete the cache's retrieve data request.
-        fExecutor.submit(new Callable<Object>() { public Object call() {
+        fExecutor.submit(new Callable<Object>() { @Override
+	public Object call() {
             fRetrieveRm.setData(1);
             fRetrieveRm.done();
 
@@ -318,7 +320,8 @@ public class CacheTests {
     public void disableBeforeRequestTest() throws InterruptedException, ExecutionException {
         // Disable the cache
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.set(null, STATUS_TARGET_RUNNING);
             }
         }).get();
@@ -356,7 +359,8 @@ public class CacheTests {
 
         // Disable the cache
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.set(null, STATUS_TARGET_RUNNING);
             }
         }).get();
@@ -367,7 +371,8 @@ public class CacheTests {
 		// disassociates it from its retrieval RM. Thus regardless of how that
 		// request completes, it does not affect the cache.
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm.setData(1);
                 fRetrieveRm.done();
             }
@@ -399,7 +404,8 @@ public class CacheTests {
         
         // Disable the cache
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.set(null, STATUS_TARGET_RUNNING);
             }
         }).get();
@@ -412,7 +418,8 @@ public class CacheTests {
     public void setWithValueTest() throws InterruptedException, ExecutionException {
         // Disable the cache
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.set(2, Status.OK_STATUS);
             }
         }).get();
@@ -444,7 +451,8 @@ public class CacheTests {
 		// request. Perhaps the retrieval logic isn't checking the RM status.
 		// Even if it is checking, it may have gotten passed its last checkpoint
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm.setData(1);
                 fRetrieveRm.done();
             }
@@ -481,7 +489,8 @@ public class CacheTests {
 		// completing the RM. Note that it hasn't provided the data to the
 		// cache. 
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm.done();
             }
         }).get();
@@ -512,7 +521,8 @@ public class CacheTests {
 		// aborts its processing, sets STATUS.CANCEL_STATUS in the RM and
 		// completes it. 
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
             	fRetrieveRm.setStatus(Status.CANCEL_STATUS);
                 fRetrieveRm.done();
             }
@@ -568,7 +578,8 @@ public class CacheTests {
         // called in a separate dispatch cycle, so we have to wait one cycle of the executor 
         // after is canceled is called.
         fRetrieveRm.isCanceled();
-        fExecutor.submit(new Runnable() { public void run() {} }).get(); 
+        fExecutor.submit(new Runnable() { @Override
+	public void run() {} }).get(); 
         assertTrue(canceledCalled[0]);        
 
         try {
@@ -579,7 +590,8 @@ public class CacheTests {
 
         // Completed the retrieve RM
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm.setData(1);
                 fRetrieveRm.done();
             }
@@ -645,7 +657,8 @@ public class CacheTests {
 
         // Reset the cache
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm = null;
                 fTestCache.set(null, Status.OK_STATUS);
                 fTestCache.reset();
@@ -665,7 +678,8 @@ public class CacheTests {
         
         // Completed the retrieve RM
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm.setData(1);
                 fRetrieveRm.done();
             }
@@ -711,7 +725,8 @@ public class CacheTests {
 
         // Completed the retrieve RM
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm.setData(1);
                 fRetrieveRm.done();
             }
@@ -769,7 +784,8 @@ public class CacheTests {
 
         // Completed the retrieve RM
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRetrieveRm.setData(1);
                 fRetrieveRm.done();
             }
@@ -796,7 +812,8 @@ public class CacheTests {
         
         // Disable cache
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.reset();
             }
         }).get();

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfQueryTests.java

@@ -44,7 +44,8 @@ public class DsfQueryTests {
     
     @After 
     public void shutdownServices() throws ExecutionException, InterruptedException {
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {
@@ -142,7 +143,8 @@ public class DsfQueryTests {
             @Override
             protected void execute(final DataRequestMonitor<Integer> rm) {
                 fExecutor.execute(new DsfRunnable() { 
-                    public void run() {
+                    @Override
+		    public void run() {
                         rm.setData(1);
                         rm.done();
                     }
@@ -236,7 +238,8 @@ public class DsfQueryTests {
         // Add a cancel listener to the query RM
         rmHolder[0].addCancelListener(new ICanceledListener() {
             
-            public void requestCanceled(RequestMonitor rm) {
+            @Override
+	    public void requestCanceled(RequestMonitor rm) {
                 cancelCalled[0] = Boolean.TRUE;
             }
         });
@@ -289,7 +292,8 @@ public class DsfQueryTests {
                 // Call done with a delay of 1 second, to avoid stalling the tests.
                 fExecutor.schedule(
                     new DsfRunnable() {
-                        public void run() { rm.done(); }
+                        @Override
+			public void run() { rm.done(); }
                     }, 
                     60, TimeUnit.SECONDS);
             }

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceProgressTests.java

@@ -45,7 +45,8 @@ public class DsfSequenceProgressTests {
     
     @After 
     public void shutdownExecutor() throws ExecutionException, InterruptedException {
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/DsfSequenceTests.java

@@ -46,7 +46,8 @@ public class DsfSequenceTests {
         if (!fExecutor.isShutdown()) {
             // Some tests shut down the executor deliberatly)
             
-            fExecutor.submit(new DsfRunnable() { public void run() {
+            fExecutor.submit(new DsfRunnable() { @Override
+	    public void run() {
                 fExecutor.shutdown();
             }}).get();
         }

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/RangeCacheTests.java

@@ -97,7 +97,8 @@ public class RangeCacheTests {
             fRm = rm;
         }
         
-        public int compareTo(RetrieveInfo o) {
+        @Override
+	public int compareTo(RetrieveInfo o) {
             if (fOffset > o.fOffset) {
                 return 1;
             } else if (fOffset == o.fOffset) {
@@ -148,7 +149,8 @@ public class RangeCacheTests {
     
     @After 
     public void shutdownExecutor() throws ExecutionException, InterruptedException {
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {
@@ -314,7 +316,8 @@ public class RangeCacheTests {
         getRange(0, 100, new long[] { 0 }, new int[] { 100 });
         
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.reset();
             };
         }).get();
@@ -341,7 +344,8 @@ public class RangeCacheTests {
         getRange(2050, 50, new long[] {}, new int[] {});
         
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.reset();
             };
         }).get();
@@ -379,7 +383,8 @@ public class RangeCacheTests {
         assertCacheWaiting(fRangeCache);
         
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.reset();
             };
         }).get();
@@ -403,7 +408,8 @@ public class RangeCacheTests {
         
         // Force an error status into the range cache.
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fTestCache.set(0, 100, null, new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, IDsfStatusConstants.INVALID_STATE, "Cache invalid", null));
             };
         }).get();
@@ -411,7 +417,8 @@ public class RangeCacheTests {
         // Retrieve a range cache and check that it immediately contains the error status in it.
         fRangeCache = null;
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRangeCache = fTestCache.getRange(0, 100);
             }
         }).get();
@@ -453,7 +460,8 @@ public class RangeCacheTests {
         completeInfo(info, 0, 100);
 
         fExecutor.submit(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fRangeCache = fTestCache.getRange(0, 100);
             }
         }).get();

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/concurrent/TransactionTests.java

@@ -115,7 +115,8 @@ public class TransactionTests {
     
     @After 
     public void shutdownExecutor() throws ExecutionException, InterruptedException {
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTest1.java

@@ -64,9 +64,11 @@ public class VMTest1 extends VMTestBase implements IViewerUpdatesListenerConstan
         final boolean[] containerExpandReceived = new boolean[1];
         containerExpandReceived[0] = false;
         dv.addModelChangedListener(new IModelChangedListener() {
-            public void modelChanged(IModelDelta delta, IModelProxy proxy) {
+            @Override
+	    public void modelChanged(IModelDelta delta, IModelProxy proxy) {
                 delta.accept(new IModelDeltaVisitor() {
-                    public boolean visit(IModelDelta delta, int depth) {
+                    @Override
+		    public boolean visit(IModelDelta delta, int depth) {
                         if (delta.getElement() instanceof IDMVMContext &&
                             ((IDMVMContext)delta.getElement()).getDMContext() instanceof IContainerDMContext &&
                             (delta.getFlags() & IModelDelta.EXPAND) != 0) 

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/debug/vm/launch/VMTestBase.java

@@ -83,7 +83,8 @@ public class VMTestBase {
         final ServiceEventWaitor<?> eventWaitor[] = new ServiceEventWaitor<?>[1];
         
         SessionStartedListener newSessionListener = new SessionStartedListener() {
-            public void sessionStarted(DsfSession session) {
+            @Override
+	    public void sessionStarted(DsfSession session) {
                 eventWaitor[0] = new ServiceEventWaitor<IStartedDMEvent>(session, IStartedDMEvent.class);
             }
         };

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/dm/DMContextsTest.java

@@ -33,7 +33,8 @@ public class DMContextsTest {
     
     @Before public void startExecutor() throws ExecutionException, InterruptedException {
         fExecutor = new TestDsfExecutor();
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fSession = DsfSession.startSession(fExecutor, "DMContextsTest"); //$NON-NLS-1$
         }}).get();
 
@@ -64,7 +65,8 @@ public class DMContextsTest {
         DsfSession.endSession(fSession);
         fSession = null;
         
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/events/EventTest.java

@@ -35,7 +35,8 @@ public class EventTest {
     @Before public void startServices() throws ExecutionException, InterruptedException {
         fExecutor = new TestDsfExecutor();
         
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fSession = DsfSession.startSession(fExecutor, "org.eclipse.cdt.tests.dsf"); //$NON-NLS-1$
         }}).get();
         
@@ -43,7 +44,8 @@ public class EventTest {
         fExecutor.execute(startupSeq);
         startupSeq.get();
         
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fTracker = new DsfServicesTracker(DsfTestPlugin.getBundleContext(), fSession.getId()); 
             fService1 = fTracker.getService(Service1.class);
             fService2 = fTracker.getService(Service2.class);
@@ -61,7 +63,8 @@ public class EventTest {
         fExecutor.execute(shutdownSeq);
         shutdownSeq.get();
         
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fService1 = null;
             fService2 = null;
             fService3 = null;
@@ -121,7 +124,8 @@ public class EventTest {
 		// specifies a services filter when registering itself as a listener.
 		// The filter limits the listener to events originating from service 2.
         fService1.dispatchEvent1();
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
             Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
             Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -140,7 +144,8 @@ public class EventTest {
         fService4.fEvent1RecipientNumber = 0;
 
         fService2.dispatchEvent1();
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
             Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
             Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -158,7 +163,8 @@ public class EventTest {
         fService4.fEvent1RecipientNumber = 0;
 
         fService3.dispatchEvent1();
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
             Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
             Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -174,7 +180,8 @@ public class EventTest {
         fService4.fEvent1RecipientNumber = 0;
 
         fService4.dispatchEvent1();
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             Assert.assertTrue(1 == fService1.fEvent1RecipientNumber);
             Assert.assertTrue(2 == fService2.fEvent1RecipientNumber);
             Assert.assertTrue(3 == fService3.fEvent1RecipientNumber);
@@ -191,7 +198,8 @@ public class EventTest {
      */
     @Test public void event2Test() throws ExecutionException, InterruptedException {
         fService1.dispatchEvent2();
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
         	assertEventNotReceivedByAnyService(1);        	
             Assert.assertTrue(1 == fService1.fEvent2RecipientNumber);
             Assert.assertTrue(2 == fService2.fEvent2RecipientNumber);
@@ -212,7 +220,8 @@ public class EventTest {
 	 */
     @Test public void event3Test() throws ExecutionException, InterruptedException {
         fService1.dispatchEvent3();
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             Assert.assertTrue(1 == fService1.fEvent1RecipientNumber || 2 == fService1.fEvent1RecipientNumber);
             Assert.assertTrue(3 == fService2.fEvent1RecipientNumber || 4 == fService2.fEvent1RecipientNumber);
             Assert.assertTrue(5 == fService3.fEvent1RecipientNumber || 6 == fService3.fEvent1RecipientNumber);

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java

@@ -59,16 +59,20 @@ public class BasicTests extends CommandControlTestsBase {
             List<CommandInfo> fRemovedCommands = new LinkedList<CommandInfo>(); 
             List<CommandInfo> fSentCommands = new LinkedList<CommandInfo>(); 
             
-            public void commandDone(ICommandToken token, ICommandResult result) { 
+            @Override
+	    public void commandDone(ICommandToken token, ICommandResult result) { 
                 fDoneCommands.add(new CommandInfo(token.getCommand(), result));
             }
-            public void commandQueued(ICommandToken token) {
+            @Override
+	    public void commandQueued(ICommandToken token) {
                 fQueuedCommands.add(new CommandInfo(token.getCommand(), null));
             }
-            public void commandRemoved(ICommandToken token) {
+            @Override
+	    public void commandRemoved(ICommandToken token) {
                 fRemovedCommands.add(new CommandInfo(token.getCommand(), null));
             }
-            public void commandSent(ICommandToken token) {
+            @Override
+	    public void commandSent(ICommandToken token) {
                 fSentCommands.add(new CommandInfo(token.getCommand(), null));
             }
             
@@ -82,7 +86,8 @@ public class BasicTests extends CommandControlTestsBase {
         
         final CommandListener listener = new CommandListener();
         fExecutor.execute(new DsfRunnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 fCommandControl.addCommandListener(listener);
             }
         });

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java

@@ -76,7 +76,8 @@ public class CommandControlTestsBase {
         fCommandControl = new PDACommandControl(fSession);
 
         fCommandControl.addEventListener(new IEventListener() {
-            public void eventReceived(Object output) {
+            @Override
+	    public void eventReceived(Object output) {
                 fEventsQueue.add(output);
             }
         });

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/service/ServiceTests.java

@@ -35,7 +35,8 @@ public class ServiceTests {
     }   
     
     @After public void shutdownExecutor() throws ExecutionException, InterruptedException {
-        fExecutor.submit(new DsfRunnable() { public void run() {
+        fExecutor.submit(new DsfRunnable() { @Override
+	public void run() {
             fExecutor.shutdown();
         }}).get();
         if (fExecutor.exceptionsCaught()) {

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/DummyFormattedValueService.java

@@ -41,15 +41,18 @@ public class DummyFormattedValueService extends AbstractDsfService implements IF
         return DsfTestPlugin.getBundleContext();
     }
     
+    @Override
     public void getAvailableFormats(IFormattedDataDMContext dmc, DataRequestMonitor<String[]> rm) {
         rm.setData(AVAILABLE_FORMATS);
         rm.done();
     }
 
+    @Override
     public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext dmc, String formatId) {
         return new FormattedValueDMContext(this, dmc, formatId);
     }
     
+    @Override
     public void getFormattedExpressionValue(FormattedValueDMContext dmc, DataRequestMonitor<FormattedValueDMData> rm) {
         rm.setData(new FormattedValueDMData(dmc.getFormatID()));
         rm.done();

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValueTests.java

@@ -842,7 +842,8 @@ abstract public class FormattedValueTests extends TestCase implements IViewerUpd
         fModel.validateData(
             fViewer, TreePath.EMPTY, 
             new TestElementValidator() {
-                public void validate(TestElement modelElement, TestElement viewerElement, TreePath viewerPath) {
+                @Override
+		public void validate(TestElement modelElement, TestElement viewerElement, TreePath viewerPath) {
                     ViewerLabel label = fViewer.getElementLabel(viewerPath, TestModelCachingVMProvider.COLUMN_ID);
                     assertEquals(modelElement.getID(), label.getText());
                     ElementFormatSetting elementFormat = null;

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/FormattedValuesListener.java

@@ -54,6 +54,7 @@ public class FormattedValuesListener implements IFormattedValuesListener, IPrope
         fCachedFormats.addAll(Arrays.asList(cachedFormats));
     }
     
+    @Override
     public void propertiesUpdatesStarted(IPropertiesUpdate[] updates) {
         fPropertiesUpdates.addAll(Arrays.asList(updates));
         List<FormattedValueDMContext> pending = new ArrayList<FormattedValueDMContext>(updates.length);
@@ -122,15 +123,18 @@ public class FormattedValuesListener implements IFormattedValuesListener, IPrope
         return true;
     }
     
+    @Override
     public void propertiesUpdateCompleted(IPropertiesUpdate update) {}
 
+    @Override
     public void formattedValueUpdated(FormattedValueDMContext formattedValueDmc) {
         Assert.assertFalse("Expected values with formats " + fCachedFormats + " to be cached.", 
                            fCachedFormats.contains(formattedValueDmc.getFormatID()));
         
         if (fProcessUpdatedFormattedValuesRunnable == null) {
             fProcessUpdatedFormattedValuesRunnable = new DsfRunnable() {
-                public void run() {
+                @Override
+		public void run() {
                     fProcessUpdatedFormattedValuesRunnable = null;
                     processFormattedValuesInProgress();
                 }

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementFormatVMProvider.java

@@ -36,6 +36,7 @@ class TestElementFormatVMProvider extends TestModelCachingVMProvider implements
 		super(adapter, context, session);
 	}
 
+	@Override
 	public void getActiveFormat(IPresentationContext context, IVMNode node,
 			Object viewerInput, TreePath elementPath, DataRequestMonitor<String> rm) {
 		Object p = context.getProperty(myPersistId);
@@ -70,6 +71,7 @@ class TestElementFormatVMProvider extends TestModelCachingVMProvider implements
 		rm.done();
 	}
 
+	@Override
 	public void setActiveFormat(IPresentationContext context, IVMNode[] node,
 			Object viewerInput, TreePath[] elementPath, String format) {
 		Object p = context.getProperty(myPersistId);
@@ -95,6 +97,7 @@ class TestElementFormatVMProvider extends TestModelCachingVMProvider implements
 		}
 	}
 
+	@Override
 	public boolean supportFormat(IVMContext context) {
 		return true;
 	}

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestElementVMContext.java

@@ -42,6 +42,7 @@ public class TestElementVMContext extends AbstractVMContext implements IDMVMCont
         return fElement;
     }
 
+    @Override
     public IDMContext getDMContext() {
         return getElement();
     }

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java

@@ -177,7 +177,8 @@ public class TestModel extends AbstractDsfService implements IFormattedValues {
     }
     
     private static final IFormattedValuesListener NULL_LISTENER = new IFormattedValuesListener() {
-        public void formattedValueUpdated(FormattedValueDMContext formattedValueDmc) {}
+        @Override
+	public void formattedValueUpdated(FormattedValueDMContext formattedValueDmc) {}
     };
     
     private TestElement fRoot;
@@ -583,11 +584,13 @@ public class TestModel extends AbstractDsfService implements IFormattedValues {
         return null;
     }
     
+    @Override
     public void getAvailableFormats(IFormattedDataDMContext dmc, DataRequestMonitor<String[]> rm) {
         rm.setData(new String[] { HEX_FORMAT, DECIMAL_FORMAT, OCTAL_FORMAT, BINARY_FORMAT, NATURAL_FORMAT });
         rm.done();
     }
     
+    @Override
     public void getFormattedExpressionValue(FormattedValueDMContext dmc, DataRequestMonitor<FormattedValueDMData> rm) {
         TestElement te = DMContexts.getAncestorOfType(dmc, TestElement.class);
         rm.setData(new FormattedValueDMData( getFormattedValueText(te, dmc.getFormatID())));
@@ -595,6 +598,7 @@ public class TestModel extends AbstractDsfService implements IFormattedValues {
         fListener.formattedValueUpdated(dmc);
     }
     
+    @Override
     public FormattedValueDMContext getFormattedValueContext(IFormattedDataDMContext dmc, String formatId) {
         // Creates a context that can be used to retrieve a formatted value.
         return new FormattedValueDMContext(this, dmc, formatId);

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelCachingVMProvider.java

@@ -36,32 +36,41 @@ public class TestModelCachingVMProvider extends AbstractDMVMProvider {
     private static final String[] COLUMNS = new String[] { COLUMN_ID, COLUMN_FORMATTED_VALUE, COLUMN_DUMMY_VALUE }; 
     
     private IPropertyChangeListener fPresentationContextListener = new IPropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent event) {
+        @Override
+	public void propertyChange(PropertyChangeEvent event) {
             handleEvent(event);
         }        
     };
 
     private static IColumnPresentation COLUMN_PRESENTATION = new IColumnPresentation() {
-        public void init(IPresentationContext context) {}
+        @Override
-        public void dispose() {};
+	public void init(IPresentationContext context) {}
+        @Override
+	public void dispose() {};
         
-        public String[] getAvailableColumns() {
+        @Override
+	public String[] getAvailableColumns() {
             return COLUMNS;
         };
         
-        public String getHeader(String id) {
+        @Override
+	public String getHeader(String id) {
             return id;
         };
         
-        public String getId() { return "ID"; }
+        @Override
+	public String getId() { return "ID"; }
         
-        public ImageDescriptor getImageDescriptor(String id) {
+        @Override
+	public ImageDescriptor getImageDescriptor(String id) {
             return null;
         }
-        public String[] getInitialColumns() {
+        @Override
+	public String[] getInitialColumns() {
             return COLUMNS;
         }
-        public boolean isOptional() {
+        @Override
+	public boolean isOptional() {
             return false;
         }
     };

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelDMVMNode.java

@@ -109,6 +109,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
         return fLabelProvider;
     }
     
+    @Override
     public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -165,6 +166,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
         
     }
     
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         fViewerUpdateListener.propertiesUpdatesStarted(updates);
         if (fFormattedValuesListener != null) fFormattedValuesListener.propertiesUpdatesStarted(updates);
@@ -209,6 +211,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
      * (non-Javadoc)
      * @see org.eclipse.cdt.dsf.ui.viewmodel.IVMNode#getDeltaFlags(java.lang.Object)
      */
+    @Override
     public int getDeltaFlags(Object e) {
         if ( e instanceof PropertyChangeEvent &&
              ((PropertyChangeEvent)e).getProperty() == IDebugVMConstants.PROP_FORMATTED_VALUE_FORMAT_PREFERENCE) 
@@ -226,6 +229,7 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
         return IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void buildDelta(Object e, VMDelta parent, int nodeOffset, RequestMonitor rm) {
         if ( e instanceof PropertyChangeEvent &&
             ((PropertyChangeEvent)e).getProperty() == IDebugVMConstants.PROP_FORMATTED_VALUE_FORMAT_PREFERENCE) 
@@ -244,10 +248,12 @@ public class TestModelDMVMNode extends AbstractDMVMNode implements IRootVMNode,
     }
 
 
+    @Override
     public boolean isDeltaEvent(Object rootObject, Object event) {
         return getDeltaFlags(event) != IModelDelta.NO_CHANGE;
     }
 
+    @Override
     public void createRootDelta(Object rootObject, Object event, DataRequestMonitor<VMDelta> rm) {
         int flags = IModelDelta.NO_CHANGE;
         if ( event instanceof PropertyChangeEvent &&

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelUpdatesListener.java

@@ -30,7 +30,8 @@ public class TestModelUpdatesListener extends ViewerUpdatesListener
     
     private final static Comparator<String> fStringComparator = new Comparator<String>() {
         
-        public int compare(String s1, String s2) {
+        @Override
+	public int compare(String s1, String s2) {
             int l1 = s1.length();
             int l2 = s2.length();
             int lmin = l1;
@@ -61,7 +62,8 @@ public class TestModelUpdatesListener extends ViewerUpdatesListener
     };
     
     private final static Comparator<TreePath> fTestElementVMCComparator = new Comparator<TreePath>() {
-        public int compare(TreePath p1, TreePath p2) {
+        @Override
+	public int compare(TreePath p1, TreePath p2) {
             int l1 = p1.getSegmentCount();
             int l2 = p2.getSegmentCount();
             int lmin = l1;

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModelVMNode.java

@@ -55,6 +55,7 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
             }));
     }
     
+    @Override
     public void update(final ILabelUpdate[] updates) {
         fLabelProvider.update(updates);
     }
@@ -68,9 +69,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
            
     }
     
+    @Override
     public void update(final IHasChildrenUpdate[] updates) {
         getTestProvider().getDsfExecutor().execute(new Runnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 for (IHasChildrenUpdate update : updates) {
                     if (update.getElement() instanceof TestElementVMContext) {
                         TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -82,9 +85,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
         });
     }
     
+    @Override
     public void update(final IChildrenCountUpdate[] updates) {
         getTestProvider().getDsfExecutor().execute(new Runnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 for (IChildrenCountUpdate update : updates) {
                     if (update.getElement() instanceof TestElementVMContext) {
                         TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -96,9 +101,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
         });
     }
 
+    @Override
     public void update(final IChildrenUpdate[] updates) {
         getTestProvider().getDsfExecutor().execute(new Runnable() {
-            public void run() {        
+            @Override
+	    public void run() {        
                 for (IChildrenUpdate update : updates) {
                     if (update.getElement() instanceof TestElementVMContext) {
                         TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -110,9 +117,11 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
         });
     }
     
+    @Override
     public void update(final IPropertiesUpdate[] updates) {
         getTestProvider().getDsfExecutor().execute(new Runnable() {
-            public void run() {
+            @Override
+	    public void run() {
                 for (IPropertiesUpdate update : updates) {
                     if (update.getElement() instanceof TestElementVMContext) {
                         TestElement element = ((TestElementVMContext)update.getElement()).getElement();
@@ -137,19 +146,23 @@ public class TestModelVMNode extends AbstractVMNode implements IRootVMNode, IEle
         return new TestElementVMContext(this, element);
     }
 
+    @Override
     public int getDeltaFlags(Object event) {
         return 0;
     }
 
+    @Override
     public void buildDelta(Object event, VMDelta parent, int nodeOffset, RequestMonitor rm) {
         rm.done();
     }
 
 
+    @Override
     public boolean isDeltaEvent(Object rootObject, Object event) {
         return false;
     }
 
+    @Override
     public void createRootDelta(Object rootObject, Object event, DataRequestMonitor<VMDelta> rm) {
         rm.setStatus(new Status(IStatus.ERROR, DsfTestPlugin.PLUGIN_ID, IDsfStatusConstants.NOT_SUPPORTED,  "Not implemented", null));
         rm.done();

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistable.java

@@ -27,6 +27,7 @@ class TestPersistable implements IPersistableElement, IAdaptable {
 
 	HashMap<String, String> map = new HashMap<String, String>();
 
+	@Override
 	public void saveState(IMemento memento) {
 		HashMap<String, String> clone = null;
 		synchronized (map) {
@@ -70,10 +71,12 @@ class TestPersistable implements IPersistableElement, IAdaptable {
 		}
 	}
 
+	@Override
 	public String getFactoryId() {
 		return TestPersistableFactory.factoryId;
 	}
 
+	@Override
 	public Object getAdapter(Class adapter) {
 		if (adapter.isInstance(this)) {
 			return this;

dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestPersistableFactory.java

@@ -21,6 +21,7 @@ public class TestPersistableFactory implements IElementFactory {
 
 	static String factoryId = "org.eclipse.cdt.tests.dsf.vm.testPersistableFactory";
 
+	@Override
 	public IAdaptable createElement(IMemento memento) {
 		TestPersistable x = new TestPersistable();
 		x.restore(memento);

llvm/org.eclipse.cdt.managedbuilder.llvm.tests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>

llvm/org.eclipse.cdt.managedbuilder.llvm.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 #Wed Mar 02 15:23:00 KST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -78,4 +78,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

llvm/org.eclipse.cdt.managedbuilder.llvm.tests/META-INF/MANIFEST.MF

@@ -7,6 +7,6 @@ Bundle-Activator: org.eclipse.cdt.managedbuilder.llvm.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Import-Package: junit.framework

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/.settings/org.eclipse.jdt.core.prefs

@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF

@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.managedbuilder.core,
  org.eclipse.cdt.managedbuilder.gnu.ui,
  org.eclipse.cdt.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.cdt.managedbuilder.llvm.makegen;
   uses:="org.eclipse.core.runtime,

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmBuildEnvironmentVariable.java

@@ -47,6 +47,7 @@ public class LlvmBuildEnvironmentVariable implements IBuildEnvironmentVariable {
 	 * 
 	 * @return String delimiter
 	 */
+	@Override
 	public String getDelimiter() {
 		return ";"; //$NON-NLS-1$
 	}
@@ -62,6 +63,7 @@ public class LlvmBuildEnvironmentVariable implements IBuildEnvironmentVariable {
 	 * 
 	 * @return name The name of the llvm environment variable
 	 */
+	@Override
 	public String getName() {
 		return this.name;
 	}
@@ -76,6 +78,7 @@ public class LlvmBuildEnvironmentVariable implements IBuildEnvironmentVariable {
 	 * 
 	 * @return operation The operation of the llvm environment variable
 	 */
+	@Override
 	public int getOperation() {
 		return this.operation;
 	}
@@ -91,6 +94,7 @@ public class LlvmBuildEnvironmentVariable implements IBuildEnvironmentVariable {
 	 * 
 	 * @return value The value of the llvm environment variable.
 	 */
+	@Override
 	public String getValue() {
 		return this.value;
 	}

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmEnvironmentVariableSupplier.java

@@ -424,11 +424,13 @@ public class LlvmEnvironmentVariableSupplier implements IConfigurationEnvironmen
 		return ""; //$NON-NLS-1$
 	}
 	
+	@Override
 	public IBuildEnvironmentVariable getVariable(String variableName, IConfiguration configuration,
 			IEnvironmentVariableProvider provider) {
 		return llvmEnvironmentVariables.get(variableName);
 	}
 
+	@Override
 	public IBuildEnvironmentVariable[] getVariables(IConfiguration configuration,
 			IEnvironmentVariableProvider provider) {
 		return llvmEnvironmentVariables.values().toArray(new IBuildEnvironmentVariable[0]);

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmIsToolChainSupported.java

@@ -39,6 +39,7 @@ public class LlvmIsToolChainSupported implements IManagedIsToolChainSupported {
 	/**
 	 * Return a boolean value that informs if the LLVM Toolchain is supported.
 	 */
+	@Override
 	public boolean isSupported(IToolChain toolChain,
 			/*
 			 * Version is supported from CDT 7.1.0.

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/LlvmProjectNature.java

@@ -26,6 +26,7 @@ public class LlvmProjectNature implements IProjectNature {
 	/**
 	 * Configure the project which have this project nature.
 	 */
+	@Override
 	public void configure() throws CoreException {
 		// Add nature-specific information
         // for the project, such as adding a builder
@@ -35,6 +36,7 @@ public class LlvmProjectNature implements IProjectNature {
 	/**
 	 * Deconfigure those projects which have this project nature.
 	 */
+	@Override
 	public void deconfigure() throws CoreException {
 		// Remove the nature-specific information.
 	}
@@ -44,6 +46,7 @@ public class LlvmProjectNature implements IProjectNature {
 	 * 
 	 * @return IProject
 	 */
+	@Override
 	public IProject getProject() {
 		return this.project;
 	}
@@ -53,6 +56,7 @@ public class LlvmProjectNature implements IProjectNature {
 	 * 
 	 * @param proj IProject
 	 */
+	@Override
 	public void setProject(IProject proj) {
 		this.project = proj;
 	}

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmListEditor.java

@@ -188,7 +188,8 @@ public abstract class LlvmListEditor extends ListEditor {
             this.buttonBox.setLayout(layout);
             createButtons(this.buttonBox);
             this.buttonBox.addDisposeListener(new DisposeListener() {
-                public void widgetDisposed(DisposeEvent event) {
+                @Override
+		public void widgetDisposed(DisposeEvent event) {
                     LlvmListEditor.this.addButton = null;
                     LlvmListEditor.this.removeButton = null;
                     LlvmListEditor.this.upButton = null;
@@ -219,7 +220,8 @@ public abstract class LlvmListEditor extends ListEditor {
             this.list.setFont(parent.getFont());
             this.list.addSelectionListener(getSelectionListener());
             this.list.addDisposeListener(new DisposeListener() {
-                public void widgetDisposed(DisposeEvent event) {
+                @Override
+		public void widgetDisposed(DisposeEvent event) {
                     LlvmListEditor.this.list = null;
                 }
             });

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/ui/preferences/LlvmPreferencePage.java

@@ -47,6 +47,7 @@ public class LlvmPreferencePage
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 

llvm/org.eclipse.cdt.managedbuilder.llvm.ui/src/org/eclipse/cdt/managedbuilder/llvm/util/LlvmResourceListener.java

@@ -26,6 +26,7 @@ public class LlvmResourceListener implements IResourceChangeListener {
 	 * 
 	 * @param event IResourceChangeEvent
 	 */
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 
 		if (event.getType() == IResourceChangeEvent.POST_BUILD) { //refresh every project after build

lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 #Fri Apr 25 15:22:29 EDT 2008
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -62,4 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF

@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Export-Package: org.eclipse.cdt.core.lrparser.tests
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java

@@ -50,6 +50,7 @@ public class LRCompletionParseTest extends TestCase {
 
 
 	private static final Comparator<IBinding> BINDING_COMPARATOR = new Comparator<IBinding>() {
+		@Override
 		public int compare(IBinding b1, IBinding b2) {
 			return b1.getName().compareTo(b2.getName());
 		}

lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF

@@ -23,6 +23,6 @@ Export-Package: org.eclipse.cdt.core.dom.lrparser,
  org.eclipse.cdt.internal.core.dom.lrparser.gpp
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.cdt.core.dom.lrparser.LRParserPlugin

memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 #Tue Nov 16 13:45:44 CET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -74,4 +74,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7

memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF

@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.debug.ui;bundle-version="3.5.0",
  org.eclipse.cdt.debug.core;bundle-version="7.0.0",
  org.eclipse.cdt.debug.ui;bundle-version="7.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.cdt.debug.ui.memory.memorybrowser,
  org.eclipse.cdt.debug.ui.memory.memorybrowser.api

memory/org.eclipse.cdt.debug.ui.memory.search/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

memory/org.eclipse.cdt.debug.ui.memory.search/.settings/org.eclipse.jdt.core.prefs

@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7