From 723b0df7312b3b40748f55b782194133f1053f11 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Thu, 3 Apr 2008 17:56:22 +0000 Subject: [PATCH] [225610] Removed the IExpressionDMData.getStringValue() method. --- .../ui/viewmodel/variable/VariableVMNode.java | 12 ++++++++---- .../eclipse/dd/dsf/debug/service/IExpressions.java | 5 ----- .../dd/dsf/debug/service/IFormattedValues.java | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java index b07ff746078..160194a26a1 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java @@ -386,6 +386,7 @@ public class VariableVMNode extends AbstractExpressionVMNode } // Fill the label/column with the properly formatted data value. + /* Commented out, to be replaced. See bug 225612. StringBuffer stringValueBuf = new StringBuffer(getData().getFormattedValue()); String stringValue = expressionDMData.getStringValue(); if(stringValue != null && stringValue.length() > 0) @@ -393,7 +394,8 @@ public class VariableVMNode extends AbstractExpressionVMNode stringValueBuf.append(" "); stringValueBuf.append(stringValue.length() > MAX_STRING_VALUE_LENGTH ? stringValue.substring(0, MAX_STRING_VALUE_LENGTH) : stringValue); } - update.setLabel(stringValueBuf.toString(), labelIndex); + update.setLabel(stringValueBuf.toString(), labelIndex);*/ + update.setLabel(getData().getFormattedValue(), labelIndex); // Color based on change history FormattedValueDMData oldData = (FormattedValueDMData) getDMVMProvider().getArchivedModelData( @@ -401,11 +403,13 @@ public class VariableVMNode extends AbstractExpressionVMNode IExpressionDMData oldDMData = (IExpressionDMData) getDMVMProvider().getArchivedModelData( VariableVMNode.this, update, dmc); - String oldStringValue = oldDMData == null ? null : oldDMData.getStringValue(); + /* Commented out, to be replaced. See bug 225612. + String oldStringValue = oldDMData == null ? null : oldDMData.getStringValue();*/ // highlight the value if either the value (address) has changed or the string (memory at the value) has changed - if ((oldData != null && !oldData.getFormattedValue().equals(getData().getFormattedValue())) - || (oldStringValue != null && !oldStringValue.equals(stringValue))) { + if ((oldData != null && !oldData.getFormattedValue().equals(getData().getFormattedValue()))) { + /* Commented out, to be replaced. See bug 225612. + || (oldStringValue != null && !oldStringValue.equals(stringValue))) {*/ update.setBackground( DebugUIPlugin.getPreferenceColor( IInternalDebugUIConstants.PREF_CHANGED_VALUE_BACKGROUND).getRGB(), diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IExpressions.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IExpressions.java index c77145be767..e72d30f3739 100644 --- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IExpressions.java +++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IExpressions.java @@ -106,11 +106,6 @@ public interface IExpressions extends IFormattedValues { */ String getTypeId(); - /** - * @return A string containing the value of the expression as returned by the debugger backend. - */ - String getStringValue(); - /** * @return A Map in which the keys are strings that are the names of enumerators in the enumeration * that is the value of this expression and the values are the integer values of the diff --git a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IFormattedValues.java b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IFormattedValues.java index 3eb94571573..c7ddc2903ab 100644 --- a/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IFormattedValues.java +++ b/plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IFormattedValues.java @@ -33,6 +33,7 @@ public interface IFormattedValues extends IDMService { public final static String NATURAL_FORMAT = "NATURAL.Format" ; //$NON-NLS-1$ public final static String BINARY_FORMAT = "BINARY.Format" ; //$NON-NLS-1$ public final static String DECIMAL_FORMAT = "DECIMAL.Format" ; //$NON-NLS-1$ + public final static String STRING_FORMAT = "STRING.Format" ; //$NON-NLS-1$ /** * Retrieves the formats that the given data is available in.