From f6969bb0a82c7daff091cb92f503b5cb8e84b311 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 7 May 2003 17:32:41 +0000 Subject: [PATCH] Display the error message and error image in the debug target's label. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 5 +++++ .../internal/ui/CDTDebugModelPresentation.java | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index e030ba1c747..b87839af03a 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,8 @@ +2003-05-07 Mikhail Khodjaiants + Display the error message and error image in the debug target's label + if the error status is set. + * CDTDebugModelPresentation.java + 2003-05-06 Mikhail Khodjaiants Ruler tooltips in the dissassembly editor. * DisassemblyEditor.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 fe1f31e0a1b..4bba9825f99 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 @@ -11,7 +11,6 @@ import java.util.HashMap; import org.eclipse.cdt.core.resources.FileStorage; import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointHit; -import org.eclipse.cdt.debug.core.cdi.ICDIErrorInfo; import org.eclipse.cdt.debug.core.cdi.ICDIExitInfo; import org.eclipse.cdt.debug.core.cdi.ICDISession; import org.eclipse.cdt.debug.core.cdi.ICDISignalExitInfo; @@ -236,6 +235,15 @@ public class CDTDebugModelPresentation extends LabelProvider { return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED ) ); } + IDebugTarget target = (IDebugTarget)element; + if ( target.isTerminated() || target.isDisconnected() ) + { + return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED ) ); + } + else + { + return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET ) ); + } } if ( element instanceof IThread ) { @@ -462,10 +470,6 @@ public class CDTDebugModelPresentation extends LabelProvider { return target.getName() + " (Breakpoint hit)"; } - if ( info != null && info instanceof ICDIErrorInfo ) - { - return MessageFormat.format( "{0} (Error: {1})", new String[] { target.getName(), ((ICDIErrorInfo)info).getMessage() } ); - } if ( info != null && info instanceof ICDISession ) { return target.getName() + " (Suspended)";