From 78ecb0ed5328203e4ef713116599d0768ebddb8c Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants
Date: Tue, 6 Feb 2007 11:24:53 +0000
Subject: Bug 139203: "if" and "at" translateable? #71.

---
 .../src/org/eclipse/cdt/debug/core/CDebugUtils.java              | 9 ++-------
 .../src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties  | 4 ++--
 .../eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java   | 2 --
 .../eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties    | 1 -
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java
index 5bf41eda18f..79ad5235177 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java
@@ -400,9 +400,7 @@ public class CDebugUtils {
 		String condition = breakpoint.getCondition();
 		if ( condition != null && condition.length() > 0 ) {
 			buffer.append( ' ' );
-			buffer.append( DebugCoreMessages.getString( "CDebugUtils.4" ) ); //$NON-NLS-1$
-			buffer.append( ' ' );
-			buffer.append( condition );
+			buffer.append( MessageFormat.format( DebugCoreMessages.getString( "CDebugUtils.4" ), new String[] { condition } ) ); //$NON-NLS-1$
 		}
 	}
 
@@ -410,10 +408,7 @@ public class CDebugUtils {
 		String expression = watchpoint.getExpression();
 		if ( expression != null && expression.length() > 0 ) {
 			label.append( ' ' );
-			label.append( DebugCoreMessages.getString( "CDebugUtils.5" ) ); //$NON-NLS-1$
-			label.append( " \'" ); //$NON-NLS-1$
-			label.append( expression );
-			label.append( '\'' );
+			label.append( MessageFormat.format(  DebugCoreMessages.getString( "CDebugUtils.5" ), new String[] { expression } ) ); //$NON-NLS-1$
 		}
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
index 48da30a07bb..b0fcd5e7cb3 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
@@ -13,6 +13,6 @@ CDebugUtils.0=[line: {0}]
 CDebugUtils.1=[address: {0}]
 CDebugUtils.2=[function: {0}]
 CDebugUtils.3=[ignore count: {0}]
-CDebugUtils.4=if
-CDebugUtils.5=at
+CDebugUtils.4=[condition: {0}]
+CDebugUtils.5=[expression: ''{0}'']
 CDIDebugModel.0=Unable to parser binary information from file
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
index b7db0cddc5e..2962e04dfe5 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
@@ -746,8 +746,6 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
 				if ( frame.getFile() != null ) {
 					IPath path = new Path( frame.getFile() );
 					if ( !path.isEmpty() ) {
-						label.append( CDebugUIMessages.getString( "CDTDebugModelPresentation.20" ) ); //$NON-NLS-1$
-						label.append( ' ' );
 						label.append( (qualified ? path.toOSString() : path.lastSegment()) );
 						label.append( ':' );
 						if ( frame.getFrameLineNumber() != 0 )
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties
index 30731936667..61b959dd79e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIMessages.properties
@@ -32,7 +32,6 @@ CDTDebugModelPresentation.17=: Shared library event.
 CDTDebugModelPresentation.18=Thread [{0}] (Suspended{1})
 CDTDebugModelPresentation.19=Thread [{0}]
 CDTDebugModelPresentation.12=signal
-CDTDebugModelPresentation.20=at
 CDTDebugModelPresentation.21=<symbol is not available>
 CDTDebugModelPresentation.22=(disabled)
 CDTDebugModelPresentation.23=Infinity
-- 
cgit v1.2.3