From 37e64d553edf3b27cecf9a01813c7e6148d61a0c Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Wed, 2 Jun 2004 22:18:11 +0000
Subject: [PATCH] Changed the breakpoints and watchpoints label resources.

---
 debug/org.eclipse.cdt.debug.ui/ChangeLog      |  5 ++++
 .../ui/CDTDebugModelPresentation.java         | 24 ++++---------------
 .../ui/CDebugUIPluginResources.properties     |  7 +++---
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index 2ed6b5aa273..ff5131a8e39 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-03 Mikhail Khodjaiants
+	Changed the breakpoints and watchpoints label resources.
+	* CDebugUIPluginResources.properties
+	* CDTDebugModelPresentation.java
+
 2004-05-31 Alain Magloire
 	The Extension point "org.eclipse.cdt.ui.textHover"
 	Changed adjust the Debugger.
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 9fcb1440c97..823c3ce7f17 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
@@ -815,11 +815,7 @@ public class CDTDebugModelPresentation extends LabelProvider
 		int lineNumber = breakpoint.getLineNumber();
 		if ( lineNumber > 0 )
 		{
-			label.append( " [" ); //$NON-NLS-1$
-			label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.line") ); //$NON-NLS-1$
-			label.append( ' ' );
-			label.append( lineNumber );
-			label.append( ']' );
+			label.append( MessageFormat.format( CDebugUIPlugin.getResourceString( "internal.ui.CDTDebugModelPresentation.line" ), new String[] { Integer.toString( lineNumber ) } ) ); //$NON-NLS-1$
 		}
 		return label;
 	}
@@ -829,9 +825,7 @@ public class CDTDebugModelPresentation extends LabelProvider
 		try
 		{
 			long address = Long.parseLong( breakpoint.getAddress() );
-			label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.address") ); //$NON-NLS-1$
-			label.append( CDebugUtils.toHexAddressString( address ) );
-			label.append( ']' );
+			label.append( MessageFormat.format( CDebugUIPlugin.getResourceString( "internal.ui.CDTDebugModelPresentation.address" ), new String[] { CDebugUtils.toHexAddressString( address ) } ) ); //$NON-NLS-1$
 		}
 		catch( NumberFormatException e )
 		{
@@ -844,11 +838,7 @@ public class CDTDebugModelPresentation extends LabelProvider
 		String function = breakpoint.getFunction();
 		if ( function != null && function.trim().length() > 0 )
 		{
-			label.append( " [" ); //$NON-NLS-1$
-			label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.function") ); //$NON-NLS-1$
-			label.append( ' ' );
-			label.append( function.trim() );
-			label.append( ']' );
+			label.append( MessageFormat.format( CDebugUIPlugin.getResourceString( "internal.ui.CDTDebugModelPresentation.function" ), new String[] { function.trim() } ) ); //$NON-NLS-1$
 		}
 		return label;
 	}
@@ -858,11 +848,7 @@ public class CDTDebugModelPresentation extends LabelProvider
 		int ignoreCount = breakpoint.getIgnoreCount();
 		if ( ignoreCount > 0 )
 		{
-			label.append( " [" ); //$NON-NLS-1$
-			label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.ignore_count") ); //$NON-NLS-1$
-			label.append( ' ' );
-			label.append( ignoreCount );
-			label.append( ']' );
+			label.append( MessageFormat.format( CDebugUIPlugin.getResourceString( "internal.ui.CDTDebugModelPresentation.ignore_count" ), new String[] { Integer.toString( ignoreCount ) } ) ); //$NON-NLS-1$
 		}
 		return label;
 	}
@@ -886,7 +872,7 @@ public class CDTDebugModelPresentation extends LabelProvider
 		{
 			label.append(' ');
 			label.append( CDebugUIPlugin.getResourceString("internal.ui.CDTDebugModelPresentation.at") );  //$NON-NLS-1$
-			label.append( '\'' );
+			label.append( " \'" ); //$NON-NLS-1$
 			label.append( expression );
 			label.append( '\'' );
 		}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPluginResources.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPluginResources.properties
index 1e589b5471f..372ea9b7388 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPluginResources.properties
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPluginResources.properties
@@ -246,9 +246,10 @@ internal.ui.CDTDebugModelPresentation.Thread_threadName_suspended=Thread [{0}] (
 internal.ui.CDTDebugModelPresentation.Symbol_not_available=<symbol is not available>
 internal.ui.CDTDebugModelPresentation.disabled=\ (disabled) 
 internal.ui.CDTDebugModelPresentation.Infinity=Infinity
-internal.ui.CDTDebugModelPresentation.line=line:
-internal.ui.CDTDebugModelPresentation.function=function:
-internal.ui.CDTDebugModelPresentation.ignore_count=ignore count:
+internal.ui.CDTDebugModelPresentation.line=\ [line: {0}]
+internal.ui.CDTDebugModelPresentation.function=\ [function: {0}]
+internal.ui.CDTDebugModelPresentation.address=\ [address: {0}]
+internal.ui.CDTDebugModelPresentation.ignore_count=\ [ignore count: {0}]
 internal.ui.CDTDebugModelPresentation.if=if
 internal.ui.CDTDebugModelPresentation.at=at
 internal.ui.CDebugImageDescriptorRegistry.Allocating_image_for_wrong_display=Allocating image for wrong display