Attachment 168813 Details for Bug 312098 – Fix regression to memory space support.

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix regression to memory space support.

patch_312098_2 (text/plain), 3.71 KB, created by John Cortell

on 2010-05-17 16:00:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Cortell

Created: 2010-05-17 16:00:27 EDT

Size: 3.71 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.debug.ui.memory.memorybrowser
>Index: src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java,v
>retrieving revision 1.22
>diff -u -r1.22 MemoryBrowser.java
>--- src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java	16 May 2010 03:20:21 -0000	1.22
>+++ src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java	17 May 2010 19:55:07 -0000
>@@ -771,33 +771,41 @@
> 					return;
> 				}
> 				
>-				CTabItem tabItem = activeFolder.getSelection();
>-				if (tabItem != null) {
>-					if(memorySpaces.length > 0)	{
>-						fGotoMemorySpaceControl.setVisible(true);
>-						fGotoMemorySpaceControl.setItems(memorySpaces);
>-						
>-						// the n/a entry; don't think this needs to be translated
>-						fGotoMemorySpaceControl.add(NA_MEMORY_SPACE_ID, 0); //$NON-NLS-1$ 
>-					}
>-					else {
>-						fGotoMemorySpaceControl.setVisible(false);
>-						fGotoMemorySpaceControl.setItems(new String[0]);
>-					}
>-	
>-					updateMemorySpaceControlSelection(tabItem);
>+				if (memorySpaces.length > 0)	{
>+					fGotoMemorySpaceControl.setItems(memorySpaces);
>+					fGotoMemorySpaceControl.add(NA_MEMORY_SPACE_ID, 0); //$NON-NLS-1$  the n/a entry; don't think this needs to be translated
>+					setMemorySpaceControlVisible(true);
>+				}
>+				else {
>+					fGotoMemorySpaceControl.setItems(new String[0]);
>+					setMemorySpaceControlVisible(false);					
> 				}
>+
>+				updateMemorySpaceControlSelection(activeFolder.getSelection());
>+				
> 				fStackLayout.topControl.getParent().layout(true);
> 			}
> 		});
> 	}
>+	
>+	private void setMemorySpaceControlVisible(boolean visible) {
>+		FormData data = (FormData)fGotoAddressBarControl.getLayoutData();
>+		if (visible) {
>+			data.left = new FormAttachment(fGotoMemorySpaceControl);
>+		}
>+		else {
>+			data.left = new FormAttachment(0);
>+		}
>+		fGotoMemorySpaceControl.setVisible(visible);
>+
>+	}
> 
> 	/**
> 	 * Update the selection in the memory space combobox to reflect the memory
> 	 * space being shown in the given tab
> 	 * 
> 	 * @param item
>-	 *            the active tab
>+	 *            the active tab; may be null if in a "fresh" memory browser instance
> 	 */
> 	private void updateMemorySpaceControlSelection(CTabItem item) {
> 		String[] memorySpaces = fGotoMemorySpaceControl.getItems();
>@@ -806,20 +814,24 @@
> 			// is one of the ones now available. If it isn't, then select
> 			// the first available one and update the tab data 
> 			boolean foundIt = false;
>-			String currentMemorySpace = (String) item.getData(KEY_MEMORY_SPACE);
>-			if (currentMemorySpace != null)			{
>-				assert currentMemorySpace.length() > 0;
>-				for (String memorySpace : memorySpaces) {
>-					if (memorySpace.equals(currentMemorySpace)) {
>-						foundIt = true;
>-						fGotoMemorySpaceControl.setText(currentMemorySpace);
>-						break;
>+			if (item != null) {
>+				String currentMemorySpace = (String) item.getData(KEY_MEMORY_SPACE);
>+				if (currentMemorySpace != null)			{
>+					assert currentMemorySpace.length() > 0;
>+					for (String memorySpace : memorySpaces) {
>+						if (memorySpace.equals(currentMemorySpace)) {
>+							foundIt = true;
>+							fGotoMemorySpaceControl.setText(currentMemorySpace);
>+							break;
>+						}
> 					}
> 				}
> 			}
> 			if (!foundIt) {
> 				fGotoMemorySpaceControl.select(0);
>-				item.setData(KEY_MEMORY_SPACE, null);
>+				if (item != null) {
>+					item.setData(KEY_MEMORY_SPACE, null);
>+				}
> 			}
> 			fGotoMemorySpaceControl.setVisible(true);
> 		}

Flags:

john.cortell: iplog-

Actions: View | Diff

Attachments on bug 312098: 167679 | 167680 | 167681 | 168643 | 168813 | 168975 | 170720