Minor refactoring.

2 files changed, 24 insertions, 17 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 9890d1f22e2..16d74985edb 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,4 +1,8 @@
 2005-05-21 Mikhail Khodjaiants

+	Minor refactoring.

+	* CMemoryBlockExtension.java

+

+2005-05-21 Mikhail Khodjaiants

 	Bug 91374: CDT launch should set ATTR_PROCESS_TYPE.

 	* ICDTLaunchConfigurationConstants.java

 

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
index d91dc1bb854..299d2e3a335 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CMemoryBlockExtension.java
@@ -155,23 +155,7 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemoryBlock
 				}
 				fBytes = new MemoryByte[bytes.length];
 				for ( int i = 0; i < bytes.length; ++i ) {
-					byte cdiFlags = getCDIBlock().getFlags( i );
-					byte flags = 0;
-					if ( (cdiFlags & ICDIMemoryBlock.VALID) != 0 ) {
-						flags |= MemoryByte.HISTORY_KNOWN | MemoryByte.ENDIANESS_KNOWN;
-						if ( (cdiFlags & ICDIMemoryBlock.READ_ONLY) != 0 ) {
-							flags |= MemoryByte.READABLE;
-						}
-						else {
-							flags |= MemoryByte.READABLE | MemoryByte.WRITABLE;
-						}
-						if ( isBigEndian() ) {
-							flags |= MemoryByte.BIG_ENDIAN;
-						}
-						if ( hasChanged( getRealBlockAddress().add( BigInteger.valueOf( i ) ) ) )
-							flags |= MemoryByte.CHANGED;
-					}
-					fBytes[i] = new MemoryByte( bytes[i], flags );
+					fBytes[i] = createMemoryByte( bytes[i], getCDIBlock().getFlags( i ), hasChanged( getRealBlockAddress().add( BigInteger.valueOf( i ) ) ) );
 				}
 			}
 		}
@@ -453,4 +437,23 @@ public class CMemoryBlockExtension extends CDebugElement implements IMemoryBlock
 		}
 		return BigInteger.ZERO;
 	}
+
+	private MemoryByte createMemoryByte( byte value, byte cdiFlags, boolean changed ) {
+		byte flags = 0;
+		if ( (cdiFlags & ICDIMemoryBlock.VALID) != 0 ) {
+			flags |= MemoryByte.HISTORY_KNOWN | MemoryByte.ENDIANESS_KNOWN;
+			if ( (cdiFlags & ICDIMemoryBlock.READ_ONLY) != 0 ) {
+				flags |= MemoryByte.READABLE;
+			}
+			else {
+				flags |= MemoryByte.READABLE | MemoryByte.WRITABLE;
+			}
+			if ( isBigEndian() ) {
+				flags |= MemoryByte.BIG_ENDIAN;
+			}
+			if ( changed )
+				flags |= MemoryByte.CHANGED;
+		}
+		return new MemoryByte( value, flags );
+	}
 }