[cdt-patch] Collapsing of the variable's tree.

["Mikhail Khodjaiants" <mikhailkhod@xxxxxxxxxx>]

Correct detail value should be set to the 'resume' event to prevent the collapse of variable's and register's trees after stepping.

 

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.13
diff -u -r1.13 ChangeLog
--- ChangeLog 14 Oct 2002 05:03:22 -0000 1.13
+++ ChangeLog 15 Oct 2002 02:02:48 -0000
@@ -1,4 +1,8 @@
 2002-10-14 Mikhail Khodjaiants
+ * CThread.java: Set the correct detail for 'resume' event to prevent collapsing of the variable's and
+ register's trees after stepping.
+
+2002-10-14 Mikhail Khodjaiants
  * ISwitchToThread.java: New method to get the current thread.
  * CDebugTarget.java: Implemented the 'getCurrentThread' method of the 'ISwitchToThread' interface.
  * CDebugTarget.java: Fix in the 'setCurrentThread' method.
Index: src/org/eclipse/cdt/debug/internal/core/model/CThread.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java,v
retrieving revision 1.14
diff -u -r1.14 CThread.java
--- src/org/eclipse/cdt/debug/internal/core/model/CThread.java 10 Oct 2002 22:16:14 -0000 1.14
+++ src/org/eclipse/cdt/debug/internal/core/model/CThread.java 15 Oct 2002 02:02:50 -0000
@@ -831,38 +831,32 @@
   setLastStackFrame( null );
   int state = IState.RUNNING;
   int detail = DebugEvent.UNSPECIFIED;
-  if ( isCurrent() )
+  switch( event.getType() )
   {
-   switch( event.getType() )
-   {
-    case ICDIResumedEvent.CONTINUE:
-     detail = DebugEvent.CLIENT_REQUEST;
-     state = IState.RUNNING;
-     disposeStackFrames();
-     break;
-    case ICDIResumedEvent.STEP_INTO:
-    case ICDIResumedEvent.STEP_INTO_INSTRUCTION:
-     detail = DebugEvent.STEP_INTO;
-     state = IState.STEPPING;
-     preserveStackFrames();
-     break;
-    case ICDIResumedEvent.STEP_OVER:
-    case ICDIResumedEvent.STEP_OVER_INSTRUCTION:
-     detail = DebugEvent.STEP_OVER;
-     state = IState.STEPPING;
-     preserveStackFrames();
-     break;
-    case ICDIResumedEvent.STEP_RETURN:
-     detail = DebugEvent.STEP_RETURN;
-     state = IState.STEPPING;
-     preserveStackFrames();
-     break;
-   }
+   case ICDIResumedEvent.CONTINUE:
+    detail = DebugEvent.RESUME;
+    break;
+   case ICDIResumedEvent.STEP_INTO:
+   case ICDIResumedEvent.STEP_INTO_INSTRUCTION:
+    detail = DebugEvent.STEP_INTO;
+    break;
+   case ICDIResumedEvent.STEP_OVER:
+   case ICDIResumedEvent.STEP_OVER_INSTRUCTION:
+    detail = DebugEvent.STEP_OVER;
+    break;
+   case ICDIResumedEvent.STEP_RETURN:
+    detail = DebugEvent.STEP_RETURN;
+    break;
+  }
+  if ( isCurrent() && event.getType() != ICDIResumedEvent.CONTINUE )
+  {
+   preserveStackFrames();
+   state = IState.STEPPING;
   }
   else
   {
    disposeStackFrames();
-   detail = DebugEvent.CLIENT_REQUEST;
+   state = IState.RUNNING;
   }
   setCurrentStateId( state );
   setCurrentStateInfo( null );