diff options
author | John Cortell | 2008-05-08 03:16:26 +0000 |
---|---|---|
committer | John Cortell | 2008-05-08 03:16:26 +0000 |
commit | 81120f9c45cc0e7f2b6b956c8628f184ef47d2f7 (patch) | |
tree | b9ca4005a1df59b620c8442536c1f94fc4f3e635 /debug | |
parent | b36ad37deff4fc8d03ec4893eb2bf1de5a379fd7 (diff) | |
download | org.eclipse.cdt-81120f9c45cc0e7f2b6b956c8628f184ef47d2f7.tar.gz org.eclipse.cdt-81120f9c45cc0e7f2b6b956c8628f184ef47d2f7.tar.xz org.eclipse.cdt-81120f9c45cc0e7f2b6b956c8628f184ef47d2f7.zip |
Fix label handling for ICBreakpoint.TEMPORARY and add label for new SOFTWARE type.
Diffstat (limited to 'debug')
-rw-r--r-- | debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugUtils.java | 26 | ||||
-rw-r--r-- | debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties | 7 |
2 files changed, 24 insertions, 9 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 986bcfbf13e..974f3293a61 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 @@ -461,17 +461,31 @@ public class CDebugUtils { protected static StringBuffer appendBreakpointType( ICBreakpoint breakpoint, StringBuffer label ) throws CoreException { if (breakpoint instanceof ICBreakpointType) { - String typeString = null; + String typeString = ""; int type = ((ICBreakpointType) breakpoint).getType(); - switch (type) { + + // Need to filter out the TEMPORARY bit-flag to get the real type + // The REGULAR type is implicit so we don't report that. + switch (type & ~ICBreakpointType.TEMPORARY) { case ICBreakpointType.HARDWARE: - typeString = DebugCoreMessages.getString("CDebugUtils.10"); + typeString = DebugCoreMessages.getString("CDebugUtils.Hardware"); break; - case ICBreakpointType.TEMPORARY: - typeString = DebugCoreMessages.getString("CDebugUtils.11"); + case ICBreakpointType.SOFTWARE: + typeString = DebugCoreMessages.getString("CDebugUtils.Software"); break; } - if (typeString != null) { + + // Now factor in the TEMPORARY qualifier to form, .e.,g "Hardware/Temporary" + // Thing is, a temporary breakpoint should never show in the GUI, so this is + // here as a just-in-case. + if ((type & ICBreakpointType.TEMPORARY) != 0) { + if (typeString.length() > 0) { + typeString += "/"; + } + typeString += DebugCoreMessages.getString("CDebugUtils.Temporary"); + } + + if (typeString.length() > 0) { label.append(' '); label.append(MessageFormat.format( DebugCoreMessages.getString("CDebugUtils.8"), new String[] { typeString })); //$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 3540ea21bb9..b6cbb475d0d 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 @@ -19,7 +19,8 @@ CDebugUtils.5=[expression: ''{0}''] CDebugUtils.6=[memory space: {0}] CDebugUtils.7=[units: {0}] CDebugUtils.8=[type: {0}] -CDebugUtils.9=Regular -CDebugUtils.10=Hardware -CDebugUtils.11=Temporary +CDebugUtils.Regular=Regular +CDebugUtils.Hardware=Hardware +CDebugUtils.Temporary=Temporary +CDebugUtils.Software=Software CDIDebugModel.0=Unable to parser binary information from file |