[cdt-patch] Fix for PR 42790: Memory view is not cleared when target is

["Mikhail Khodjaiants" <mikhailk@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.245
diff -u -r1.245 ChangeLog
--- ChangeLog 9 Sep 2003 19:25:07 -0000 1.245
+++ ChangeLog 10 Sep 2003 15:24:43 -0000
@@ -1,3 +1,8 @@
+2003-09-10 Mikhail Khodjaiants
+ Fix for PR 42790: Memory view is not cleared when target is terminated.
+ * CFormattedMemoryBlock.java: fire 'terminate' event when block is disposing.
+ * CMemoryManager.java: implementation of 'dispose'.
+
 2003-09-09 Mikhail Khodjaiants
  Fix for PR 39680: Gash in error message for memory view.
  * CDebugModel.java
Index: src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java,v
retrieving revision 1.3
diff -u -r1.3 CMemoryManager.java
--- src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java 2 Dec 2002 23:22:22 -0000 1.3
+++ src/org/eclipse/cdt/debug/internal/core/CMemoryManager.java 10 Sep 2003 15:24:44 -0000
@@ -46,8 +46,11 @@
  {
   for ( int i = 0; i < fBlocks.length; ++i )
   {
-   fBlocks[i].dispose();
-   fBlocks[i] = null;
+   if ( fBlocks[i] != null )
+   {
+    fBlocks[i].dispose();
+    fBlocks[i] = null;
+   }
   }
  }
 
@@ -99,6 +102,14 @@
  
  public void dispose()
  {
+  for ( int i = 0; i < fBlocks.length; ++i )
+  {
+   if ( fBlocks[i] != null )
+   {
+    fBlocks[i].dispose();
+    fBlocks[i] = null;
+   }
+  }
  }
 
  /* (non-Javadoc)
Index: src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java,v
retrieving revision 1.22
diff -u -r1.22 CFormattedMemoryBlock.java
--- src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java 28 Jul 2003 19:40:22 -0000 1.22
+++ src/org/eclipse/cdt/debug/internal/core/model/CFormattedMemoryBlock.java 10 Sep 2003 15:24:45 -0000
@@ -380,6 +380,7 @@
    fAddressExpression = null;
   }
   getCDISession().getEventManager().removeEventListener( this );
+  fireTerminateEvent();
  }
 
  /* (non-Javadoc)