From 78ede54448504672bb8462e7a97736c42e271726 Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Tue, 1 Oct 2002 17:51:31 +0000
Subject: [PATCH] Changed the error handling and the error messages.

---
 .../src/org/eclipse/cdt/debug/core/CDebugModel.java           | 4 ++--
 .../internal/ui/actions/AddExpressionActionDelegate.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
index 73f07aa7308..4b0a91cc91a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
@@ -358,8 +358,8 @@ public class CDebugModel
 				throw new DebugException( new Status( IStatus.ERROR, 
 													  getPluginIdentifier(),
 													  DebugException.TARGET_REQUEST_FAILED, 
-													  "Create expression failed.", 
-													  e ) );
+													  e.getMessage(), 
+													  null ) );
 			}
 		}
 		return null;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
index f38dbc62fc6..b80f1fe15c5 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddExpressionActionDelegate.java
@@ -96,7 +96,7 @@ public class AddExpressionActionDelegate extends AbstractEditorActionDelegate
 										}
 										catch( DebugException e )
 										{
-											CDebugUIPlugin.errorDialog( e.getMessage(), e );
+											CDebugUIPlugin.errorDialog( "Evaluation of expression failed.", e );
 										}
 									}
 								} );