Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapItemDialog.java7
-rw-r--r--plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFLaunch.java6
2 files changed, 7 insertions, 6 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 c2008f9d2..327395796 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2013 Wind River Systems, Inc. and others.
+ * Copyright (c) 2010, 2014 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -270,8 +270,9 @@ class MemoryMapItemDialog extends Dialog {
private void getData() {
getNumber(addr_text, IMemoryMap.PROP_ADDRESS);
getNumber(size_text, IMemoryMap.PROP_SIZE);
- if (offset_text.getText().startsWith(".")) {
- props.put(IMemoryMap.PROP_SECTION_NAME, offset_text.getText());
+ String s = offset_text.getText().trim();
+ if (s.length() > 0 && !Character.isDigit(s.charAt(0))) {
+ props.put(IMemoryMap.PROP_SECTION_NAME, s);
props.remove(IMemoryMap.PROP_OFFSET);
}
else {
diff --git a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFLaunch.java b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFLaunch.java
index dd1c04bc2..7baf86307 100644
--- a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFLaunch.java
+++ b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/model/TCFLaunch.java
@@ -1299,17 +1299,17 @@ public class TCFLaunch extends Launch {
/**
* Returns the name for the given peer. Overwrite to customize
* the peer name shown.
- *
+ *
* @param peer The peer. Must not be <code>null</code>.
* @return The peer name. Must be never <code>null</code>.
*/
protected String getPeerName(IPeer peer) {
assert Protocol.isDispatchThread();
assert peer != null;
-
+
return peer.getName();
}
-
+
public <V extends IService> V getService(Class<V> cls) {
assert Protocol.isDispatchThread();
return channel.getRemoteService(cls);

Back to the top