diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index a9e531f6e41..971512d4ab6 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,8 @@ +2004-07-30 Mikhail Khodjaiants + Display the error message in the variable's label if the value of variable can not be retrieved. + * CDebugUIMessages.properties + * CDTDebugModelPresentation.java + 2004-07-23 Mikhail Khodjaiants More informative error messages. * CDebugUIMessages.properties diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java index e3e3e774e6e..4136a2a8619 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java @@ -516,7 +516,10 @@ public class CDTDebugModelPresentation extends LabelProvider implements IDebugMo if ( name != null ) label.append( name.trim() ); IValue value = var.getValue(); - if ( value instanceof ICValue && value.getValueString() != null ) { + if ( value instanceof ICDebugElementStatus && !((ICDebugElementStatus)value).isOK() ) { + label.append( getFormattedString( CDebugUIMessages.getString( "CDTDebugModelPresentation.4" ), ((ICDebugElementStatus)value).getMessage() ) ); //$NON-NLS-1$ + } + else if ( value instanceof ICValue && value.getValueString() != null ) { String valueString = value.getValueString().trim(); if ( type != null && type.isCharacter() ) { if ( valueString.length() == 0 ) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties index f0aead3e162..4d76f7c4a3f 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties @@ -21,6 +21,7 @@ CDTDebugModelPresentation.6=Exit code = {0}. CDTDebugModelPresentation.7={0} (Suspended) CDTDebugModelPresentation.8=Thread [{0}] CDTDebugModelPresentation.9=Thread [{0}] (Terminated) +CDTDebugModelPresentation.4== CDTDebugModelPresentation.10=Thread [{0}] (Stepping) CDTDebugModelPresentation.11=Thread [{0}] (Running) CDTDebugModelPresentation.13=: Signal ''{0}'' received. Description: {1}.