Removing of ICDISteppingEvent

9 files changed, 53 insertions, 66 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java
index 1728add1882..65d340736bc 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIExpressionManager.java
@@ -50,4 +50,9 @@ public interface ICDIExpressionManager extends ICDISessionObject
 	 * @throws CDIException on failure. Reasons include:
 	 */
 	ICDIExpression[] getExpressions() throws CDIException;
+	
+	/**
+	 * Return a ICDICondition
+	 */
+	ICDICondition createCondition(int ignoreCount, String expression);
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java
index 277c416415e..e4e2baa19d7 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISourceManager.java
@@ -38,4 +38,9 @@ public interface ICDISourceManager extends ICDISessionObject
 	 * @throws CDIException on failure. Reasons include:
 	 */
 	void reset() throws CDIException;
+	
+	/**
+	 * Returns a ICDILocation
+	 */
+	ICDILocation createLocation(String file, String function, int line);
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java
index a7a14b025da..e93899b15d7 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDIResumedEvent.java
@@ -16,6 +16,17 @@ package org.eclipse.cdt.debug.core.cdi.event;
  * 
  * @since Jul 10, 2002
  */
-public interface ICDIResumedEvent extends ICDIEvent
-{
+public interface ICDIResumedEvent extends ICDIEvent {
+	final static public int STEP_OVER = 0;
+	final static public int STEP_INTO = 1;
+	final static public int STEP_OVER_INSTRUCTION = 2;
+	final static public int STEP_INTO_INSTRUCTION = 3;
+	final static public int STEP_RETURN = 4;
+
+	/**
+	 * Returns the stepping type.
+	 * 
+	 * @return the stepping type
+	 */
+	int getType();
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISteppingEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISteppingEvent.java
deleted file mode 100644
index fb0d5a0f85d..00000000000
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISteppingEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *(c) Copyright QNX Software Systems Ltd. 2002.
- * All Rights Reserved.
- * 
- */
-package org.eclipse.cdt.debug.core.cdi.event;
-
-/**
- * 
- * Can be originated by an ICDIThread object when the thread is 
- * being resumed by a request to step.
- * 
- * @since Jul 10, 2002
- */
-public interface ICDISteppingEvent extends ICDIEvent
-{
-	final static public int STEP_OVER = 0;
-	final static public int STEP_INTO = 1;
-	final static public int STEP_OVER_INSTRUCTION = 2;
-	final static public int STEP_INTO_INSTRUCTION = 3;
-	final static public int STEP_RETURN = 4;
-
-	/**
-	 * Returns the stepping type.
-	 * 
-	 * @return the stepping type
-	 */
-	int getType();
-}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
index 76e9c6bd9a7..3605b71e5c3 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/event/ICDISuspendedEvent.java
@@ -35,12 +35,5 @@ public interface ICDISuspendedEvent extends ICDIEvent
 	 * @return ICDIObject
 	 */
 	ICDISessionObject getReason();
-	
-	/**
-	 * Returns the current stack frame.
-	 * 
-	 * @return the current stack frame
-	 */
-	ICDIStackFrame getStackFrame();
 
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
index 00ae0b6aa0c..7ea6638ebfa 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
@@ -174,12 +174,13 @@ public interface ICDITarget extends ICDIObject
 	 */
 	void suspend() throws CDIException;
 
-	/**
+	/*
 	 * Returns whether this target is is currently stepping.
 	 *
 	 * @return whether this target is currently stepping
-	 */
+	 
 	boolean isStepping();
+	*/
 	
 	/**
 	 * Steps over the current source line. Can only be called
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java
index c8ee0f9199c..f5b90231ee3 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDIThread.java
@@ -52,13 +52,14 @@ public interface ICDIThread extends ICDIObject
 	 */
 	void suspend() throws CDIException;
 
-	/**
+	/*
 	 * Returns whether this thread is is currently stepping.
 	 *
 	 * @return whether this thread is currently stepping
-	 */
+	 *
 	boolean isStepping();
-	
+	 */
+	 
 	/**
 	 * Steps over the current source line. Can only be called
 	 * when the associated thread is suspended. 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
index 33f06217ace..b63fd5d066a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
@@ -30,7 +30,7 @@ import org.eclipse.cdt.debug.core.cdi.event.ICDIExitedEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDILoadedEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIRestartedEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent;
-import org.eclipse.cdt.debug.core.cdi.event.ICDISteppingEvent;
+//import org.eclipse.cdt.debug.core.cdi.event.ICDISteppingEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDISuspendedEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIDestroyedEvent;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
@@ -692,13 +692,13 @@ public class CDebugTarget extends CDebugElement
 					handleRestartedEvent( (ICDIRestartedEvent)event );
 				}
 			}
-			else if ( event instanceof ICDISteppingEvent )
-			{
-				if ( source instanceof ICDITarget )
-				{
-					handleSteppingEvent( (ICDISteppingEvent)event );
-				}
-			}
+			//else if ( event instanceof ICDISteppingEvent )
+			//{
+			//	if ( source instanceof ICDITarget )
+			//	{
+			//		handleSteppingEvent( (ICDISteppingEvent)event );
+			//	}
+			//}
 		}
 	}
 
@@ -1018,13 +1018,13 @@ public class CDebugTarget extends CDebugElement
 	private void handleRestartedEvent( ICDIRestartedEvent event )
 	{
 	}
-
+/*
 	private void handleSteppingEvent( ICDISteppingEvent event )
 	{
 		setCurrentStateId( IState.STEPPING );
 		setCurrentStateInfo( null );
 	}
-
+*/
 	private void handleThreadCreatedEvent( ICDICreatedEvent event )
 	{
 		ICDIThread cdiThread = (ICDIThread)event.getSource();
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java
index 70836c3331b..3f75f8106db 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CThread.java
@@ -25,7 +25,7 @@ import org.eclipse.cdt.debug.core.cdi.event.ICDIDisconnectedEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIEventListener;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIResumedEvent;
-import org.eclipse.cdt.debug.core.cdi.event.ICDISteppingEvent;
+//import org.eclipse.cdt.debug.core.cdi.event.ICDISteppingEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDISuspendedEvent;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIDestroyedEvent;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIObject;
@@ -413,13 +413,13 @@ public class CThread extends CDebugElement
 					handleChangedEvent( (ICDIChangedEvent)event );
 				}
 			}
-			else if ( event instanceof ICDISteppingEvent )
-			{
-				if ( source instanceof ICDIThread )
-				{
-					handleSteppingEvent( (ICDISteppingEvent)event );
-				}
-			}
+			//else if ( event instanceof ICDISteppingEvent )
+			//{
+			//	if ( source instanceof ICDIThread )
+			//	{
+			//		handleSteppingEvent( (ICDISteppingEvent)event );
+			//	}
+			//}
 		}
 	}
 
@@ -882,11 +882,11 @@ public class CThread extends CDebugElement
 	{
 	}
 
-	private void handleSteppingEvent( ICDISteppingEvent event )
-	{
-		setCurrentStateId( IState.STEPPING );
-		setCurrentStateInfo( null );
-	}
+	//private void handleSteppingEvent( ICDISteppingEvent event )
+	//{
+	//	setCurrentStateId( IState.STEPPING );
+	//	setCurrentStateInfo( null );
+	//}
 
 	/** 
 	 * Cleans up the internal state of this thread.