From b32258ab17943b74faabd0d8b3de545b426cdd55 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 13 Aug 2003 18:20:21 +0000 Subject: [PATCH] Display the proper image for reference types. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 4 ++++ .../cdt/debug/internal/ui/CDTDebugModelPresentation.java | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 6e2e2d5addc..333ff00e229 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,7 @@ +2003-08-13 Mikhail Khodjaiants + Display the proper image for reference types. + * CDTDebugModelPresentation.java + 2003-07-30 Mikhail Khodjaiants Moved the 'getReferencedProject' method to 'CDebugUtils'. Added the cycle checking. * SourceLookupBlock.java 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 3851e9fc5d4..efede1c4869 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 @@ -894,12 +894,12 @@ public class CDTDebugModelPresentation extends LabelProvider { // use default image } - if ( type != null && ( type.isArray() || type.isStructure() ) ) - return fDebugImageRegistry.get( ( ((ICVariable)element).isEnabled() ) ? - CDebugImages.DESC_OBJS_VARIABLE_AGGREGATE : CDebugImages.DESC_OBJS_VARIABLE_AGGREGATE_DISABLED ); - else if ( type != null && type.isPointer() ) + if ( type != null && (type.isPointer() || type.isReference()) ) return fDebugImageRegistry.get( ( ((ICVariable)element).isEnabled() ) ? CDebugImages.DESC_OBJS_VARIABLE_POINTER : CDebugImages.DESC_OBJS_VARIABLE_POINTER_DISABLED ); + else if ( ((ICVariable)element).hasChildren() ) + return fDebugImageRegistry.get( ( ((ICVariable)element).isEnabled() ) ? + CDebugImages.DESC_OBJS_VARIABLE_AGGREGATE : CDebugImages.DESC_OBJS_VARIABLE_AGGREGATE_DISABLED ); else return fDebugImageRegistry.get( ( ((ICVariable)element).isEnabled() ) ? CDebugImages.DESC_OBJS_VARIABLE_SIMPLE : CDebugImages.DESC_OBJS_VARIABLE_SIMPLE_DISABLED );