cdt/cdt_6_0_x/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java
changeset 105 fbceb3d6fb44
parent 37 c2bce6dd59e7
child 129 723898599d35
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java	Thu Oct 15 15:38:06 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableVMNode.java	Fri Oct 30 10:27:11 2009 -0500
@@ -707,8 +707,15 @@
     protected void fillAddressDataProperties(IPropertiesUpdate update, IExpressionDMAddress address)
     { 
 	    IExpressionDMAddress expression = address;
-	    IAddress expAddress = expression.getAddress();
-	    update.setProperty(PROP_VARIABLE_ADDRESS, "0x" + expAddress.toString(16)); //$NON-NLS-1$
+	    Object expAddress = expression.getAddress();
+
+	    String addrString = ""; //$NON-NLS-1$
+	    if (expAddress instanceof IAddress)
+	    	addrString = "0x" + ((IAddress)expAddress).toString(16); //$NON-NLS-1$
+	    else if (expAddress instanceof String)
+	    	addrString = (String)expAddress;
+
+	    update.setProperty(PROP_VARIABLE_ADDRESS, addrString);
     }
     
     public CellEditor getCellEditor(IPresentationContext context, String columnId, Object element, Composite parent) {