From c915146cf31a82442e4bcbe48c48c7d369664baa Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Fri, 25 Oct 2002 15:52:38 +0000
Subject: [PATCH] Replaced the usage of 'setWordSize' method by the 'reformat'
 method of 'IFormattedMemoryBlock'.

---
 debug/org.eclipse.cdt.debug.ui/ChangeLog          |  5 +++++
 .../internal/ui/actions/MemorySizeAction.java     | 15 +++++++++++++--
 .../internal/ui/views/memory/MemoryViewer.java    |  5 +++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index d34a890ed73..18f14aa7cd1 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-25 Mikhail Khodjaiants
+	Replaced the usage of 'setWordSize' method by the 'reformat' method of 'IFormattedMemoryBlock'.
+	* MemorySizeAction.java
+	* MemoryViewer.java
+
 2002-10-24 Mikhail Khodjaiants
 	Set the 'relationship' attribute value to 'stack' for the 'MemoryView' perspective extension.
 	* plugin.xml
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java
index 2ffa4dc3f9a..f30fa695770 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java
@@ -7,6 +7,9 @@ package org.eclipse.cdt.debug.internal.ui.actions;
 
 import org.eclipse.cdt.debug.core.IFormattedMemoryBlock;
 import org.eclipse.cdt.debug.internal.ui.views.memory.MemoryViewer;
+import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.debug.core.DebugException;
 import org.eclipse.jface.action.Action;
 import org.eclipse.ui.texteditor.IUpdate;
 
@@ -76,8 +79,16 @@ public class MemorySizeAction extends Action implements IUpdate
 	 */
 	public void run()
 	{
-		fGroup.setCurrentSelection( this );
-		fMemoryViewer.setWordSize( fId );
+		try
+		{
+			fMemoryViewer.setWordSize( fId );
+			fGroup.setCurrentSelection( this );
+		}
+		catch( DebugException e )
+		{
+			CDebugUIPlugin.errorDialog( e.getMessage(), (IStatus)null );
+			setChecked( false );
+		}
 	}
 	
 	public String getActionId()
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java
index 24d9c1b1fa3..5ab72e1a526 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java
@@ -7,6 +7,7 @@ package org.eclipse.cdt.debug.internal.ui.views.memory;
 
 import org.eclipse.cdt.debug.core.ICMemoryManager;
 import org.eclipse.cdt.debug.core.IFormattedMemoryBlock;
+import org.eclipse.debug.core.DebugException;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ContentViewer;
 import org.eclipse.jface.viewers.ISelection;
@@ -216,12 +217,12 @@ public class MemoryViewer extends ContentViewer
 		return ( block != null ) ? block.getWordSize() : 0;
 	}
 	
-	public void setWordSize( int size )
+	public void setWordSize( int size ) throws DebugException
 	{
 		IFormattedMemoryBlock block = ((MemoryControlArea)fTabFolder.getSelection().getControl()).getMemoryBlock();
 		if ( block != null )
 		{ 
-			block.setWordSize( size );
+			block.reformat( block.getFormat(), size, block.getNumberOfRows(), block.getNumberOfColumns() );
 			((MemoryControlArea)fTabFolder.getSelection().getControl()).refresh();
 		}
 	}