diff options
| author | Eugene Tarassov | 2020-11-11 19:25:37 +0000 |
|---|---|---|
| committer | Eugene Tarassov | 2020-11-11 19:25:37 +0000 |
| commit | 160b9fc8fca4d0a69a52096ca6d40c36a3101e2f (patch) | |
| tree | cbb9049a4648fb3f996fd390f3d91417781961c5 /plugins | |
| parent | 0b8f9fc8b645a0fecb78d4ccc4453a732f5d465f (diff) | |
| download | org.eclipse.tcf-160b9fc8fca4d0a69a52096ca6d40c36a3101e2f.tar.gz org.eclipse.tcf-160b9fc8fca4d0a69a52096ca6d40c36a3101e2f.tar.xz org.eclipse.tcf-160b9fc8fca4d0a69a52096ca6d40c36a3101e2f.zip | |
TCF Debugger: fixed regression: IMemoryMap.PROP_FLAGS=null breaks the memory map GUI
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapItemDialog.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapItemDialog.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapItemDialog.java index 38c0256b2..64fe9bd42 100644 --- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapItemDialog.java +++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapItemDialog.java @@ -24,7 +24,6 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -361,7 +360,6 @@ class MemoryMapItemDialog extends Dialog { props.remove(IMemoryMap.PROP_SIZE); props.remove(IMemoryMap.PROP_OFFSET); props.remove(IMemoryMap.PROP_SECTION_NAME); - props.remove(IMemoryMap.PROP_FLAGS); getText(file_text, IMemoryMap.PROP_FILE_NAME); if (loc_addrress.getSelection()) { getNumber(addr_text, IMemoryMap.PROP_ADDRESS); @@ -373,15 +371,15 @@ class MemoryMapItemDialog extends Dialog { else { getNumber(offset_text, IMemoryMap.PROP_OFFSET); } - int flags = 0; - if (rd_button.getSelection()) flags |= IMemoryMap.FLAG_READ; - if (wr_button.getSelection()) flags |= IMemoryMap.FLAG_WRITE; - if (ex_button.getSelection()) flags |= IMemoryMap.FLAG_EXECUTE; - props.put(IMemoryMap.PROP_FLAGS, flags); } else if (loc_offset.getSelection()) { getNumber(addr_text, IMemoryMap.PROP_BASE_ADDRESS); } + int flags = 0; + if (rd_button.getSelection()) flags |= IMemoryMap.FLAG_READ; + if (wr_button.getSelection()) flags |= IMemoryMap.FLAG_WRITE; + if (ex_button.getSelection()) flags |= IMemoryMap.FLAG_EXECUTE; + props.put(IMemoryMap.PROP_FLAGS, flags); getText(query_text, IMemoryMap.PROP_CONTEXT_QUERY); } |