Move some leftover plugins from Java 5 to Java 7.

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

18 files changed, 212 insertions, 63 deletions

diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/.classpath b/dsf/org.eclipse.cdt.examples.dsf.pda/.classpath
index 8fe3727bbf5..71d7158fdcf 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/.classpath
+++ b/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>
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.core.prefs b/dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.core.prefs
index cfb0bdd17eb..b8cc9dec3d7 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/.settings/org.eclipse.jdt.core.prefs
+++ b/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
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF
index 556e410a81e..bf009bfbde1 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF
+++ b/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
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDALineBreakpoint.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDALineBreakpoint.java
index 9f8742ffe56..904b354aba8 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDALineBreakpoint.java
+++ b/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;
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDAWatchpoint.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDAWatchpoint.java
index 8752066c519..2846ead5751 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/breakpoints/PDAWatchpoint.java
+++ b/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;
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java
index 709cc57bd5a..c7effba8551 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunchDelegate.java
+++ b/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) {
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpointAttributeTranslator.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpointAttributeTranslator.java
index 3b3a18a0bfe..29650ed280c 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpointAttributeTranslator.java
+++ b/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;
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpoints.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpoints.java
index 4cfff5da9f8..58e2b65a81e 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDABreakpoints.java
+++ b/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");
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDACommandControl.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDACommandControl.java
index 93913b2f4b0..1611924bb33 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDACommandControl.java
+++ b/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();
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java
index 8499b274aa1..9d0f563a697 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAExpressions.java
+++ b/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);
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java
index 95afe88ae9c..64dbf4cf867 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARegisters.java
+++ b/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; }
-        public String getDescription() { return "Description of the " + fName + " register group"; }
+        @Override
+	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; }
-        public boolean isReadOnce() { return false; }
-        public boolean isWriteable() { return fRegister.fWritable; }
-        public boolean isWriteOnce() { return false; }
-        public boolean hasSideEffects() { return false; }
-        public boolean isVolatile() { return true; }
+        @Override
+	public boolean isReadable() { return true; }
+        @Override
+	public boolean isReadOnce() { return false; }
+        @Override
+	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; }
-        public String getName() { return fRegister.fName; }
-        public String getDescription() { return "Description of the " + fRegister.fName + " register"; }
+        @Override
+	public boolean isFloat() { return false; }
+        @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; }
-        public String getLongName()  { return fName; }
+        @Override
+	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; }
-                    public int bitCount() { return fBitField.fCount; }
+                    @Override
+		    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;  }
-        public IMnemonic[] getMnemonics()     { return fMnemonics;  }
+        @Override
+	public IBitGroup[] getBitGroup()      { return fBitGroups;  }
+        @Override
+	public IMnemonic[] getMnemonics()     { return fMnemonics;  }
         
-        public boolean isZeroBasedNumbering() { return true; }
-        public boolean isZeroBitLeftMost()    { return true; }
-        public boolean isReadable()           { return true; }
-        public boolean isReadOnce()           { return false; }
-        public boolean isWriteable()          { return true; }
-        public boolean isWriteOnce()          { return false; }
-        public boolean hasSideEffects()       { return false; }
+        @Override
+	public boolean isZeroBasedNumbering() { return true; }
+        @Override
+	public boolean isZeroBitLeftMost()    { return true; }
+        @Override
+	public boolean isReadable()           { return true; }
+        @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; }
-        public String  getDescription()  { return "Description of the " + fBitField.fName + " bit field"; }
+        @Override
+	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);
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java
index 4084d992e82..c0d4b5a8886 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDARunControl.java
+++ b/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());
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java
index d68e7f3169c..3639482c65d 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAStack.java
+++ b/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);	
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAVirtualMachineDMContext.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAVirtualMachineDMContext.java
index c8052ffdfcf..6197443eda1 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/PDAVirtualMachineDMContext.java
+++ b/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();
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/AbstractPDACommand.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/AbstractPDACommand.java
index 3b8219893a0..9d2c90150f0 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/AbstractPDACommand.java
+++ b/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;
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDACommandResult.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDACommandResult.java
index a43e08b99b1..930c67b3e2d 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/service/commands/PDACommandResult.java
+++ b/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;
     }
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourceLookupDirector.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourceLookupDirector.java
index e56392a02f7..b72dd58d594 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourceLookupDirector.java
+++ b/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.
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourcePathComputerDelegate.java b/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourcePathComputerDelegate.java
index c5dc4d0d400..b56a5c0b699 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/sourcelookup/PDASourcePathComputerDelegate.java
+++ b/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;