partial fix for Bugzilla 265882

22 files changed, 84 insertions, 61 deletions

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
index 06647cd74c8..d37183d630f 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
@@ -24,7 +24,6 @@ import org.eclipse.cdt.dsf.datamodel.DMContexts;
 import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl;
 import org.eclipse.cdt.dsf.debug.service.IStack;
-import org.eclipse.cdt.dsf.debug.service.IStack2;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IContainerSuspendedDMEvent;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext;
@@ -190,14 +189,13 @@ public class StackFramesVMNode extends AbstractDMVMNode
                 });
             
         } else {
-        	if (startIndex >= 0 && update.getLength() > 0 && stackService instanceof IStack2) {
+        	if (startIndex >= 0 && update.getLength() > 0) {
             	// partial stack dump
-        		IStack2 stackService2= (IStack2) stackService;
                 int endIndex= startIndex + update.getLength() - 1;
             	if (startIndex < stackFrameLimit && endIndex >= stackFrameLimit) {
             		endIndex = stackFrameLimit - 1;
             	}
-				stackService2.getFrames(
+            	stackService.getFrames(
                     execDmc, 
                     startIndex,
                     endIndex,
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpointAttributeTranslator.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpointAttributeTranslator.java
index fe158fb3073..3d7761d0d37 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpointAttributeTranslator.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpointAttributeTranslator.java
@@ -18,6 +18,11 @@ import org.eclipse.cdt.dsf.debug.service.IBreakpoints.IBreakpointDMContext;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.model.IBreakpoint;
 
+/**
+ * Breakpoint attribute translator interface
+ * 
+ * @since 1.0
+ */
 
 @ThreadSafeAndProhibitedFromDsfExecutor("")
 public interface IBreakpointAttributeTranslator {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpoints.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpoints.java
index 1fca358fa57..cafc79c1d4d 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpoints.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IBreakpoints.java
@@ -23,6 +23,8 @@ import org.eclipse.cdt.dsf.service.IDsfService;
 
 /**
  * Breakpoint service interface
+ * 
+ * @since 1.0
  */
 public interface IBreakpoints extends IDsfService {
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ICachingService.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ICachingService.java
index 35d61287299..954312f5cac 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ICachingService.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ICachingService.java
@@ -14,6 +14,7 @@ import org.eclipse.cdt.dsf.datamodel.IDMContext;
 
 /**
  * Interface for services which use an internal cache for data.
+ * 
  * @since 1.1  
  */
 public interface ICachingService {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDisassembly.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDisassembly.java
index 0f751e32aac..3a949174dc0 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDisassembly.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDisassembly.java
@@ -19,6 +19,8 @@ import org.eclipse.cdt.dsf.service.IDsfService;
 
 /**
  * Disassembly service interface
+ * 
+ * @since 1.0
  */
 public interface IDisassembly extends IDsfService {
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfBreakpointExtension.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfBreakpointExtension.java
index e71d8091b2c..fadd7b33796 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfBreakpointExtension.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfBreakpointExtension.java
@@ -30,6 +30,7 @@ import org.eclipse.core.runtime.CoreException;
  * plugins that declare them are not loaded unless requested by a client.   
  * 
  * @see ICBreakpoint#getExtension(String, Class)
+ * @since 1.0
  */
 public interface IDsfBreakpointExtension extends ICBreakpointExtension {
    
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfDebugServicesFactory.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfDebugServicesFactory.java
index 5b3aab48852..df79daf8714 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfDebugServicesFactory.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IDsfDebugServicesFactory.java
@@ -15,6 +15,7 @@ import org.eclipse.cdt.dsf.service.DsfSession;
 /**
  * A factory to create DSF services.  Using this interface allows
  * to easily have different service implementation for different backends.
+ * 
  * @since 1.1
  */
 public interface IDsfDebugServicesFactory {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java
index adedef76125..0ba1bedc786 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IExpressions.java
@@ -24,6 +24,8 @@ import org.eclipse.cdt.dsf.datamodel.IDMEvent;
  * Expressions service provides access to the debugger's expression evaluator. This service has
  * dependencies on the Stack service, as it is be used to provide context for an 
  * expression to be evaluated.
+ * 
+ * @since 1.0
  */
 @SuppressWarnings("nls")
 public interface IExpressions extends IFormattedValues {
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IFormattedValues.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IFormattedValues.java
index 5cc665aebb3..31dc1493c02 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IFormattedValues.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IFormattedValues.java
@@ -17,6 +17,13 @@ import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.datamodel.IDMData;
 import org.eclipse.cdt.dsf.datamodel.IDMService;
 
+/**
+ * Formatted values interface describes the kinds of formatted information
+ * which may be returned and the methods for obtaining and manipulating
+ * those values.
+ * 
+ * @since 1.0
+ */
 public interface IFormattedValues extends IDMService {
     
     /** Marker interface for a DMC that has a formatted value. */
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstruction.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstruction.java
index dd547ff5746..eb27d286448 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstruction.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IInstruction.java
@@ -15,6 +15,8 @@ import java.math.BigInteger;
 
 /**
  * Represents an assembly instruction
+ * 
+ * @since 1.0
  */
 public interface IInstruction {
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMemory.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMemory.java
index a8444301527..8740d2998d7 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMemory.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMemory.java
@@ -24,6 +24,8 @@ import org.eclipse.debug.core.model.MemoryByte;
  * Service for accessing memory.  Memory contexts are not meant to be 
  * represented in tree or table views, so it doesn't need to implement
  * IDMService interface. 
+ * 
+ * @since 1.0
  */
 public interface IMemory extends IDsfService {
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMixedInstruction.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMixedInstruction.java
index 511f81f1785..0d12b186231 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMixedInstruction.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IMixedInstruction.java
@@ -13,6 +13,8 @@ package org.eclipse.cdt.dsf.debug.service;
 
 /**
  * Represents the assembly instruction(s) corresponding to a source line
+ * 
+ * @since 1.0
  */
 public interface IMixedInstruction {
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IModules.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IModules.java
index c01ea5db89a..92088dd2d1e 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IModules.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IModules.java
@@ -17,7 +17,9 @@ import org.eclipse.cdt.dsf.datamodel.IDMEvent;
 import org.eclipse.cdt.dsf.service.IDsfService;
 
 /**
- * Debugger service representing module handling logic of a debugger.  
+ * Debugger service representing module handling logic of a debugger.
+ * 
+ * @since 1.0
  */
 public interface IModules extends IDsfService {
     
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IProcesses.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IProcesses.java
index db65c2c89ed..469f4d523d5 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IProcesses.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IProcesses.java
@@ -25,6 +25,7 @@ import org.eclipse.cdt.dsf.datamodel.IDMService;
  * information, manipulation methods, and debugging methods.
  * This service provides a relatively simple interface for 
  * manipulating processes as compared with a full-blown
+ * 
  * remote target debugger. 
  * @since 1.1
  */
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRegisters.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRegisters.java
index 7397ead772b..79bdb0acd63 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRegisters.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRegisters.java
@@ -18,6 +18,8 @@ import org.eclipse.cdt.dsf.datamodel.IDMEvent;
 
 /**
  * Service for accessing register data.
+ * 
+ * @since 1.0
  */
 public interface IRegisters extends IFormattedValues {
     
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java
index 181d2f44418..6a09d97fc82 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IRunControl.java
@@ -25,6 +25,8 @@ import org.eclipse.cdt.dsf.datamodel.IDMService;
  * even have methods for getting labels.  That's because it is expected that
  * higher level services, ones that deal with processes, kernels, or target 
  * features will provide that functionality. 
+ * 
+ * @since 1.0
  */
 public interface IRunControl extends IDMService
 {
@@ -120,7 +122,18 @@ public interface IRunControl extends IDMService
     boolean isSuspended(IExecutionDMContext context);
     void resume(IExecutionDMContext context, RequestMonitor requestMonitor);
     void suspend(IExecutionDMContext context, RequestMonitor requestMonitor);
-    public enum StepType { STEP_OVER, STEP_INTO, STEP_RETURN, INSTRUCTION_STEP_OVER, INSTRUCTION_STEP_INTO, INSTRUCTION_STEP_RETUTRN };
+    
+    public enum StepType { 
+    	STEP_OVER, 
+    	STEP_INTO, 
+    	STEP_RETURN, 
+    	INSTRUCTION_STEP_OVER, 
+    	INSTRUCTION_STEP_INTO,
+        /**
+	     * @since 2.0
+	     */
+        INSTRUCTION_STEP_RETURN };
+        
     boolean isStepping(IExecutionDMContext context);
     void canStep(IExecutionDMContext context, StepType stepType, DataRequestMonitor<Boolean> rm);
     void step(IExecutionDMContext context, StepType stepType, RequestMonitor requestMonitor);
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java
index 3fba2d7da39..711d47075cb 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISignals.java
@@ -14,7 +14,9 @@ import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.service.IDsfService;
 
 /**
+ * Place holder interface for a signals implementation.
  * 
+ * @since 1.0
  */
 public interface ISignals extends IDsfService {
     /**
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISourceLookup.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISourceLookup.java
index b92dd3c83b1..6bf6fe08ac1 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISourceLookup.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISourceLookup.java
@@ -20,6 +20,8 @@ import org.eclipse.cdt.dsf.service.IDsfService;
  * primarily by other services that need to access source-path mappings, such
  * as the breakpoints service.  For UI components, the platform source lookup
  * interfaces could be sufficient.
+ * 
+ * @since 1.0
  */
 public interface ISourceLookup extends IDsfService {
 
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java
index 70df43d90a8..08c731b816d 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack.java
@@ -19,6 +19,8 @@ import org.eclipse.cdt.dsf.datamodel.IDMService;
 /**
  * Stack service provides access to stack information for a 
  * given execution context.
+ * 
+ * @since 1.0
  */
 public interface IStack extends IDMService {
 
@@ -82,11 +84,35 @@ public interface IStack extends IDMService {
     void getFrames(IDMContext execContext, DataRequestMonitor<IFrameDMContext[]> rm);
     
     /**
+	 * When passed in the endIndex of getFrames(...) it indicates that all stack frames are to be retrieved.
+	 * @since 2.0
+	 */
+    public final static int ALL_FRAMES = -1;
+	
+	/**
+	 * Retrieves list of stack frames for the given execution context.  Request
+	 * will fail if the stack frame data is not available. 
+	 * <p>The range of stack frames can be limited by the <code>startIndex</code> and <code>endIndex</code> arguments. 
+	 * It is no error to specify an <code>endIndex</code> exceeding the number of available stack frames.
+	 * A negative value for <code>endIndex</code> means to retrieve all stack frames. <code>startIndex</code> must be a non-negative value.
+	 * </p>
+	 * 
+	 * @param execContext  the execution context to retrieve stack frames for
+	 * @param startIndex  the index of the first frame to retrieve
+	 * @param endIndex  the index of the last frame to retrieve (inclusive) or {@link #ALL_FRAMES}
+	 * @param rm  the request monitor
+	 * 
+	 * @see #getFrames(IDMContext, DataRequestMonitor)
+	 * @since 2.0
+	 */
+	public abstract void getFrames(IDMContext execContext, int startIndex, int endIndex, DataRequestMonitor<IFrameDMContext[]> rm);
+	
+    /**
      * Retrieves the top stack frame for the given execution context.  
      * Retrieving just the top frame DMC and corresponding data can be much 
      * more efficient than just retrieving the whole stack, before the data
      * is often included in the stopped event.  Also for some UI functionality, 
-     * such as setpping, only top stack frame is often needed. 
+     * such as stepping, only top stack frame is often needed. 
      * @param execContext
      * @param rm
      */
@@ -110,6 +136,4 @@ public interface IStack extends IDMService {
      * @param rm Callback 
      */
     void getStackDepth(IDMContext dmc, int maxDepth, DataRequestMonitor<Integer> rm);
-
-        
 }
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack2.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack2.java
deleted file mode 100644
index ae2f507839f..00000000000
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/IStack2.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Wind River Systems - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.dsf.debug.service;
-
-import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
-import org.eclipse.cdt.dsf.datamodel.IDMContext;
-
-/**
- * Stack service extension.
- * <p>
- * Adds the capability to retrieve a limited number of stack frames.
- * </p>
- * 
- * @since DSF 1.1
- */
-public interface IStack2 extends IStack {
-
-	/**
-	 * Convenience constant for use with {@link #getFrames(IDMContext, int, int, DataRequestMonitor)}
-	 * to retrieve all stack frames.
-	 */
-	public final static int ALL_FRAMES = -1;
-
-	/**
-	 * Retrieves list of stack frames for the given execution context.  Request
-	 * will fail if the stack frame data is not available. 
-	 * <p>The range of stack frames can be limited by the <code>startIndex</code> and <code>endIndex</code> arguments. 
-	 * It is no error to specify an <code>endIndex</code> exceeding the number of available stack frames.
-	 * A negative value for <code>endIndex</code> means to retrieve all stack frames. <code>startIndex</code> must be a non-negative value.
-	 * </p>
-	 * 
-	 * @param execContext  the execution context to retrieve stack frames for
-	 * @param startIndex  the index of the first frame to retrieve
-	 * @param endIndex  the index of the last frame to retrieve (inclusive) or {@link #ALL_FRAMES}
-	 * @param rm  the request monitor
-	 * 
-	 * @see #getFrames(IDMContext, DataRequestMonitor)
-	 */
-	public abstract void getFrames(IDMContext execContext, int startIndex, int endIndex, DataRequestMonitor<IFrameDMContext[]> rm);
-
-}
diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISymbols.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISymbols.java
index bf92dd13caa..f66b63a52fb 100644
--- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISymbols.java
+++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/ISymbols.java
@@ -20,7 +20,9 @@ import org.eclipse.cdt.dsf.datamodel.IDMService;
  * Service for accessing debugger symbols.  This service builds on the Modules
  * service, but not all debuggers provide access for parsing symbols so this
  * service is separated.
+ * 
  * @see IModules
+ * @since 1.0
  */
 public interface ISymbols extends IDMService {
     public interface ISymbolObjectDMContext extends IDMContext {}
@@ -37,7 +39,7 @@ public interface ISymbols extends IDMService {
     /**
      * Indicates that the list of symbol objects is changed.  Parsing debug 
      * symbols can be a long running operation (order of 10's of seconds or 
-     * minues), so it is useful for the service to provide access to the data
+     * minutes), so it is useful for the service to provide access to the data
      * even while it's still parsing.  This event may be issued periodically
      * by the service to indicate that a section of debug symbols has been 
      * parsed.
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 ddcddd08819..ac6c401f637 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
@@ -23,7 +23,6 @@ import org.eclipse.cdt.dsf.datamodel.IDMContext;
 import org.eclipse.cdt.dsf.debug.service.ICachingService;
 import org.eclipse.cdt.dsf.debug.service.IRunControl;
 import org.eclipse.cdt.dsf.debug.service.IStack;
-import org.eclipse.cdt.dsf.debug.service.IStack2;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IExecutionDMContext;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.IResumedDMEvent;
 import org.eclipse.cdt.dsf.debug.service.IRunControl.ISuspendedDMEvent;
@@ -52,7 +51,7 @@ import org.osgi.framework.BundleContext;
  * this service is initialized.
  * </p>
  */
-public class PDAStack extends AbstractDsfService implements IStack2, ICachingService {
+public class PDAStack extends AbstractDsfService implements IStack, ICachingService {
 
     /**
      * PDA stack frame contains only the stack frame level.  It is only