From b2b090d2fd0c68fa77bf156ee4807629bca8593e Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Tue, 18 Nov 2003 19:33:12 +0000 Subject: [PATCH] Fix for PR 46861: Use a special image for arguments in the Variables view. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 6 ++++++ .../src/org/eclipse/cdt/debug/core/model/ICVariable.java | 2 ++ .../eclipse/cdt/debug/internal/core/model/CVariable.java | 2 +- debug/org.eclipse.cdt.debug.ui/ChangeLog | 8 ++++++++ .../cdt/debug/internal/ui/CDTDebugModelPresentation.java | 3 +++ .../org/eclipse/cdt/debug/internal/ui/CDebugImages.java | 4 ++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index e59780c043e..65423922311 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -7,6 +7,12 @@ All methods of 'IRuntimeOptions' should throw CDI exceptions in case of failure. * ICDIRuntimeOptions.java +2003-10-06 Mikhail Khodjaiants + Added the "isArgument" method to ICVariable. This method is used to distinguish + the arguments in the Variables View. + * ICVariable.java + * CVariable.java + 2003-09-30 Mikhail Khodjaiants Use the new 'equals' method of ICDIVaraiableObject to compare variables. * CVariable.java diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java index 5646460d3b6..c432f0a6a0d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICVariable.java @@ -31,4 +31,6 @@ public interface ICVariable extends IVariable void setEnabled( boolean enabled ) throws DebugException; boolean canEnableDisable(); + + boolean isArgument(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java index 8fe753cf0c9..4093166ece7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java @@ -981,7 +981,7 @@ public abstract class CVariable extends CDebugElement } } - protected boolean isArgument() + public boolean isArgument() { return ( fOriginal != null ) ? ( fOriginal.getCDIVariableObject() instanceof ICDIArgumentObject ) : false; } diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index ff1988793fb..f830c272bc4 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -2,6 +2,14 @@ Fix for PR 45957: Memory view: last column does not show updates. * MemoryPresentation.java +2003-10-06 Mikhail Khodjaiants + Mark the function arguments in the Variables View. + * icons\full\ovr16\argument_ovr.gif: new + * icons\full\ovr16\castarray_ovr.gif: new + * icons\full\ovr16\casttype_ovr.gif: new + * CDebugImages.java + * CDTDebugModelPresentation.java + 2003-09-30 Mikhail Khodjaiants Fix for PR 39737: Tooltip in debug mode over long strings is not handled properly. Added an internal constant to limit the hover text size. 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 4b82a5e7a0d..bcf8e5aaf72 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 @@ -226,6 +226,9 @@ public class CDTDebugModelPresentation extends LabelProvider break; } } + if ( element instanceof ICVariable && ((ICVariable)element).isArgument() ) + overlays[OverlayImageDescriptor.TOP_RIGHT] = CDebugImages.DESC_OVRS_ARGUMENT; + return fImageCache.getImageFor( new OverlayImageDescriptor( baseImage, overlays ) ); } return null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java index bd50eb985e4..8d80183ccb0 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugImages.java @@ -60,6 +60,8 @@ public class CDebugImages public static final String IMG_OVRS_ERROR = NAME_PREFIX + "error_ovr.gif"; //$NON-NLS-1$ public static final String IMG_OVRS_WARNING = NAME_PREFIX + "warning_ovr.gif"; //$NON-NLS-1$ public static final String IMG_OVRS_SYMBOLS = NAME_PREFIX + "symbols_ovr.gif"; //$NON-NLS-1$ + public static final String IMG_OVRS_VARIABLE_CASTED = NAME_PREFIX + "casttype_ovr.gif"; //$NON-NLS-1$ + public static final String IMG_OVRS_ARGUMENT = NAME_PREFIX + "argument_ovr.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_ADDRESS_BREAKPOINT_ENABLED = NAME_PREFIX + "addrbrkp_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_ADDRESS_BREAKPOINT_DISABLED = NAME_PREFIX + "addrbrkpd_obj.gif"; //$NON-NLS-1$ public static final String IMG_OBJS_FUNCTION_BREAKPOINT_ENABLED = NAME_PREFIX + "funbrkp_obj.gif"; //$NON-NLS-1$ @@ -129,6 +131,8 @@ public class CDebugImages public static final ImageDescriptor DESC_OVRS_FUNCTION_BREAKPOINT = createManaged( T_OVR, IMG_OVRS_FUNCTION_BREAKPOINT ); public static final ImageDescriptor DESC_OVRS_FUNCTION_BREAKPOINT_DISABLED = createManaged( T_OVR, IMG_OVRS_FUNCTION_BREAKPOINT_DISABLED ); public static final ImageDescriptor DESC_OVRS_SYMBOLS = createManaged( T_OVR, IMG_OVRS_SYMBOLS ); + public static final ImageDescriptor DESC_OVRS_VARIABLE_CASTED = createManaged( T_OVR, IMG_OVRS_VARIABLE_CASTED ); + public static final ImageDescriptor DESC_OVRS_ARGUMENT = createManaged( T_OVR, IMG_OVRS_ARGUMENT ); public static final ImageDescriptor DESC_OBJS_WATCHPOINT_ENABLED = createManaged( T_OBJ, IMG_OBJS_WATCHPOINT_ENABLED ); public static final ImageDescriptor DESC_OBJS_WATCHPOINT_DISABLED = createManaged( T_OBJ, IMG_OBJS_WATCHPOINT_DISABLED ); public static final ImageDescriptor DESC_OBJS_READ_WATCHPOINT_ENABLED = createManaged( T_OBJ, IMG_OBJS_READ_WATCHPOINT_ENABLED );