Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] Replaced 'setWordSize' method by 'reformat'

Replaced the usage of 'setWordSize' method by the 'reformat' method of 'IFormattedMemoryBlock'.

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.16
diff -u -r1.16 ChangeLog
--- ChangeLog 25 Oct 2002 04:10:28 -0000 1.16
+++ ChangeLog 25 Oct 2002 15:51:28 -0000
@@ -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
Index: src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java,v
retrieving revision 1.2
diff -u -r1.2 MemorySizeAction.java
--- src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java 25 Oct 2002 04:04:10 -0000 1.2
+++ src/org/eclipse/cdt/debug/internal/ui/actions/MemorySizeAction.java 25 Oct 2002 15:51:28 -0000
@@ -7,6 +7,9 @@
 
 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 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()
Index: src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java,v
retrieving revision 1.11
diff -u -r1.11 MemoryViewer.java
--- src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java 25 Oct 2002 04:04:10 -0000 1.11
+++ src/org/eclipse/cdt/debug/internal/ui/views/memory/MemoryViewer.java 25 Oct 2002 15:51:28 -0000
@@ -7,6 +7,7 @@
 
 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 @@
   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();
   }
  }


Back to the top