From a080d56b161eabe69a37185846578eb85b983717 Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Tue, 3 Dec 2002 04:11:41 +0000
Subject: [PATCH] If the target is suspended because of error display the error
 message in the Launch view.

---
 debug/org.eclipse.cdt.debug.ui/ChangeLog                 | 9 +++++++++
 .../cdt/debug/internal/ui/CDTDebugModelPresentation.java | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 935798875ca..06d0f8714b2 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-02 Mikhail Khodjaiants
+	If the target is suspended because of error display the error message in the Launch view.
+	* CDTDebugModelPresentation.java
+
 2002-12-02 Mikhail Khodjaiants
 	Refactoring org.eclipse.cdt.debug.core - UI changes.
 
@@ -5,6 +9,11 @@
 	'Run to line' and 'Add expression' actions for assembly editor.
 	*plugin.xml
 
+2002-12-01 Mikhail Khodjaiants
+	Contributing breakpoint actions to asm editor.
+	* plugin.xml
+	* ManageBreakpointRulerActionDelegate.java
+
 2002-11-29 Mikhail Khodjaiants
 	Cosmetic change for the MemoryView preference page.
 	* plugin.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 c1c4c1f31f2..dbc1f1a5257 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
@@ -10,6 +10,7 @@ import java.text.MessageFormat;
 import java.util.HashMap;
 
 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.ICDISignal;
@@ -363,6 +364,10 @@ 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)";