Attachment #216793 for bug #381607

View | Details | Raw Unified | Return to bug 381607
Collapse All | Expand All

Lines 26-32 CFunctionTracepoint.0=Function tracepoint: {0} Link Here

(-)a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointMessages.properties (-1 / +1 lines)
26	# The marker message of a line breakpoint.	26	# The marker message of a line breakpoint.
27	CLineBreakpoint.0=Line breakpoint: {0}	27	CLineBreakpoint.0=Line breakpoint: {0}
28	# The marker message of a relocated line breakpoint.	28	# The marker message of a relocated line breakpoint.
29	CLineBreakpoint.1=Line breakpoint (relocated): {0}	29	CLineBreakpoint.1=Line breakpoint (relocated from: {0}): {1}
30	# The marker message of a line tracepoint.	30	# The marker message of a line tracepoint.
31	CLineTracepoint.0=Line tracepoint: {0}	31	CLineTracepoint.0=Line tracepoint: {0}
32		32

Lines 13-23 package org.eclipse.cdt.debug.internal.core.breakpoints; Link Here

(-)a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CLineBreakpoint.java (-2 / +13 lines)
13	import java.util.Map;	13	import java.util.Map;
14		14
15	import org.eclipse.cdt.debug.core.CDebugUtils;	15	import org.eclipse.cdt.debug.core.CDebugUtils;
		16	import org.eclipse.cdt.debug.core.DebugCoreMessages;
16	import org.eclipse.cdt.debug.core.model.ICBreakpoint;	17	import org.eclipse.cdt.debug.core.model.ICBreakpoint;
17	import org.eclipse.cdt.debug.core.model.ICLineBreakpoint2;	18	import org.eclipse.cdt.debug.core.model.ICLineBreakpoint2;
18	import org.eclipse.core.resources.IMarker;	19	import org.eclipse.core.resources.IMarker;
19	import org.eclipse.core.resources.IResource;	20	import org.eclipse.core.resources.IResource;
20	import org.eclipse.core.runtime.CoreException;	21	import org.eclipse.core.runtime.CoreException;
		22	import org.eclipse.core.runtime.IPath;
		23	import org.eclipse.core.runtime.Path;
21		24
22	import com.ibm.icu.text.MessageFormat;	25	import com.ibm.icu.text.MessageFormat;
23		26
Lines 67-73 public class CLineBreakpoint extends AbstractLineBreakpoint { Link Here
67	(bp_file == null && bp_reqest_file != null) \|\|	70	(bp_file == null && bp_reqest_file != null) \|\|
68	(bp_file != null && !bp_file.equals(bp_reqest_file)) )	71	(bp_file != null && !bp_file.equals(bp_reqest_file)) )
69	{	72	{
70	return MessageFormat.format( BreakpointMessages.getString( "CLineBreakpoint.1" ), (Object[])new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$	73	StringBuffer label = new StringBuffer();
		74	if (bp_file != null && !bp_file.equals(bp_reqest_file)) {
		75	IPath path = new Path(bp_reqest_file);
		76	if (path.isValidPath(bp_reqest_file)) {
		77	label.append(path.lastSegment());
		78	}
		79	label.append(' ');
		80	}
		81	label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.0"), (Object[])new String[]{ Integer.toString(bp_request_line) })); //$NON-NLS-1$
		82	return MessageFormat.format( BreakpointMessages.getString( "CLineBreakpoint.1" ), (Object[])new String[] { label.toString(), CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
71	}	83	}
72	else {	84	else {
73	return MessageFormat.format( BreakpointMessages.getString( "CLineBreakpoint.0" ), (Object[])new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$	85	return MessageFormat.format( BreakpointMessages.getString( "CLineBreakpoint.0" ), (Object[])new String[] { CDebugUtils.getBreakpointText( this, false ) } ); //$NON-NLS-1$
74	-

Return to bug 381607