commit 3ca0eb60fee4dc2b4ccc6e9ec29778a871253586
author Eugene Tarassov <eugene.tarassov@windriver.com> Mon Oct 10 12:12:11 2011 -0700
committer Eugene Tarassov <eugene.tarassov@windriver.com> Mon Oct 10 12:12:11 2011 -0700
tree 4d31d0980314354c375ee9eafd134712d0d8f728
parent 7568e22a3219770987e1650f81746907870e4a6d

TCF Debugger: changed memory map entry dialog to allow section name in "File offset" field.

plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapItemDialog.java

diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapItemDialog.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapItemDialog.java
index 830c5a5..39a3149 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapItemDialog.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapItemDialog.java
@@ -30,8 +30,10 @@
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.tm.internal.tcf.debug.ui.model.TCFModel;
 import org.eclipse.tm.tcf.protocol.JSON;
 import org.eclipse.tm.tcf.services.IMemoryMap;
 
@@ -219,7 +221,12 @@
     private void setData() {
         setText(addr_text, toHex((Number)props.get(IMemoryMap.PROP_ADDRESS)));
         setText(size_text, toHex((Number)props.get(IMemoryMap.PROP_SIZE)));
-        setText(offset_text, toHex((Number)props.get(IMemoryMap.PROP_OFFSET)));
+        if (props.get(IMemoryMap.PROP_SECTION_NAME) != null) {
+            setText(offset_text, (String)props.get(IMemoryMap.PROP_SECTION_NAME));
+        }
+        else {
+            setText(offset_text, toHex((Number)props.get(IMemoryMap.PROP_OFFSET)));
+        }
         setText(file_text, (String)props.get(IMemoryMap.PROP_FILE_NAME));
         int flags = 0;
         Number n = (Number)props.get(IMemoryMap.PROP_FLAGS);
@@ -256,7 +263,14 @@
     private void getData() {
         getNumber(addr_text, IMemoryMap.PROP_ADDRESS);
         getNumber(size_text, IMemoryMap.PROP_SIZE);
-        getNumber(offset_text, IMemoryMap.PROP_OFFSET);
+        if (offset_text.getText().startsWith(".")) {
+            props.put(IMemoryMap.PROP_SECTION_NAME, offset_text.getText());
+            props.remove(IMemoryMap.PROP_OFFSET);
+        }
+        else {
+            getNumber(offset_text, IMemoryMap.PROP_OFFSET);
+            props.remove(IMemoryMap.PROP_SECTION_NAME);
+        }
         getText(file_text, IMemoryMap.PROP_FILE_NAME);
         int flags = 0;
         if (rd_button.getSelection()) flags |= IMemoryMap.FLAG_READ;
@@ -272,7 +286,18 @@
 
     @Override
     protected void okPressed() {
-        if (enable_editing) getData();
+        if (enable_editing) {
+            try {
+                getData();
+            }
+            catch (Throwable x) {
+                MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR | SWT.OK);
+                mb.setText("Invalid data");
+                mb.setMessage(TCFModel.getErrorMessage(x, true));
+                mb.open();
+                return;
+            }
+        }
         super.okPressed();
     }
 }