diff options
Diffstat (limited to 'debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core')
115 files changed, 2820 insertions, 2723 deletions
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java index fa41955c31e..ea9e5f3ba87 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDIDebugModel.java @@ -66,1315 +66,1319 @@ import org.eclipse.debug.core.model.ILineBreakpoint; */ public class CDIDebugModel { - /** - * Returns the identifier for the CDI debug model plug-in - * - * @return plugin identifier - */ - public static String getPluginIdentifier() { - return CDebugCorePlugin.getUniqueIdentifier(); - } + /** + * Returns the identifier for the CDI debug model plug-in + * + * @return plugin identifier + */ + public static String getPluginIdentifier() { + return CDebugCorePlugin.getUniqueIdentifier(); + } - /** - * Calculates breakpoint marker ID based on the breakpoint object type. - * - * @since 7.2 - */ - public static String calculateMarkerType(IBreakpoint bp) { - if (bp instanceof ICBreakpoint2) { - return ((ICBreakpoint2) bp).getMarkerType(); - } - if (bp instanceof ICDynamicPrintf) { - if (bp instanceof ICFunctionBreakpoint) { - return ICDynamicPrintf.C_FUNCTION_DYNAMICPRINTF_MARKER; - } else if (bp instanceof ICAddressBreakpoint) { - return ICDynamicPrintf.C_ADDRESS_DYNAMICPRINTF_MARKER; - } else if (bp instanceof ICLineBreakpoint) { - return ICDynamicPrintf.C_LINE_DYNAMICPRINTF_MARKER; - } else { - return ICDynamicPrintf.C_DYNAMICPRINTF_MARKER; - } - } else if (bp instanceof ICTracepoint) { - if (bp instanceof ICFunctionBreakpoint) { - return ICTracepoint.C_FUNCTION_TRACEPOINT_MARKER; - } else if (bp instanceof ICAddressBreakpoint) { - return ICTracepoint.C_ADDRESS_TRACEPOINT_MARKER; - } else if (bp instanceof ICLineBreakpoint) { - return ICTracepoint.C_LINE_TRACEPOINT_MARKER; - } else { - return ICTracepoint.C_TRACEPOINT_MARKER; - } - } else if (bp instanceof ICFunctionBreakpoint) { - return ICFunctionBreakpoint.C_FUNCTION_BREAKPOINT_MARKER; - } else if (bp instanceof ICAddressBreakpoint) { - return ICAddressBreakpoint.C_ADDRESS_BREAKPOINT_MARKER; - } else if (bp instanceof ICLineBreakpoint) { - return ICLineBreakpoint.C_LINE_BREAKPOINT_MARKER; - } else if (bp instanceof ICEventBreakpoint) { - return ICEventBreakpoint.C_EVENT_BREAKPOINT_MARKER; - } else if (bp instanceof ICBreakpoint) { - return ICBreakpoint.C_BREAKPOINT_MARKER; - } else if (bp instanceof ILineBreakpoint) { - return IBreakpoint.LINE_BREAKPOINT_MARKER; - } - return IBreakpoint.BREAKPOINT_MARKER; - } + /** + * Calculates breakpoint marker ID based on the breakpoint object type. + * + * @since 7.2 + */ + public static String calculateMarkerType(IBreakpoint bp) { + if (bp instanceof ICBreakpoint2) { + return ((ICBreakpoint2) bp).getMarkerType(); + } + if (bp instanceof ICDynamicPrintf) { + if (bp instanceof ICFunctionBreakpoint) { + return ICDynamicPrintf.C_FUNCTION_DYNAMICPRINTF_MARKER; + } else if (bp instanceof ICAddressBreakpoint) { + return ICDynamicPrintf.C_ADDRESS_DYNAMICPRINTF_MARKER; + } else if (bp instanceof ICLineBreakpoint) { + return ICDynamicPrintf.C_LINE_DYNAMICPRINTF_MARKER; + } else { + return ICDynamicPrintf.C_DYNAMICPRINTF_MARKER; + } + } else if (bp instanceof ICTracepoint) { + if (bp instanceof ICFunctionBreakpoint) { + return ICTracepoint.C_FUNCTION_TRACEPOINT_MARKER; + } else if (bp instanceof ICAddressBreakpoint) { + return ICTracepoint.C_ADDRESS_TRACEPOINT_MARKER; + } else if (bp instanceof ICLineBreakpoint) { + return ICTracepoint.C_LINE_TRACEPOINT_MARKER; + } else { + return ICTracepoint.C_TRACEPOINT_MARKER; + } + } else if (bp instanceof ICFunctionBreakpoint) { + return ICFunctionBreakpoint.C_FUNCTION_BREAKPOINT_MARKER; + } else if (bp instanceof ICAddressBreakpoint) { + return ICAddressBreakpoint.C_ADDRESS_BREAKPOINT_MARKER; + } else if (bp instanceof ICLineBreakpoint) { + return ICLineBreakpoint.C_LINE_BREAKPOINT_MARKER; + } else if (bp instanceof ICEventBreakpoint) { + return ICEventBreakpoint.C_EVENT_BREAKPOINT_MARKER; + } else if (bp instanceof ICBreakpoint) { + return ICBreakpoint.C_BREAKPOINT_MARKER; + } else if (bp instanceof ILineBreakpoint) { + return IBreakpoint.LINE_BREAKPOINT_MARKER; + } + return IBreakpoint.BREAKPOINT_MARKER; + } - /** - * Creates and returns a line breakpoint for the source defined by the given - * source handle, at the given line number. The marker associated with the - * breakpoint will be created on the specified resource. - * - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param lineNumber - * the line number on which the breakpoint is set - line numbers - * are 1 based, associated with the source file in which the - * breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return a line breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - * @deprecated as of CDT 5.0 use - * {@link #createLineBreakpoint(String, IResource, int, int, boolean, int, String, boolean)} - */ - @Deprecated - public static ICLineBreakpoint createLineBreakpoint(String sourceHandle, IResource resource, int lineNumber, - boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { - return createLineBreakpoint(sourceHandle, resource, ICBreakpointType.REGULAR, lineNumber, enabled, ignoreCount, - condition, register); - } + /** + * Creates and returns a line breakpoint for the source defined by the given + * source handle, at the given line number. The marker associated with the + * breakpoint will be created on the specified resource. + * + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param lineNumber + * the line number on which the breakpoint is set - line numbers + * are 1 based, associated with the source file in which the + * breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return a line breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + * @deprecated as of CDT 5.0 use + * {@link #createLineBreakpoint(String, IResource, int, int, boolean, int, String, boolean)} + */ + @Deprecated + public static ICLineBreakpoint createLineBreakpoint(String sourceHandle, IResource resource, int lineNumber, + boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { + return createLineBreakpoint(sourceHandle, resource, ICBreakpointType.REGULAR, lineNumber, enabled, ignoreCount, + condition, register); + } - /** - * Creates and returns a line breakpoint for the source defined by the given - * source handle, at the given line number. The marker associated with the - * breakpoint will be created on the specified resource. - * - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param lineNumber - * the line number on which the breakpoint is set - line numbers - * are 1 based, associated with the source file in which the - * breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return a line breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICLineBreakpoint createLineBreakpoint(String sourceHandle, IResource resource, int type, - int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); - return new CLineBreakpoint(resource, attributes, register); - } + /** + * Creates and returns a line breakpoint for the source defined by the given + * source handle, at the given line number. The marker associated with the + * breakpoint will be created on the specified resource. + * + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param lineNumber + * the line number on which the breakpoint is set - line numbers + * are 1 based, associated with the source file in which the + * breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return a line breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICLineBreakpoint createLineBreakpoint(String sourceHandle, IResource resource, int type, + int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); + return new CLineBreakpoint(resource, attributes, register); + } - /** - * Creates a line breakpoint without associated marker. - * <p> - * Note: Before a breakpoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICLineBreakpoint createBlankLineBreakpoint() { - return new CLineBreakpoint(); - } + /** + * Creates a line breakpoint without associated marker. + * <p> + * Note: Before a breakpoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICLineBreakpoint createBlankLineBreakpoint() { + return new CLineBreakpoint(); + } - /** - * @since 7.0 - */ - public static ICLineBreakpoint createLineTracepoint(String sourceHandle, IResource resource, int type, - int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); - return new CLineTracepoint(resource, attributes, register); - } + /** + * @since 7.0 + */ + public static ICLineBreakpoint createLineTracepoint(String sourceHandle, IResource resource, int type, + int lineNumber, boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); + return new CLineTracepoint(resource, attributes, register); + } - /** - * Creates a line tracepoint without associated marker. - * <p> - * Note: Before a tracepoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICLineBreakpoint createBlankLineTracepoint() { - return new CLineTracepoint(); - } + /** + * Creates a line tracepoint without associated marker. + * <p> + * Note: Before a tracepoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICLineBreakpoint createBlankLineTracepoint() { + return new CLineTracepoint(); + } - /** - * @since 7.5 - */ - public static ICLineBreakpoint createLineDynamicPrintf(String sourceHandle, IResource resource, int type, - int lineNumber, boolean enabled, int ignoreCount, String condition, String printfStr, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); - attributes.put(ICDynamicPrintf.PRINTF_STRING, printfStr); - return new CLineDynamicPrintf(resource, attributes, register); - } + /** + * @since 7.5 + */ + public static ICLineBreakpoint createLineDynamicPrintf(String sourceHandle, IResource resource, int type, + int lineNumber, boolean enabled, int ignoreCount, String condition, String printfStr, boolean register) + throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); + attributes.put(ICDynamicPrintf.PRINTF_STRING, printfStr); + return new CLineDynamicPrintf(resource, attributes, register); + } - /** - * Creates a line dynamic printf without associated marker. - * <p> - * Note: Before a dynamic printf created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.5 - */ - public static ICLineBreakpoint createBlankLineDynamicPrintf() { - return new CLineDynamicPrintf(); - } - - /** - * Helper function for setting common line breakpoint attributes. - * - * @param attributes - * Map to write the attributes into. - * @param sourceHandle - * The handle to the breakpoint source. - * @param resource - * The resource on which to create the associated breakpoint - * marker. - * @param type - * A type constant from ICBreakpointType. - * @param lineNumber - * The line number on which the breakpoint is set - line numbers - * are 1 based, associated with the source file in which the - * breakpoint is set. - * @param enabled - * Whether to enable or disable this breakpoint. - * @param ignoreCount - * The number of times this breakpoint will be ignored. - * @param condition - * The breakpoint condition. - * @param register - * Whether to add this breakpoint to the breakpoint manager. - * - * @since 7.2 - */ - public static void setLineBreakpointAttributes(Map<String, Object> attributes, String sourceHandle, Integer type, - int lineNumber, boolean enabled, int ignoreCount, String condition) { - attributes.put(IBreakpoint.ID, getPluginIdentifier()); - attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(lineNumber)); - attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled)); - attributes.put(ICBreakpoint.IGNORE_COUNT, Integer.valueOf(ignoreCount)); - attributes.put(ICBreakpoint.CONDITION, condition); - attributes.put(ICBreakpoint.SOURCE_HANDLE, sourceHandle); - attributes.put(ICBreakpointType.TYPE, type); + /** + * Creates a line dynamic printf without associated marker. + * <p> + * Note: Before a dynamic printf created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.5 + */ + public static ICLineBreakpoint createBlankLineDynamicPrintf() { + return new CLineDynamicPrintf(); + } - // Added for source relocated breakpoints. - if (!attributes.containsKey(ICLineBreakpoint2.REQUESTED_SOURCE_HANDLE)) { - attributes.put(ICLineBreakpoint2.REQUESTED_SOURCE_HANDLE, sourceHandle); - } - if (!attributes.containsKey(ICLineBreakpoint2.REQUESTED_LINE)) { - attributes.put(ICLineBreakpoint2.REQUESTED_LINE, Integer.valueOf(lineNumber)); - } - if (attributes.containsKey(IMarker.CHAR_START) - && !attributes.containsKey(ICLineBreakpoint2.REQUESTED_CHAR_START)) { - attributes.put(ICLineBreakpoint2.REQUESTED_CHAR_START, attributes.get(IMarker.CHAR_START)); - } - if (attributes.containsKey(IMarker.CHAR_END) && !attributes.containsKey(ICLineBreakpoint2.REQUESTED_CHAR_END)) { - attributes.put(ICLineBreakpoint2.REQUESTED_CHAR_END, attributes.get(IMarker.CHAR_END)); - } - } + /** + * Helper function for setting common line breakpoint attributes. + * + * @param attributes + * Map to write the attributes into. + * @param sourceHandle + * The handle to the breakpoint source. + * @param resource + * The resource on which to create the associated breakpoint + * marker. + * @param type + * A type constant from ICBreakpointType. + * @param lineNumber + * The line number on which the breakpoint is set - line numbers + * are 1 based, associated with the source file in which the + * breakpoint is set. + * @param enabled + * Whether to enable or disable this breakpoint. + * @param ignoreCount + * The number of times this breakpoint will be ignored. + * @param condition + * The breakpoint condition. + * @param register + * Whether to add this breakpoint to the breakpoint manager. + * + * @since 7.2 + */ + public static void setLineBreakpointAttributes(Map<String, Object> attributes, String sourceHandle, Integer type, + int lineNumber, boolean enabled, int ignoreCount, String condition) { + attributes.put(IBreakpoint.ID, getPluginIdentifier()); + attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(lineNumber)); + attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled)); + attributes.put(ICBreakpoint.IGNORE_COUNT, Integer.valueOf(ignoreCount)); + attributes.put(ICBreakpoint.CONDITION, condition); + attributes.put(ICBreakpoint.SOURCE_HANDLE, sourceHandle); + attributes.put(ICBreakpointType.TYPE, type); - /** - * Creates and returns an address breakpoint for the source defined by the - * given source handle, at the given address. The marker associated with the - * breakpoint will be created on the specified resource. - * - * @param module - * the module name the breakpoint is set in - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param address - * the address on which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return an address breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - * @deprecated as of CDT 5.0 use - * {@link #createAddressBreakpoint(String, String, IResource, int, int, IAddress, boolean, int, String, boolean)} - */ - @Deprecated - public static ICAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, - IAddress address, boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { - return createAddressBreakpoint(module, sourceHandle, resource, ICBreakpointType.REGULAR, -1, address, enabled, - ignoreCount, condition, register); - } + // Added for source relocated breakpoints. + if (!attributes.containsKey(ICLineBreakpoint2.REQUESTED_SOURCE_HANDLE)) { + attributes.put(ICLineBreakpoint2.REQUESTED_SOURCE_HANDLE, sourceHandle); + } + if (!attributes.containsKey(ICLineBreakpoint2.REQUESTED_LINE)) { + attributes.put(ICLineBreakpoint2.REQUESTED_LINE, Integer.valueOf(lineNumber)); + } + if (attributes.containsKey(IMarker.CHAR_START) + && !attributes.containsKey(ICLineBreakpoint2.REQUESTED_CHAR_START)) { + attributes.put(ICLineBreakpoint2.REQUESTED_CHAR_START, attributes.get(IMarker.CHAR_START)); + } + if (attributes.containsKey(IMarker.CHAR_END) && !attributes.containsKey(ICLineBreakpoint2.REQUESTED_CHAR_END)) { + attributes.put(ICLineBreakpoint2.REQUESTED_CHAR_END, attributes.get(IMarker.CHAR_END)); + } + } - /** - * Creates and returns an address breakpoint for the source defined by the - * given source handle, at the given address. The marker associated with the - * breakpoint will be created on the specified resource. - * - * @param module - * the module name the breakpoint is set in - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param address - * the address on which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return an address breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, - int type, IAddress address, boolean enabled, int ignoreCount, String condition, boolean register) - throws CoreException { - return createAddressBreakpoint(module, sourceHandle, resource, type, -1, address, enabled, ignoreCount, - condition, register); - } + /** + * Creates and returns an address breakpoint for the source defined by the + * given source handle, at the given address. The marker associated with the + * breakpoint will be created on the specified resource. + * + * @param module + * the module name the breakpoint is set in + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param address + * the address on which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return an address breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + * @deprecated as of CDT 5.0 use + * {@link #createAddressBreakpoint(String, String, IResource, int, int, IAddress, boolean, int, String, boolean)} + */ + @Deprecated + public static ICAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, + IAddress address, boolean enabled, int ignoreCount, String condition, boolean register) + throws CoreException { + return createAddressBreakpoint(module, sourceHandle, resource, ICBreakpointType.REGULAR, -1, address, enabled, + ignoreCount, condition, register); + } - /** - * Creates and returns an address breakpoint for the source defined by the - * given source handle, at the given address. The marker associated with the - * breakpoint will be created on the specified resource. - * - * @param module - * the module name the breakpoint is set in - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param lineNumber - * the line number in the source file - * @param address - * the address on which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return an address breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, - int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, String condition, boolean register) - throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setAddressBreakpointAttributes(attributes, module, sourceHandle, type, lineNumber, address, enabled, - ignoreCount, condition); - return new CAddressBreakpoint(resource, attributes, register); - } + /** + * Creates and returns an address breakpoint for the source defined by the + * given source handle, at the given address. The marker associated with the + * breakpoint will be created on the specified resource. + * + * @param module + * the module name the breakpoint is set in + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param address + * the address on which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return an address breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, + int type, IAddress address, boolean enabled, int ignoreCount, String condition, boolean register) + throws CoreException { + return createAddressBreakpoint(module, sourceHandle, resource, type, -1, address, enabled, ignoreCount, + condition, register); + } + + /** + * Creates and returns an address breakpoint for the source defined by the + * given source handle, at the given address. The marker associated with the + * breakpoint will be created on the specified resource. + * + * @param module + * the module name the breakpoint is set in + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param lineNumber + * the line number in the source file + * @param address + * the address on which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return an address breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICAddressBreakpoint createAddressBreakpoint(String module, String sourceHandle, IResource resource, + int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, String condition, + boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setAddressBreakpointAttributes(attributes, module, sourceHandle, type, lineNumber, address, enabled, + ignoreCount, condition); + return new CAddressBreakpoint(resource, attributes, register); + } + + /** + * Creates an address breakpoint without associated marker. + * <p> + * Note: Before a breakpoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICAddressBreakpoint createBlankAddressBreakpoint() { + return new CAddressBreakpoint(); + } - /** - * Creates an address breakpoint without associated marker. - * <p> - * Note: Before a breakpoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICAddressBreakpoint createBlankAddressBreakpoint() { - return new CAddressBreakpoint(); - } + /** + * @since 7.0 + */ + public static ICAddressBreakpoint createAddressTracepoint(String module, String sourceHandle, IResource resource, + int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, String condition, + boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setAddressBreakpointAttributes(attributes, module, sourceHandle, type, lineNumber, address, enabled, + ignoreCount, condition); + return new CAddressTracepoint(resource, attributes, register); + } - /** - * @since 7.0 - */ - public static ICAddressBreakpoint createAddressTracepoint(String module, String sourceHandle, IResource resource, - int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, String condition, boolean register) - throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setAddressBreakpointAttributes(attributes, module, sourceHandle, type, lineNumber, address, enabled, - ignoreCount, condition); - return new CAddressTracepoint(resource, attributes, register); - } + /** + * Creates an address tracepoint without associated marker. + * <p> + * Note: Before a tracepoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICAddressBreakpoint createBlankAddressTracepoint() { + return new CAddressTracepoint(); + } - /** - * Creates an address tracepoint without associated marker. - * <p> - * Note: Before a tracepoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICAddressBreakpoint createBlankAddressTracepoint() { - return new CAddressTracepoint(); - } + /** + * @since 7.5 + */ + public static ICAddressBreakpoint createAddressDynamicPrintf(String module, String sourceHandle, IResource resource, + int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, String condition, + String printfStr, boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setAddressBreakpointAttributes(attributes, module, sourceHandle, type, lineNumber, address, enabled, + ignoreCount, condition); + attributes.put(ICDynamicPrintf.PRINTF_STRING, printfStr); + return new CAddressDynamicPrintf(resource, attributes, register); + } - /** - * @since 7.5 - */ - public static ICAddressBreakpoint createAddressDynamicPrintf(String module, String sourceHandle, IResource resource, - int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, String condition, String printfStr, boolean register) - throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setAddressBreakpointAttributes(attributes, module, sourceHandle, type, lineNumber, address, enabled, - ignoreCount, condition); - attributes.put(ICDynamicPrintf.PRINTF_STRING, printfStr); - return new CAddressDynamicPrintf(resource, attributes, register); - } + /** + * Creates an address dynamic printf without associated marker. + * <p> + * Note: Before a dynamic printf created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.5 + */ + public static ICAddressBreakpoint createBlankAddressDynamicPrintf() { + return new CAddressDynamicPrintf(); + } - /** - * Creates an address dynamic printf without associated marker. - * <p> - * Note: Before a dynamic printf created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.5 - */ - public static ICAddressBreakpoint createBlankAddressDynamicPrintf() { - return new CAddressDynamicPrintf(); - } - - /** - * Helper function for setting common address breakpoint attributes. - * - * @param attributes - * Map to write the attributes into. - * @param module - * the module name the breakpoint is set in - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param lineNumber - * the line number in the source file - * @param address - * the address on which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * - * @since 7.2 - */ - public static void setAddressBreakpointAttributes(Map<String, Object> attributes, String module, - String sourceHandle, int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, - String condition) { - setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); - attributes.put(IMarker.CHAR_START, Integer.valueOf(-1)); - attributes.put(IMarker.CHAR_END, Integer.valueOf(-1)); - attributes.put(ICLineBreakpoint.ADDRESS, address.toHexAddressString()); - attributes.put(ICBreakpoint.MODULE, module); - } + /** + * Helper function for setting common address breakpoint attributes. + * + * @param attributes + * Map to write the attributes into. + * @param module + * the module name the breakpoint is set in + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param lineNumber + * the line number in the source file + * @param address + * the address on which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * + * @since 7.2 + */ + public static void setAddressBreakpointAttributes(Map<String, Object> attributes, String module, + String sourceHandle, int type, int lineNumber, IAddress address, boolean enabled, int ignoreCount, + String condition) { + setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); + attributes.put(IMarker.CHAR_START, Integer.valueOf(-1)); + attributes.put(IMarker.CHAR_END, Integer.valueOf(-1)); + attributes.put(ICLineBreakpoint.ADDRESS, address.toHexAddressString()); + attributes.put(ICBreakpoint.MODULE, module); + } - /** - * Creates a watchpoint without associated marker. - * <p> - * Note: Before a watchpoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICWatchpoint createBlankWatchpoint() { - return new CWatchpoint(); - } + /** + * Creates a watchpoint without associated marker. + * <p> + * Note: Before a watchpoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICWatchpoint createBlankWatchpoint() { + return new CWatchpoint(); + } - /** - * Creates and returns a watchpoint for the source defined by the given - * source handle, at the given expression. The marker associated with the - * watchpoint will be created on the specified resource. - * - * @param sourceHandle - * the handle to the watchpoint source - * @param resource - * the resource on which to create the associated watchpoint - * marker - * @param writeAccess - * whether this is write watchpoint - * @param readAccess - * whether this is read watchpoint - * @param expression - * the expression on which the watchpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return a watchpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, boolean writeAccess, - boolean readAccess, String expression, boolean enabled, int ignoreCount, String condition, boolean register) - throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setWatchPointAttributes(attributes, sourceHandle, resource, writeAccess, readAccess, expression, "", //$NON-NLS-1$ - BigInteger.ZERO, enabled, ignoreCount, condition); - return new CWatchpoint(resource, attributes, register); - } + /** + * Creates and returns a watchpoint for the source defined by the given + * source handle, at the given expression. The marker associated with the + * watchpoint will be created on the specified resource. + * + * @param sourceHandle + * the handle to the watchpoint source + * @param resource + * the resource on which to create the associated watchpoint + * marker + * @param writeAccess + * whether this is write watchpoint + * @param readAccess + * whether this is read watchpoint + * @param expression + * the expression on which the watchpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return a watchpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, boolean writeAccess, + boolean readAccess, String expression, boolean enabled, int ignoreCount, String condition, boolean register) + throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setWatchPointAttributes(attributes, sourceHandle, resource, writeAccess, readAccess, expression, "", //$NON-NLS-1$ + BigInteger.ZERO, enabled, ignoreCount, condition); + return new CWatchpoint(resource, attributes, register); + } - /** - * Creates and returns a watchpoint for the source defined by the given - * source handle, at the given expression. The marker associated with the - * watchpoint will be created on the specified resource. - * - * @param sourceHandle - * the handle to the watchpoint source - * @param resource - * the resource on which to create the associated watchpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param writeAccess - * whether this is write watchpoint - * @param readAccess - * whether this is read watchpoint - * @param expression - * the expression on which the watchpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return a watchpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - * + /** + * Creates and returns a watchpoint for the source defined by the given + * source handle, at the given expression. The marker associated with the + * watchpoint will be created on the specified resource. + * + * @param sourceHandle + * the handle to the watchpoint source + * @param resource + * the resource on which to create the associated watchpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param writeAccess + * whether this is write watchpoint + * @param readAccess + * whether this is read watchpoint + * @param expression + * the expression on which the watchpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return a watchpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + * * @since 7.3 */ - public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, int type, boolean writeAccess, - boolean readAccess, String expression, boolean enabled, int ignoreCount, String condition, boolean register) - throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setWatchPointAttributes(attributes, sourceHandle, resource, type, writeAccess, readAccess, expression, "", //$NON-NLS-1$ - BigInteger.ZERO, enabled, ignoreCount, condition); - return new CWatchpoint(resource, attributes, register); - } + public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, int type, boolean writeAccess, + boolean readAccess, String expression, boolean enabled, int ignoreCount, String condition, boolean register) + throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setWatchPointAttributes(attributes, sourceHandle, resource, type, writeAccess, readAccess, expression, "", //$NON-NLS-1$ + BigInteger.ZERO, enabled, ignoreCount, condition); + return new CWatchpoint(resource, attributes, register); + } - /** - * Creates and returns a watchpoint for the source defined by the given - * source handle, at the given expression. The marker associated with the - * watchpoint will be created on the specified resource. - * - * @param sourceHandle - * the handle to the watchpoint source - * @param resource - * the resource on which to create the associated watchpoint - * marker - * @param charStart - * the first character index associated with the watchpoint, or - * -1 if unspecified, in the source file in which the watchpoint - * is set - * @param charEnd - * the last character index associated with the watchpoint, or -1 - * if unspecified, in the source file in which the watchpoint is - * set - * @param lineNumber - * the lineNumber on which the watchpoint is set, or -1 if - * unspecified - line numbers are 1 based, associated with the - * source file in which the watchpoint is set - * @param writeAccess - * whether this is write watchpoint - * @param readAccess - * whether this is read watchpoint - * @param expression - * the expression on which the watchpoint is set - * @param memorySpace - * the memory space in which the watchpoint is set - * @param range - * the range of the watchpoint in addressable units - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return a watchpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, int charStart, int charEnd, - int lineNumber, boolean writeAccess, boolean readAccess, String expression, String memorySpace, - BigInteger range, boolean enabled, int ignoreCount, String condition, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setWatchPointAttributes(attributes, sourceHandle, resource, writeAccess, readAccess, expression, memorySpace, - range, enabled, ignoreCount, condition); - attributes.put(IMarker.CHAR_START, Integer.valueOf(charStart)); - attributes.put(IMarker.CHAR_END, Integer.valueOf(charEnd)); - attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(lineNumber)); - return new CWatchpoint(resource, attributes, register); - } + /** + * Creates and returns a watchpoint for the source defined by the given + * source handle, at the given expression. The marker associated with the + * watchpoint will be created on the specified resource. + * + * @param sourceHandle + * the handle to the watchpoint source + * @param resource + * the resource on which to create the associated watchpoint + * marker + * @param charStart + * the first character index associated with the watchpoint, or + * -1 if unspecified, in the source file in which the watchpoint + * is set + * @param charEnd + * the last character index associated with the watchpoint, or -1 + * if unspecified, in the source file in which the watchpoint is + * set + * @param lineNumber + * the lineNumber on which the watchpoint is set, or -1 if + * unspecified - line numbers are 1 based, associated with the + * source file in which the watchpoint is set + * @param writeAccess + * whether this is write watchpoint + * @param readAccess + * whether this is read watchpoint + * @param expression + * the expression on which the watchpoint is set + * @param memorySpace + * the memory space in which the watchpoint is set + * @param range + * the range of the watchpoint in addressable units + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return a watchpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, int charStart, int charEnd, + int lineNumber, boolean writeAccess, boolean readAccess, String expression, String memorySpace, + BigInteger range, boolean enabled, int ignoreCount, String condition, boolean register) + throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setWatchPointAttributes(attributes, sourceHandle, resource, writeAccess, readAccess, expression, memorySpace, + range, enabled, ignoreCount, condition); + attributes.put(IMarker.CHAR_START, Integer.valueOf(charStart)); + attributes.put(IMarker.CHAR_END, Integer.valueOf(charEnd)); + attributes.put(IMarker.LINE_NUMBER, Integer.valueOf(lineNumber)); + return new CWatchpoint(resource, attributes, register); + } - /** - * Creates and returns a watchpoint for the source defined by the given - * source handle, at the given expression and over the given range. The - * marker associated with the watchpoint will be created on the specified - * resource. - * - * @param sourceHandle - * the handle to the watchpoint source - * @param resource - * the resource on which to create the associated watchpoint - * marker - * @param writeAccess - * whether this is write watchpoint - * @param readAccess - * whether this is read watchpoint - * @param expression - * the expression on which the watchpoint is set - * @param memorySpace - * the memory space in which the watchpoint is set - * @param range - * the range of the watchpoint in addressable units - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return the watchpoint that was created - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, boolean writeAccess, - boolean readAccess, String expression, String memorySpace, BigInteger range, boolean enabled, int ignoreCount, - String condition, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setWatchPointAttributes(attributes, sourceHandle, resource, writeAccess, readAccess, expression, memorySpace, - range, enabled, ignoreCount, condition); - return new CWatchpoint(resource, attributes, register); - } + /** + * Creates and returns a watchpoint for the source defined by the given + * source handle, at the given expression and over the given range. The + * marker associated with the watchpoint will be created on the specified + * resource. + * + * @param sourceHandle + * the handle to the watchpoint source + * @param resource + * the resource on which to create the associated watchpoint + * marker + * @param writeAccess + * whether this is write watchpoint + * @param readAccess + * whether this is read watchpoint + * @param expression + * the expression on which the watchpoint is set + * @param memorySpace + * the memory space in which the watchpoint is set + * @param range + * the range of the watchpoint in addressable units + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return the watchpoint that was created + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICWatchpoint createWatchpoint(String sourceHandle, IResource resource, boolean writeAccess, + boolean readAccess, String expression, String memorySpace, BigInteger range, boolean enabled, + int ignoreCount, String condition, boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setWatchPointAttributes(attributes, sourceHandle, resource, writeAccess, readAccess, expression, memorySpace, + range, enabled, ignoreCount, condition); + return new CWatchpoint(resource, attributes, register); + } - /** - * Helper function for setting common watchpoint attributes. - * - * @param attributes - * Map to write the attributes into. - * @param sourceHandle - * the handle to the watchpoint source - * @param resource - * the resource on which to create the associated watchpoint - * marker - * @param writeAccess - * whether this is write watchpoint - * @param readAccess - * whether this is read watchpoint - * @param expression - * the expression on which the watchpoint is set - * @param memorySpace - * the memory space in which the watchpoint is set - * @param range - * the range of the watchpoint in addressable units - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * - * @since 7.2 - */ - public static void setWatchPointAttributes(Map<String, Object> attributes, String sourceHandle, IResource resource, - boolean writeAccess, boolean readAccess, String expression, String memorySpace, BigInteger range, - boolean enabled, int ignoreCount, String condition) { - attributes.put(IBreakpoint.ID, getPluginIdentifier()); - attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled)); - attributes.put(ICBreakpoint.IGNORE_COUNT, Integer.valueOf(ignoreCount)); - attributes.put(ICBreakpoint.CONDITION, condition); - attributes.put(ICBreakpoint.SOURCE_HANDLE, sourceHandle); - attributes.put(ICWatchpoint.EXPRESSION, expression); - attributes.put(ICWatchpoint2.MEMORYSPACE, memorySpace); - attributes.put(ICWatchpoint2.RANGE, range.toString()); - attributes.put(ICWatchpoint.READ, Boolean.valueOf(readAccess)); - attributes.put(ICWatchpoint.WRITE, Boolean.valueOf(writeAccess)); - } + /** + * Helper function for setting common watchpoint attributes. + * + * @param attributes + * Map to write the attributes into. + * @param sourceHandle + * the handle to the watchpoint source + * @param resource + * the resource on which to create the associated watchpoint + * marker + * @param writeAccess + * whether this is write watchpoint + * @param readAccess + * whether this is read watchpoint + * @param expression + * the expression on which the watchpoint is set + * @param memorySpace + * the memory space in which the watchpoint is set + * @param range + * the range of the watchpoint in addressable units + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * + * @since 7.2 + */ + public static void setWatchPointAttributes(Map<String, Object> attributes, String sourceHandle, IResource resource, + boolean writeAccess, boolean readAccess, String expression, String memorySpace, BigInteger range, + boolean enabled, int ignoreCount, String condition) { + attributes.put(IBreakpoint.ID, getPluginIdentifier()); + attributes.put(IBreakpoint.ENABLED, Boolean.valueOf(enabled)); + attributes.put(ICBreakpoint.IGNORE_COUNT, Integer.valueOf(ignoreCount)); + attributes.put(ICBreakpoint.CONDITION, condition); + attributes.put(ICBreakpoint.SOURCE_HANDLE, sourceHandle); + attributes.put(ICWatchpoint.EXPRESSION, expression); + attributes.put(ICWatchpoint2.MEMORYSPACE, memorySpace); + attributes.put(ICWatchpoint2.RANGE, range.toString()); + attributes.put(ICWatchpoint.READ, Boolean.valueOf(readAccess)); + attributes.put(ICWatchpoint.WRITE, Boolean.valueOf(writeAccess)); + } - /** - * Helper function for setting common watchpoint attributes. - * - * @param attributes - * Map to write the attributes into. - * @param sourceHandle - * the handle to the watchpoint source - * @param resource - * the resource on which to create the associated watchpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param writeAccess - * whether this is write watchpoint - * @param readAccess - * whether this is read watchpoint - * @param expression - * the expression on which the watchpoint is set - * @param memorySpace - * the memory space in which the watchpoint is set - * @param range - * the range of the watchpoint in addressable units - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * + /** + * Helper function for setting common watchpoint attributes. + * + * @param attributes + * Map to write the attributes into. + * @param sourceHandle + * the handle to the watchpoint source + * @param resource + * the resource on which to create the associated watchpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param writeAccess + * whether this is write watchpoint + * @param readAccess + * whether this is read watchpoint + * @param expression + * the expression on which the watchpoint is set + * @param memorySpace + * the memory space in which the watchpoint is set + * @param range + * the range of the watchpoint in addressable units + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * * @since 7.3 */ - public static void setWatchPointAttributes(Map<String, Object> attributes, String sourceHandle, IResource resource, - int type, boolean writeAccess, boolean readAccess, String expression, String memorySpace, BigInteger range, - boolean enabled, int ignoreCount, String condition) { - setWatchPointAttributes(attributes, sourceHandle, resource, - writeAccess, readAccess, expression, memorySpace, range, enabled, ignoreCount, condition); - attributes.put(ICBreakpointType.TYPE, type); - } + public static void setWatchPointAttributes(Map<String, Object> attributes, String sourceHandle, IResource resource, + int type, boolean writeAccess, boolean readAccess, String expression, String memorySpace, BigInteger range, + boolean enabled, int ignoreCount, String condition) { + setWatchPointAttributes(attributes, sourceHandle, resource, writeAccess, readAccess, expression, memorySpace, + range, enabled, ignoreCount, condition); + attributes.put(ICBreakpointType.TYPE, type); + } - /** - * Creates and returns a breakpoint for the function defined by the given - * name. The marker associated with the breakpoint will be created on the - * specified resource. - * - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param function - * the name of the function this breakpoint suspends execution in - * @param charStart - * the first character index associated with the breakpoint, or - * -1 if unspecified, in the source file in which the breakpoint - * is set - * @param charEnd - * the last character index associated with the breakpoint, or -1 - * if unspecified, in the source file in which the breakpoint is - * set - * @param lineNumber - * the lineNumber on which the breakpoint is set, or -1 if - * unspecified - line numbers are 1 based, associated with the - * source file in which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return an address breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - * @deprecated as of CDT 5.0 use - * {@link #createFunctionBreakpoint(String, IResource, int, String, int, int, int, boolean, int, String, boolean)} - */ - @Deprecated - public static ICFunctionBreakpoint createFunctionBreakpoint(String sourceHandle, IResource resource, - String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, - String condition, boolean register) throws CoreException { - return createFunctionBreakpoint(sourceHandle, resource, ICBreakpointType.REGULAR, function, charStart, charEnd, - lineNumber, enabled, ignoreCount, condition, register); - } + /** + * Creates and returns a breakpoint for the function defined by the given + * name. The marker associated with the breakpoint will be created on the + * specified resource. + * + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param function + * the name of the function this breakpoint suspends execution in + * @param charStart + * the first character index associated with the breakpoint, or + * -1 if unspecified, in the source file in which the breakpoint + * is set + * @param charEnd + * the last character index associated with the breakpoint, or -1 + * if unspecified, in the source file in which the breakpoint is + * set + * @param lineNumber + * the lineNumber on which the breakpoint is set, or -1 if + * unspecified - line numbers are 1 based, associated with the + * source file in which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return an address breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + * @deprecated as of CDT 5.0 use + * {@link #createFunctionBreakpoint(String, IResource, int, String, int, int, int, boolean, int, String, boolean)} + */ + @Deprecated + public static ICFunctionBreakpoint createFunctionBreakpoint(String sourceHandle, IResource resource, + String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, + String condition, boolean register) throws CoreException { + return createFunctionBreakpoint(sourceHandle, resource, ICBreakpointType.REGULAR, function, charStart, charEnd, + lineNumber, enabled, ignoreCount, condition, register); + } - /** - * Creates and returns a breakpoint for the function defined by the given - * name. The marker associated with the breakpoint will be created on the - * specified resource. - * - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param function - * the name of the function this breakpoint suspends execution in - * @param charStart - * the first character index associated with the breakpoint, or - * -1 if unspecified, in the source file in which the breakpoint - * is set - * @param charEnd - * the last character index associated with the breakpoint, or -1 - * if unspecified, in the source file in which the breakpoint is - * set - * @param lineNumber - * the lineNumber on which the breakpoint is set, or -1 if - * unspecified - line numbers are 1 based, associated with the - * source file in which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return an address breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICFunctionBreakpoint createFunctionBreakpoint(String sourceHandle, IResource resource, int type, - String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, - String condition, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setFunctionBreakpointAttributes(attributes, sourceHandle, type, function, charStart, charEnd, lineNumber, - enabled, ignoreCount, condition); - return new CFunctionBreakpoint(resource, attributes, register); - } + /** + * Creates and returns a breakpoint for the function defined by the given + * name. The marker associated with the breakpoint will be created on the + * specified resource. + * + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param function + * the name of the function this breakpoint suspends execution in + * @param charStart + * the first character index associated with the breakpoint, or + * -1 if unspecified, in the source file in which the breakpoint + * is set + * @param charEnd + * the last character index associated with the breakpoint, or -1 + * if unspecified, in the source file in which the breakpoint is + * set + * @param lineNumber + * the lineNumber on which the breakpoint is set, or -1 if + * unspecified - line numbers are 1 based, associated with the + * source file in which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return an address breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICFunctionBreakpoint createFunctionBreakpoint(String sourceHandle, IResource resource, int type, + String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, + String condition, boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setFunctionBreakpointAttributes(attributes, sourceHandle, type, function, charStart, charEnd, lineNumber, + enabled, ignoreCount, condition); + return new CFunctionBreakpoint(resource, attributes, register); + } - /** - * Creates a function breakpoint without associated marker. - * <p> - * Note: Before a breakpoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICFunctionBreakpoint createBlankFunctionBreakpoint() { - return new CFunctionBreakpoint(); - } + /** + * Creates a function breakpoint without associated marker. + * <p> + * Note: Before a breakpoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICFunctionBreakpoint createBlankFunctionBreakpoint() { + return new CFunctionBreakpoint(); + } - /** - * Creates and returns a tracepoint for the function defined by the given - * name. The marker associated with the breakpoint will be created on the - * specified resource. - * - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param function - * the name of the function this breakpoint suspends execution in - * @param charStart - * the first character index associated with the breakpoint, or - * -1 if unspecified, in the source file in which the breakpoint - * is set - * @param charEnd - * the last character index associated with the breakpoint, or -1 - * if unspecified, in the source file in which the breakpoint is - * set - * @param lineNumber - * the lineNumber on which the breakpoint is set, or -1 if - * unspecified - line numbers are 1 based, associated with the - * source file in which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return an address breakpoint - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - * @since 7.0 - */ - public static ICFunctionBreakpoint createFunctionTracepoint(String sourceHandle, IResource resource, int type, - String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, - String condition, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setFunctionBreakpointAttributes(attributes, sourceHandle, type, function, charStart, charEnd, lineNumber, - enabled, ignoreCount, condition); - return new CFunctionTracepoint(resource, attributes, register); - } + /** + * Creates and returns a tracepoint for the function defined by the given + * name. The marker associated with the breakpoint will be created on the + * specified resource. + * + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param function + * the name of the function this breakpoint suspends execution in + * @param charStart + * the first character index associated with the breakpoint, or + * -1 if unspecified, in the source file in which the breakpoint + * is set + * @param charEnd + * the last character index associated with the breakpoint, or -1 + * if unspecified, in the source file in which the breakpoint is + * set + * @param lineNumber + * the lineNumber on which the breakpoint is set, or -1 if + * unspecified - line numbers are 1 based, associated with the + * source file in which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return an address breakpoint + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + * @since 7.0 + */ + public static ICFunctionBreakpoint createFunctionTracepoint(String sourceHandle, IResource resource, int type, + String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, + String condition, boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setFunctionBreakpointAttributes(attributes, sourceHandle, type, function, charStart, charEnd, lineNumber, + enabled, ignoreCount, condition); + return new CFunctionTracepoint(resource, attributes, register); + } - /** - * Creates a function tracepoint without associated marker. - * <p> - * Note: Before a tracepoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICFunctionBreakpoint createBlankFunctionTracepoint() { - return new CFunctionTracepoint(); - } + /** + * Creates a function tracepoint without associated marker. + * <p> + * Note: Before a tracepoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICFunctionBreakpoint createBlankFunctionTracepoint() { + return new CFunctionTracepoint(); + } - /** - * @since 7.5 - */ - public static ICFunctionBreakpoint createFunctionDynamicPrintf(String sourceHandle, IResource resource, int type, - String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, - String condition, String printfStr, boolean register) throws CoreException { - HashMap<String, Object> attributes = new HashMap<String, Object>(10); - setFunctionBreakpointAttributes(attributes, sourceHandle, type, function, charStart, charEnd, lineNumber, - enabled, ignoreCount, condition); - attributes.put(ICDynamicPrintf.PRINTF_STRING, printfStr); - return new CFunctionDynamicPrintf(resource, attributes, register); - } + /** + * @since 7.5 + */ + public static ICFunctionBreakpoint createFunctionDynamicPrintf(String sourceHandle, IResource resource, int type, + String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, + String condition, String printfStr, boolean register) throws CoreException { + HashMap<String, Object> attributes = new HashMap<String, Object>(10); + setFunctionBreakpointAttributes(attributes, sourceHandle, type, function, charStart, charEnd, lineNumber, + enabled, ignoreCount, condition); + attributes.put(ICDynamicPrintf.PRINTF_STRING, printfStr); + return new CFunctionDynamicPrintf(resource, attributes, register); + } - /** - * Creates a function dynamic printf without associated marker. - * <p> - * Note: Before a dynamic printf created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.5 - */ - public static ICFunctionBreakpoint createBlankFunctionDynamicPrintf() { - return new CFunctionDynamicPrintf(); - } + /** + * Creates a function dynamic printf without associated marker. + * <p> + * Note: Before a dynamic printf created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.5 + */ + public static ICFunctionBreakpoint createBlankFunctionDynamicPrintf() { + return new CFunctionDynamicPrintf(); + } - /** - * Helper function for setting common address breakpoint attributes. - * - * @param attributes - * Map to write the attributes into. - * @param sourceHandle - * the handle to the breakpoint source - * @param resource - * the resource on which to create the associated breakpoint - * marker - * @param type - * a type constant from ICBreakpointType - * @param function - * the name of the function this breakpoint suspends execution in - * @param charStart - * the first character index associated with the breakpoint, or - * -1 if unspecified, in the source file in which the breakpoint - * is set - * @param charEnd - * the last character index associated with the breakpoint, or -1 - * if unspecified, in the source file in which the breakpoint is - * set - * @param lineNumber - * the lineNumber on which the breakpoint is set, or -1 if - * unspecified - line numbers are 1 based, associated with the - * source file in which the breakpoint is set - * @param enabled - * whether to enable or disable this breakpoint - * @param ignoreCount - * the number of times this breakpoint will be ignored - * @param condition - * the breakpoint condition - * @param register - * whether to add this breakpoint to the breakpoint manager - * - * @since 7.2 - */ - public static void setFunctionBreakpointAttributes(Map<String, Object> attributes, String sourceHandle, int type, - String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, String condition) { - setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); - attributes.put(IMarker.CHAR_START, Integer.valueOf(charStart)); - attributes.put(IMarker.CHAR_END, Integer.valueOf(charEnd)); - attributes.put(ICLineBreakpoint.FUNCTION, function); - } + /** + * Helper function for setting common address breakpoint attributes. + * + * @param attributes + * Map to write the attributes into. + * @param sourceHandle + * the handle to the breakpoint source + * @param resource + * the resource on which to create the associated breakpoint + * marker + * @param type + * a type constant from ICBreakpointType + * @param function + * the name of the function this breakpoint suspends execution in + * @param charStart + * the first character index associated with the breakpoint, or + * -1 if unspecified, in the source file in which the breakpoint + * is set + * @param charEnd + * the last character index associated with the breakpoint, or -1 + * if unspecified, in the source file in which the breakpoint is + * set + * @param lineNumber + * the lineNumber on which the breakpoint is set, or -1 if + * unspecified - line numbers are 1 based, associated with the + * source file in which the breakpoint is set + * @param enabled + * whether to enable or disable this breakpoint + * @param ignoreCount + * the number of times this breakpoint will be ignored + * @param condition + * the breakpoint condition + * @param register + * whether to add this breakpoint to the breakpoint manager + * + * @since 7.2 + */ + public static void setFunctionBreakpointAttributes(Map<String, Object> attributes, String sourceHandle, int type, + String function, int charStart, int charEnd, int lineNumber, boolean enabled, int ignoreCount, + String condition) { + setLineBreakpointAttributes(attributes, sourceHandle, type, lineNumber, enabled, ignoreCount, condition); + attributes.put(IMarker.CHAR_START, Integer.valueOf(charStart)); + attributes.put(IMarker.CHAR_END, Integer.valueOf(charEnd)); + attributes.put(ICLineBreakpoint.FUNCTION, function); + } - /** - * Returns the line breakpoint that is already registered with the - * breakpoint manager for a source with the given handle and the given - * resource at the given line number. - * - * @param sourceHandle - * the source handle - * @param resource - * the breakpoint resource - * @param lineNumber - * the line number - * @return the line breakpoint that is already registered with the - * breakpoint manager or <code>null</code> if no such breakpoint is - * registered - * @exception CoreException - * if unable to retrieve the associated marker attributes - * (line number). - */ - public static ICLineBreakpoint lineBreakpointExists(String sourceHandle, IResource resource, int lineNumber) - throws CoreException { - String modelId = getPluginIdentifier(); - IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); - IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); - for (int i = 0; i < breakpoints.length; i++) { - if (!(breakpoints[i] instanceof ICLineBreakpoint)) { - continue; - } - ICLineBreakpoint breakpoint = (ICLineBreakpoint) breakpoints[i]; - if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) { - if (breakpoint.getLineNumber() == lineNumber) { - return breakpoint; - } - } - } - return null; - } + /** + * Returns the line breakpoint that is already registered with the + * breakpoint manager for a source with the given handle and the given + * resource at the given line number. + * + * @param sourceHandle + * the source handle + * @param resource + * the breakpoint resource + * @param lineNumber + * the line number + * @return the line breakpoint that is already registered with the + * breakpoint manager or <code>null</code> if no such breakpoint is + * registered + * @exception CoreException + * if unable to retrieve the associated marker attributes + * (line number). + */ + public static ICLineBreakpoint lineBreakpointExists(String sourceHandle, IResource resource, int lineNumber) + throws CoreException { + String modelId = getPluginIdentifier(); + IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); + IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); + for (int i = 0; i < breakpoints.length; i++) { + if (!(breakpoints[i] instanceof ICLineBreakpoint)) { + continue; + } + ICLineBreakpoint breakpoint = (ICLineBreakpoint) breakpoints[i]; + if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) { + if (breakpoint.getLineNumber() == lineNumber) { + return breakpoint; + } + } + } + return null; + } - /** - * Returns the watchpoint that is already registered with the breakpoint - * manager for a source with the given handle and the given resource at the - * given expression. - * - * @param sourceHandle - * the source handle - * @param resource - * the breakpoint resource - * @param expression - * the expression - * @return the watchpoint that is already registered with the breakpoint - * manager or <code>null</code> if no such watchpoint is registered - * @exception CoreException - * if unable to retrieve the associated marker attributes - * (line number). - */ - public static ICWatchpoint watchpointExists(String sourceHandle, IResource resource, String expression) - throws CoreException { - String modelId = getPluginIdentifier(); - String markerType = ICWatchpoint.C_WATCHPOINT_MARKER; - IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); - IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); - for (int i = 0; i < breakpoints.length; i++) { - if (!(breakpoints[i] instanceof ICWatchpoint)) { - continue; - } - ICWatchpoint breakpoint = (ICWatchpoint) breakpoints[i]; - if (breakpoint.getMarker().getType().equals(markerType)) { - if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) { - if (breakpoint.getMarker().getResource().equals(resource)) { - if (breakpoint.getExpression().equals(expression)) { - return breakpoint; - } - } - } - } - } - return null; - } + /** + * Returns the watchpoint that is already registered with the breakpoint + * manager for a source with the given handle and the given resource at the + * given expression. + * + * @param sourceHandle + * the source handle + * @param resource + * the breakpoint resource + * @param expression + * the expression + * @return the watchpoint that is already registered with the breakpoint + * manager or <code>null</code> if no such watchpoint is registered + * @exception CoreException + * if unable to retrieve the associated marker attributes + * (line number). + */ + public static ICWatchpoint watchpointExists(String sourceHandle, IResource resource, String expression) + throws CoreException { + String modelId = getPluginIdentifier(); + String markerType = ICWatchpoint.C_WATCHPOINT_MARKER; + IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); + IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); + for (int i = 0; i < breakpoints.length; i++) { + if (!(breakpoints[i] instanceof ICWatchpoint)) { + continue; + } + ICWatchpoint breakpoint = (ICWatchpoint) breakpoints[i]; + if (breakpoint.getMarker().getType().equals(markerType)) { + if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) { + if (breakpoint.getMarker().getResource().equals(resource)) { + if (breakpoint.getExpression().equals(expression)) { + return breakpoint; + } + } + } + } + } + return null; + } - /** - * Returns the function breakpoint that is already registered with the - * breakpoint manager for a source with the given handle and the given - * resource with the given function name. - * - * @param sourceHandle - * the source handle - * @param resource - * the breakpoint resource - * @param function - * the fully qualified function name - * @return the breakpoint that is already registered with the breakpoint - * manager or <code>null</code> if no such breakpoint is registered - * @exception CoreException - * if unable to retrieve the associated marker attributes - * (line number). - */ - public static ICFunctionBreakpoint functionBreakpointExists(String sourceHandle, IResource resource, String function) - throws CoreException { - String modelId = getPluginIdentifier(); - IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); - IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); - for (int i = 0; i < breakpoints.length; i++) { - if (!(breakpoints[i] instanceof ICFunctionBreakpoint)) { - continue; - } - ICFunctionBreakpoint breakpoint = (ICFunctionBreakpoint) breakpoints[i]; - if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) { - if (breakpoint.getMarker().getResource().equals(resource)) { - if (breakpoint.getFunction() != null && breakpoint.getFunction().equals(function)) { - return breakpoint; - } - } - } - } - return null; - } + /** + * Returns the function breakpoint that is already registered with the + * breakpoint manager for a source with the given handle and the given + * resource with the given function name. + * + * @param sourceHandle + * the source handle + * @param resource + * the breakpoint resource + * @param function + * the fully qualified function name + * @return the breakpoint that is already registered with the breakpoint + * manager or <code>null</code> if no such breakpoint is registered + * @exception CoreException + * if unable to retrieve the associated marker attributes + * (line number). + */ + public static ICFunctionBreakpoint functionBreakpointExists(String sourceHandle, IResource resource, + String function) throws CoreException { + String modelId = getPluginIdentifier(); + IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); + IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); + for (int i = 0; i < breakpoints.length; i++) { + if (!(breakpoints[i] instanceof ICFunctionBreakpoint)) { + continue; + } + ICFunctionBreakpoint breakpoint = (ICFunctionBreakpoint) breakpoints[i]; + if (sameSourceHandle(sourceHandle, breakpoint.getSourceHandle())) { + if (breakpoint.getMarker().getResource().equals(resource)) { + if (breakpoint.getFunction() != null && breakpoint.getFunction().equals(function)) { + return breakpoint; + } + } + } + } + return null; + } - private static boolean sameSourceHandle(String handle1, String handle2) { - if (handle1 == null || handle2 == null) - return false; - IPath path1 = new Path(handle1); - IPath path2 = new Path(handle2); - if (path1.isValidPath(handle1) && path2.isValidPath(handle2)) { - return path1.equals(path2); - } - // If handles are not file names ???? - return handle1.equals(handle2); - } + private static boolean sameSourceHandle(String handle1, String handle2) { + if (handle1 == null || handle2 == null) + return false; + IPath path1 = new Path(handle1); + IPath path2 = new Path(handle2); + if (path1.isValidPath(handle1) && path2.isValidPath(handle2)) { + return path1.equals(path2); + } + // If handles are not file names ???? + return handle1.equals(handle2); + } - /** - * Checks whether an event breakpoint with given type and argument already - * exists. If multiple event breakpoints exist that match given parameters, - * only one of them will be returned. - * - * @param type - * Event type. - * @param arg - * Event argument. - * @return Event breakpoint, if found. - * @throws CoreException - * Exception in reading breakpoint properties. - */ - public static ICEventBreakpoint eventBreakpointExists(String type, String arg) throws CoreException { - String modelId = getPluginIdentifier(); + /** + * Checks whether an event breakpoint with given type and argument already + * exists. If multiple event breakpoints exist that match given parameters, + * only one of them will be returned. + * + * @param type + * Event type. + * @param arg + * Event argument. + * @return Event breakpoint, if found. + * @throws CoreException + * Exception in reading breakpoint properties. + */ + public static ICEventBreakpoint eventBreakpointExists(String type, String arg) throws CoreException { + String modelId = getPluginIdentifier(); - IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); - IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); - for (int i = 0; i < breakpoints.length; i++) { - if (!(breakpoints[i] instanceof ICEventBreakpoint)) { - continue; - } - ICEventBreakpoint breakpoint = (ICEventBreakpoint) breakpoints[i]; + IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager(); + IBreakpoint[] breakpoints = manager.getBreakpoints(modelId); + for (int i = 0; i < breakpoints.length; i++) { + if (!(breakpoints[i] instanceof ICEventBreakpoint)) { + continue; + } + ICEventBreakpoint breakpoint = (ICEventBreakpoint) breakpoints[i]; - if (breakpoint.getEventType().equals(type)) { - String arg1 = breakpoint.getEventArgument(); - if (arg1 == null) - arg1 = ""; //$NON-NLS-1$ - String arg2 = arg == null ? "" : arg; //$NON-NLS-1$ - if (arg1.equals(arg2)) - return breakpoint; - } + if (breakpoint.getEventType().equals(type)) { + String arg1 = breakpoint.getEventArgument(); + if (arg1 == null) + arg1 = ""; //$NON-NLS-1$ + String arg2 = arg == null ? "" : arg; //$NON-NLS-1$ + if (arg1.equals(arg2)) + return breakpoint; + } - } - return null; - } + } + return null; + } - /** - * Creates and registers a new event breakpoint. - * - * @param attributes - * Map to write the attributes into. - * @param type - * Event breakpoint type. - * @param arg - * Event-specific argument value. - * @param register - * whether to add this breakpoint to the breakpoint manager - * @return an event breakpoint - * - * @throws CoreException - * if this method fails. Reasons include: - * <ul> - * <li>Failure creating underlying marker. The exception's - * status contains the underlying exception responsible for the - * failure.</li> - * </ul> - */ - public static ICEventBreakpoint createEventBreakpoint(String type, String arg, boolean register) - throws CoreException { - final IResource resource = ResourcesPlugin.getWorkspace().getRoot(); - final Map<String, Object> attributes = new HashMap<String, Object>(); - setEventBreakpointAttributes(attributes, type, arg); - return new CEventBreakpoint(resource, attributes, register); + /** + * Creates and registers a new event breakpoint. + * + * @param attributes + * Map to write the attributes into. + * @param type + * Event breakpoint type. + * @param arg + * Event-specific argument value. + * @param register + * whether to add this breakpoint to the breakpoint manager + * @return an event breakpoint + * + * @throws CoreException + * if this method fails. Reasons include: + * <ul> + * <li>Failure creating underlying marker. The exception's + * status contains the underlying exception responsible for the + * failure.</li> + * </ul> + */ + public static ICEventBreakpoint createEventBreakpoint(String type, String arg, boolean register) + throws CoreException { + final IResource resource = ResourcesPlugin.getWorkspace().getRoot(); + final Map<String, Object> attributes = new HashMap<String, Object>(); + setEventBreakpointAttributes(attributes, type, arg); + return new CEventBreakpoint(resource, attributes, register); - } + } - /** - * Helper function for setting common event breakpoint attributes. - * - * @param attributes - * Map to write the attributes into. - * @param type - * Event breakpoint type. - * @param arg - * Event-specific argument value. - * @param register - * whether to add this breakpoint to the breakpoint manager - * - * @since 7.2 - */ - public static void setEventBreakpointAttributes(Map<String, Object> attributes, String type, String arg) { - attributes.put(IBreakpoint.ID, CDIDebugModel.getPluginIdentifier()); - attributes.put(IBreakpoint.ENABLED, true); - attributes.put(ICBreakpoint.IGNORE_COUNT, 0); - attributes.put(ICBreakpoint.CONDITION, ""); //$NON-NLS-1$ - attributes.put(ICEventBreakpoint.EVENT_TYPE_ID, type); - attributes.put(ICEventBreakpoint.EVENT_ARG, arg); - } + /** + * Helper function for setting common event breakpoint attributes. + * + * @param attributes + * Map to write the attributes into. + * @param type + * Event breakpoint type. + * @param arg + * Event-specific argument value. + * @param register + * whether to add this breakpoint to the breakpoint manager + * + * @since 7.2 + */ + public static void setEventBreakpointAttributes(Map<String, Object> attributes, String type, String arg) { + attributes.put(IBreakpoint.ID, CDIDebugModel.getPluginIdentifier()); + attributes.put(IBreakpoint.ENABLED, true); + attributes.put(ICBreakpoint.IGNORE_COUNT, 0); + attributes.put(ICBreakpoint.CONDITION, ""); //$NON-NLS-1$ + attributes.put(ICEventBreakpoint.EVENT_TYPE_ID, type); + attributes.put(ICEventBreakpoint.EVENT_ARG, arg); + } - /** - * Creates an event breakpoint without associated marker. - * <p> - * Note: Before an event breakpoint created using this method can be used, the - * client must first create a marker and register the breakpoint. The former - * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter - * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. - * - * @since 7.2 - */ - public static ICEventBreakpoint createBlankEventBreakpoint() { - return new CEventBreakpoint(); - } + /** + * Creates an event breakpoint without associated marker. + * <p> + * Note: Before an event breakpoint created using this method can be used, the + * client must first create a marker and register the breakpoint. The former + * is accomplished using {@link IBreakpoint#setMarker(IMarker)}, the latter + * using {@link IBreakpointManager#addBreakpoint(IBreakpoint)}. + * + * @since 7.2 + */ + public static ICEventBreakpoint createBlankEventBreakpoint() { + return new CEventBreakpoint(); + } - /** - * Creates a marker for given C breakpoint. - * - * @param breakpoint - * Breakpoint to create the marker for. - * @param resource - * Resource to create the marker on. - * @param attributes - * Marker attributes to use. - * @param add - * Whether to register the breakpoint with breakpoint manager. - * @throws CoreException - * Error thrown while creating marker. - * - * @since 7.2 - */ - public static void createBreakpointMarker(final ICBreakpoint breakpoint, final IResource resource, - final Map<String, Object> attributes, final boolean add) throws CoreException { - if (breakpoint.getMarker() != null) { - throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.PLUGIN_ID, - "Cannot create breakpoint marker breakpoint given breakpoint already has an assotiated maker")); //$NON-NLS-1$ - } + /** + * Creates a marker for given C breakpoint. + * + * @param breakpoint + * Breakpoint to create the marker for. + * @param resource + * Resource to create the marker on. + * @param attributes + * Marker attributes to use. + * @param add + * Whether to register the breakpoint with breakpoint manager. + * @throws CoreException + * Error thrown while creating marker. + * + * @since 7.2 + */ + public static void createBreakpointMarker(final ICBreakpoint breakpoint, final IResource resource, + final Map<String, Object> attributes, final boolean add) throws CoreException { + if (breakpoint.getMarker() != null) { + throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.PLUGIN_ID, + "Cannot create breakpoint marker breakpoint given breakpoint already has an assotiated maker")); //$NON-NLS-1$ + } - IWorkspaceRunnable wr = new IWorkspaceRunnable() { - @Override - public void run(IProgressMonitor monitor) throws CoreException { - // create the marker - IMarker marker = resource.createMarker(calculateMarkerType(breakpoint)); - breakpoint.setMarker(marker); + IWorkspaceRunnable wr = new IWorkspaceRunnable() { + @Override + public void run(IProgressMonitor monitor) throws CoreException { + // create the marker + IMarker marker = resource.createMarker(calculateMarkerType(breakpoint)); + breakpoint.setMarker(marker); - // set attributes - marker.setAttributes(attributes); + // set attributes + marker.setAttributes(attributes); - // set the marker message - if (breakpoint instanceof ICBreakpoint2) { - ((ICBreakpoint2) breakpoint).refreshMessage(); - } + // set the marker message + if (breakpoint instanceof ICBreakpoint2) { + ((ICBreakpoint2) breakpoint).refreshMessage(); + } - // add to breakpoint manager if requested - if (add) { - DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(breakpoint); - } - } - }; - ResourcesPlugin.getWorkspace().run(wr, null); - } + // add to breakpoint manager if requested + if (add) { + DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(breakpoint); + } + } + }; + ResourcesPlugin.getWorkspace().run(wr, null); + } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java index 9ff52dee319..b59a4c325cb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java @@ -60,7 +60,7 @@ public class CDebugCorePlugin extends Plugin { /** * The plug-in identifier (value <code>"org.eclipse.cdt.debug.core"</code>). */ - public static final String PLUGIN_ID = "org.eclipse.cdt.debug.core" ; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.cdt.debug.core"; //$NON-NLS-1$ /** * Status code indicating an unexpected internal error. @@ -76,24 +76,23 @@ public class CDebugCorePlugin extends Plugin { * Breakpoint listener list. */ private ListenerList fBreakpointListeners; - + /** * Breakpoint action manager. */ private BreakpointActionManager breakpointActionManager; - private DisassemblyContextService fDisassemblyContextService; + private DisassemblyContextService fDisassemblyContextService; public static final String CDEBUGGER_EXTENSION_POINT_ID = "CDebugger"; //$NON-NLS-1$ public static final String DEBUGGER_ELEMENT = "debugger"; //$NON-NLS-1$ - + public static final String BREAKPOINT_ACTION_EXTENSION_POINT_ID = "BreakpointActionType"; //$NON-NLS-1$ - public static final String ACTION_TYPE_ELEMENT = "actionType"; //$NON-NLS-1$ - - public static final String BREAKPOINT_EXTENSION_EXTENSION_POINT_ID = "BreakpointExtension"; //$NON-NLS-1$ - public static final String BREAKPOINT_EXTENSION_ELEMENT = "breakpointExtension"; //$NON-NLS-1$ - - + public static final String ACTION_TYPE_ELEMENT = "actionType"; //$NON-NLS-1$ + + public static final String BREAKPOINT_EXTENSION_EXTENSION_POINT_ID = "BreakpointExtension"; //$NON-NLS-1$ + public static final String BREAKPOINT_EXTENSION_ELEMENT = "breakpointExtension"; //$NON-NLS-1$ + /** * Dummy source lookup director needed to manage common source containers. */ @@ -111,7 +110,7 @@ public class CDebugCorePlugin extends Plugin { /** * Returns the shared instance. - * + * * @return the shared instance */ public static CDebugCorePlugin getDefault() { @@ -120,7 +119,7 @@ public class CDebugCorePlugin extends Plugin { /** * Returns the workspace instance. - * + * * @return the workspace instance */ public static IWorkspace getWorkspace() { @@ -129,7 +128,7 @@ public class CDebugCorePlugin extends Plugin { /** * Convenience method which returns the unique identifier of this plugin. - * + * * @return the unique identifier of this plugin */ public static String getUniqueIdentifier() { @@ -138,13 +137,13 @@ public class CDebugCorePlugin extends Plugin { /** * Logs the specified throwable with this plug-in's log. - * - * @param t throwable to log + * + * @param t throwable to log */ public static void log(Throwable t) { Throwable top = t; if (t instanceof DebugException) { - DebugException de = (DebugException)t; + DebugException de = (DebugException) t; IStatus status = de.getStatus(); if (status.getException() != null) { top = status.getException(); @@ -152,12 +151,13 @@ public class CDebugCorePlugin extends Plugin { } // this message is intentionally not internationalized, as an exception may // be due to the resource bundle itself - log(new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, "Internal error logged from CDI Debug: ", top)); //$NON-NLS-1$ + log(new Status(IStatus.ERROR, getUniqueIdentifier(), INTERNAL_ERROR, "Internal error logged from CDI Debug: ", //$NON-NLS-1$ + top)); } /** * Logs the specified status with this plug-in's log. - * + * * @param status status to log */ public static void log(IStatus status) { @@ -166,24 +166,27 @@ public class CDebugCorePlugin extends Plugin { /** * Logs the specified message with this plug-in's log. - * + * * @param status status to log */ public static void log(String message) { - getDefault().getLog().log(new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), INTERNAL_ERROR, message, null)); + getDefault().getLog() + .log(new Status(IStatus.ERROR, CDIDebugModel.getPluginIdentifier(), INTERNAL_ERROR, message, null)); } public void saveCommonSourceLocations(ICSourceLocation[] locations) { - CDebugCorePlugin.getDefault().getPluginPreferences().setValue(ICDebugConstants.PREF_SOURCE_LOCATIONS, SourceUtils.getCommonSourceLocationsMemento(locations)); + CDebugCorePlugin.getDefault().getPluginPreferences().setValue(ICDebugConstants.PREF_SOURCE_LOCATIONS, + SourceUtils.getCommonSourceLocationsMemento(locations)); } public ICSourceLocation[] getCommonSourceLocations() { - return SourceUtils.getCommonSourceLocationsFromMemento(CDebugCorePlugin.getDefault().getPluginPreferences().getString(ICDebugConstants.PREF_SOURCE_LOCATIONS)); + return SourceUtils.getCommonSourceLocationsFromMemento( + CDebugCorePlugin.getDefault().getPluginPreferences().getString(ICDebugConstants.PREF_SOURCE_LOCATIONS)); } /** * Adds the given breakpoint listener to the debug model. - * + * * @param listener breakpoint listener */ public void addCBreakpointListener(ICBreakpointListener listener) { @@ -192,7 +195,7 @@ public class CDebugCorePlugin extends Plugin { /** * Removes the given breakpoint listener from the debug model. - * + * * @param listener breakpoint listener */ public void removeCBreakpointListener(ICBreakpointListener listener) { @@ -201,7 +204,7 @@ public class CDebugCorePlugin extends Plugin { /** * Returns the list of breakpoint listeners registered with this plugin. - * + * * @return the list of breakpoint listeners registered with this plugin */ public Object[] getCBreakpointListeners() { @@ -223,7 +226,7 @@ public class CDebugCorePlugin extends Plugin { * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) */ @Override - public void start(BundleContext context) throws Exception { + public void start(BundleContext context) throws Exception { super.start(context); Trace.init(); @@ -232,7 +235,7 @@ public class CDebugCorePlugin extends Plugin { createBreakpointListenersList(); createDisassemblyContextService(); setDefaultLaunchDelegates(); - + Platform.getAdapterManager().registerAdapters(new DebugModelProvider(), ICDebugElement.class); // Add core build launch bar listener @@ -245,7 +248,7 @@ public class CDebugCorePlugin extends Plugin { * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) */ @Override - public void stop(BundleContext context) throws Exception { + public void stop(BundleContext context) throws Exception { ILaunchBarManager launchBarManager = getService(ILaunchBarManager.class); launchBarManager.removeListener(coreBuildLaunchBarTracker); coreBuildLaunchBarTracker = null; @@ -266,18 +269,20 @@ public class CDebugCorePlugin extends Plugin { } private void createCommandAdapterFactory() { - IAdapterManager manager= Platform.getAdapterManager(); - CCommandAdapterFactory actionFactory = new CCommandAdapterFactory(); - manager.registerAdapters(actionFactory, IRestart.class); + IAdapterManager manager = Platform.getAdapterManager(); + CCommandAdapterFactory actionFactory = new CCommandAdapterFactory(); + manager.registerAdapters(actionFactory, IRestart.class); } - + private void initializeCommonSourceLookupDirector() { if (fCommonSourceLookupDirector == null) { fCommonSourceLookupDirector = new CommonSourceLookupDirector(); boolean convertingFromLegacyFormat = false; - String newMemento = CDebugCorePlugin.getDefault().getPluginPreferences().getString(ICDebugInternalConstants.PREF_DEFAULT_SOURCE_CONTAINERS); + String newMemento = CDebugCorePlugin.getDefault().getPluginPreferences() + .getString(ICDebugInternalConstants.PREF_DEFAULT_SOURCE_CONTAINERS); if (newMemento.isEmpty()) { - newMemento = CDebugCorePlugin.getDefault().getPluginPreferences().getString(ICDebugInternalConstants.PREF_COMMON_SOURCE_CONTAINERS); + newMemento = CDebugCorePlugin.getDefault().getPluginPreferences() + .getString(ICDebugInternalConstants.PREF_COMMON_SOURCE_CONTAINERS); convertingFromLegacyFormat = true; } if (newMemento.isEmpty()) { @@ -285,7 +290,7 @@ public class CDebugCorePlugin extends Plugin { // initializeFromMemento(), but since we're not calling it, we // need to do this explicitly. See 299583. fCommonSourceLookupDirector.initializeParticipants(); - + // Convert source locations to source containers convertSourceLocations(fCommonSourceLookupDirector); } else { @@ -296,7 +301,7 @@ public class CDebugCorePlugin extends Plugin { } } if (convertingFromLegacyFormat) { - // Add three source containers that used to be present implicitly. + // Add three source containers that used to be present implicitly. ISourceContainer[] oldContainers = fCommonSourceLookupDirector.getSourceContainers(); ISourceContainer[] containers = new ISourceContainer[oldContainers.length + 3]; int i = 0; @@ -321,39 +326,41 @@ public class CDebugCorePlugin extends Plugin { private void convertSourceLocations(CommonSourceLookupDirector director) { director.setSourceContainers(SourceUtils.convertSourceLocations(getCommonSourceLocations())); } - + public BreakpointActionManager getBreakpointActionManager() { if (breakpointActionManager == null) breakpointActionManager = new BreakpointActionManager(); return breakpointActionManager; } - private void createDisassemblyContextService() { - fDisassemblyContextService = new DisassemblyContextService(); - } + private void createDisassemblyContextService() { + fDisassemblyContextService = new DisassemblyContextService(); + } + + public IDisassemblyContextService getDisassemblyContextService() { + return fDisassemblyContextService; + } - public IDisassemblyContextService getDisassemblyContextService() { - return fDisassemblyContextService; - } + private void disposeDisassemblyContextService() { + if (fDisassemblyContextService != null) + fDisassemblyContextService.dispose(); + } - private void disposeDisassemblyContextService() { - if (fDisassemblyContextService != null) - fDisassemblyContextService.dispose(); - } - private void setDefaultLaunchDelegates() { - // Set the default launch delegates as early as possible, and do it only once (Bug 312997) + // Set the default launch delegates as early as possible, and do it only once (Bug 312997) ILaunchManager launchMgr = DebugPlugin.getDefault().getLaunchManager(); HashSet<String> debugSet = new HashSet<>(); debugSet.add(ILaunchManager.DEBUG_MODE); - ILaunchConfigurationType localCfg = launchMgr.getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_APP); + ILaunchConfigurationType localCfg = launchMgr + .getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_APP); try { if (localCfg.getPreferredDelegate(debugSet) == null) { ILaunchDelegate[] delegates = localCfg.getDelegates(debugSet); for (ILaunchDelegate delegate : delegates) { - if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE.equals(delegate.getId())) { + if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE + .equals(delegate.getId())) { localCfg.setPreferredDelegate(debugSet, delegate); break; } @@ -362,12 +369,14 @@ public class CDebugCorePlugin extends Plugin { } catch (CoreException e) { } - ILaunchConfigurationType remoteCfg = launchMgr.getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_REMOTE_APP); + ILaunchConfigurationType remoteCfg = launchMgr + .getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_REMOTE_APP); try { if (remoteCfg.getPreferredDelegate(debugSet) == null) { ILaunchDelegate[] delegates = remoteCfg.getDelegates(debugSet); for (ILaunchDelegate delegate : delegates) { - if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE.equals(delegate.getId())) { + if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE + .equals(delegate.getId())) { remoteCfg.setPreferredDelegate(debugSet, delegate); break; } @@ -375,13 +384,15 @@ public class CDebugCorePlugin extends Plugin { } } catch (CoreException e) { } - - ILaunchConfigurationType attachCfg = launchMgr.getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_ATTACH); + + ILaunchConfigurationType attachCfg = launchMgr + .getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_ATTACH); try { if (attachCfg.getPreferredDelegate(debugSet) == null) { ILaunchDelegate[] delegates = attachCfg.getDelegates(debugSet); for (ILaunchDelegate delegate : delegates) { - if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_ATTACH_LAUNCH_DELEGATE.equals(delegate.getId())) { + if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_ATTACH_LAUNCH_DELEGATE + .equals(delegate.getId())) { attachCfg.setPreferredDelegate(debugSet, delegate); break; } @@ -390,12 +401,14 @@ public class CDebugCorePlugin extends Plugin { } catch (CoreException e) { } - ILaunchConfigurationType postMortemCfg = launchMgr.getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_POST_MORTEM); + ILaunchConfigurationType postMortemCfg = launchMgr + .getLaunchConfigurationType(ICDTLaunchConfigurationConstants.ID_LAUNCH_C_POST_MORTEM); try { if (postMortemCfg.getPreferredDelegate(debugSet) == null) { ILaunchDelegate[] delegates = postMortemCfg.getDelegates(debugSet); for (ILaunchDelegate delegate : delegates) { - if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_POSTMORTEM_LAUNCH_DELEGATE.equals(delegate.getId())) { + if (ICDTLaunchConfigurationConstants.PREFERRED_DEBUG_POSTMORTEM_LAUNCH_DELEGATE + .equals(delegate.getId())) { postMortemCfg.setPreferredDelegate(debugSet, delegate); break; } 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 faf21306f45..a719b6ca825 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 @@ -76,7 +76,7 @@ public class CDebugUtils { IStatusHandler handler = DebugPlugin.getDefault().getStatusHandler(status); if (handler != null) { try { - result = (Boolean)handler.handleStatus(status, source); + result = (Boolean) handler.handleStatus(status, source); } catch (CoreException e) { } } @@ -104,7 +104,7 @@ public class CDebugUtils { } public static char[] getByteText(byte b) { - return new char[]{ charFromByte((byte)((b >>> 4) & 0x0f)), charFromByte((byte)(b & 0x0f)) }; + return new char[] { charFromByte((byte) ((b >>> 4) & 0x0f)), charFromByte((byte) (b & 0x0f)) }; } public static byte textToByte(char[] text) { @@ -139,7 +139,7 @@ public class CDebugUtils { public static char bytesToChar(byte[] bytes) { try { - return (char)Short.parseShort(new String(bytes), 16); + return (char) Short.parseShort(new String(bytes), 16); } catch (RuntimeException e) { } return 0; @@ -148,31 +148,31 @@ public class CDebugUtils { public static byte toByte(char[] bytes, boolean le) { if (bytes.length != 2) return 0; - return (byte)Long.parseLong(bytesToString(bytes, le, true), 16); + return (byte) Long.parseLong(bytesToString(bytes, le, true), 16); } public static short toUnsignedByte(char[] bytes, boolean le) { if (bytes.length != 2) return 0; - return (short)Long.parseLong(bytesToString(bytes, le, false), 16); + return (short) Long.parseLong(bytesToString(bytes, le, false), 16); } public static short toShort(char[] bytes, boolean le) { if (bytes.length != 4) return 0; - return (short)Long.parseLong(bytesToString(bytes, le, true), 16); + return (short) Long.parseLong(bytesToString(bytes, le, true), 16); } public static int toUnsignedShort(char[] bytes, boolean le) { if (bytes.length != 4) return 0; - return (int)Long.parseLong(bytesToString(bytes, le, false), 16); + return (int) Long.parseLong(bytesToString(bytes, le, false), 16); } public static int toInt(char[] bytes, boolean le) { if (bytes.length != 8) return 0; - return (int)Long.parseLong(bytesToString(bytes, le, true), 16); + return (int) Long.parseLong(bytesToString(bytes, le, true), 16); } public static long toUnsignedInt(char[] bytes, boolean le) { @@ -220,10 +220,10 @@ public class CDebugUtils { /** * Serializes a XML document into a string - encoded in UTF8 format, with platform line separators. - * + * * @param doc document to serialize * @param indent if the xml text should be indented. - * + * * @return the document as a string */ public static String serializeDocument(Document doc, boolean indent) throws IOException, TransformerException { @@ -235,12 +235,12 @@ public class CDebugUtils { DOMSource source = new DOMSource(doc); StreamResult outputTarget = new StreamResult(s); transformer.transform(source, outputTarget); - return s.toString("UTF8"); //$NON-NLS-1$ + return s.toString("UTF8"); //$NON-NLS-1$ } /** * Serializes a XML document into a string - encoded in UTF8 format, with platform line separators. - * + * * @param doc document to serialize * @return the document as a string */ @@ -304,7 +304,8 @@ public class CDebugUtils { } catch (CoreException e) { } for (int i = 0; i < refs.length; ++i) { - if (!list.contains(refs[i]) && refs[i] != null && !refs[i].equals(root) && refs[i].exists() && refs[i].isOpen()) { + if (!list.contains(refs[i]) && refs[i] != null && !refs[i].equals(root) && refs[i].exists() + && refs[i].isOpen()) { list.add(refs[i]); getReferencedProjects(root, refs[i], list); } @@ -315,16 +316,16 @@ public class CDebugUtils { public static String getBreakpointText(IBreakpoint breakpoint, boolean qualified) throws CoreException { try { if (breakpoint instanceof ICAddressBreakpoint) { - return getAddressBreakpointText((ICAddressBreakpoint)breakpoint, qualified); + return getAddressBreakpointText((ICAddressBreakpoint) breakpoint, qualified); } if (breakpoint instanceof ICFunctionBreakpoint) { - return getFunctionBreakpointText((ICFunctionBreakpoint)breakpoint, qualified); + return getFunctionBreakpointText((ICFunctionBreakpoint) breakpoint, qualified); } if (breakpoint instanceof ICLineBreakpoint) { - return getLineBreakpointText((ICLineBreakpoint)breakpoint, qualified); + return getLineBreakpointText((ICLineBreakpoint) breakpoint, qualified); } if (breakpoint instanceof ICWatchpoint) { - return getWatchpointText((ICWatchpoint)breakpoint, qualified); + return getWatchpointText((ICWatchpoint) breakpoint, qualified); } // This allows to create a new breakpoint without implementing one of the interfaces above and still see a label Object message = breakpoint.getMarker().getAttribute(IMarker.MESSAGE); @@ -347,7 +348,7 @@ public class CDebugUtils { appendSourceName(breakpoint, label, qualified); appendLineNumber(breakpoint, label); if (breakpoint instanceof ICDynamicPrintf) { - appendPrintfString((ICDynamicPrintf)breakpoint, label); + appendPrintfString((ICDynamicPrintf) breakpoint, label); } appendBreakpointType(breakpoint, label); appendExtensionMessage(breakpoint, label); @@ -361,7 +362,7 @@ public class CDebugUtils { appendSourceName(watchpoint, label, qualified); appendWatchExpression(watchpoint, label); if (watchpoint instanceof ICWatchpoint2) { - ICWatchpoint2 wp2 = (ICWatchpoint2)watchpoint; + ICWatchpoint2 wp2 = (ICWatchpoint2) watchpoint; appendWatchMemorySpace(wp2, label); appendWatchRange(wp2, label); } @@ -372,12 +373,13 @@ public class CDebugUtils { return label.toString(); } - protected static String getAddressBreakpointText(ICAddressBreakpoint breakpoint, boolean qualified) throws CoreException { + protected static String getAddressBreakpointText(ICAddressBreakpoint breakpoint, boolean qualified) + throws CoreException { StringBuffer label = new StringBuffer(); appendSourceName(breakpoint, label, qualified); appendAddress(breakpoint, label); if (breakpoint instanceof ICDynamicPrintf) { - appendPrintfString((ICDynamicPrintf)breakpoint, label); + appendPrintfString((ICDynamicPrintf) breakpoint, label); } appendBreakpointType(breakpoint, label); appendExtensionMessage(breakpoint, label); @@ -386,12 +388,13 @@ public class CDebugUtils { return label.toString(); } - protected static String getFunctionBreakpointText(ICFunctionBreakpoint breakpoint, boolean qualified) throws CoreException { + protected static String getFunctionBreakpointText(ICFunctionBreakpoint breakpoint, boolean qualified) + throws CoreException { StringBuffer label = new StringBuffer(); appendSourceName(breakpoint, label, qualified); appendFunction(breakpoint, label); if (breakpoint instanceof ICDynamicPrintf) { - appendPrintfString((ICDynamicPrintf)breakpoint, label); + appendPrintfString((ICDynamicPrintf) breakpoint, label); } appendBreakpointType(breakpoint, label); appendExtensionMessage(breakpoint, label); @@ -402,7 +405,7 @@ public class CDebugUtils { /** * Append the Breakpoint Extension message to the breakpoint text in buffer. - * + * * @param breakpoint C Breakpoint * @param buffer buffer to append message to * @see {@link ICBreakpointExtension#getExtensionMessage() @@ -421,7 +424,8 @@ public class CDebugUtils { } } - protected static StringBuffer appendSourceName(ICBreakpoint breakpoint, StringBuffer label, boolean qualified) throws CoreException { + protected static StringBuffer appendSourceName(ICBreakpoint breakpoint, StringBuffer label, boolean qualified) + throws CoreException { String handle = breakpoint.getSourceHandle(); if (!isEmpty(handle)) { IPath path = new Path(handle); @@ -432,29 +436,35 @@ public class CDebugUtils { return label; } - protected static StringBuffer appendLineNumber(ICLineBreakpoint breakpoint, StringBuffer label) throws CoreException { + protected static StringBuffer appendLineNumber(ICLineBreakpoint breakpoint, StringBuffer label) + throws CoreException { int lineNumber = breakpoint.getLineNumber(); if (lineNumber > 0) { label.append(' '); - label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.0"), (Object[])new String[]{ Integer.toString(lineNumber) })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.0"), //$NON-NLS-1$ + (Object[]) new String[] { Integer.toString(lineNumber) })); } return label; } - protected static StringBuffer appendAddress(ICAddressBreakpoint breakpoint, StringBuffer label) throws CoreException { + protected static StringBuffer appendAddress(ICAddressBreakpoint breakpoint, StringBuffer label) + throws CoreException { try { label.append(' '); - label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.1"), (Object[])new String[]{ breakpoint.getAddress() })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.1"), //$NON-NLS-1$ + (Object[]) new String[] { breakpoint.getAddress() })); } catch (NumberFormatException e) { } return label; } - protected static StringBuffer appendFunction(ICFunctionBreakpoint breakpoint, StringBuffer label) throws CoreException { + protected static StringBuffer appendFunction(ICFunctionBreakpoint breakpoint, StringBuffer label) + throws CoreException { String function = breakpoint.getFunction(); if (function != null && function.trim().length() > 0) { label.append(' '); - label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.2"), (Object[])new String[]{ function.trim() })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.2"), //$NON-NLS-1$ + (Object[]) new String[] { function.trim() })); } return label; } @@ -466,7 +476,8 @@ public class CDebugUtils { String printfStr = dprintf.getPrintfString(); if (printfStr != null && printfStr.length() > 0) { buffer.append(' '); - buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.printfString"), (Object[])new String[] { printfStr })); //$NON-NLS-1$ + buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.printfString"), //$NON-NLS-1$ + (Object[]) new String[] { printfStr })); } } @@ -474,7 +485,8 @@ public class CDebugUtils { int ignoreCount = breakpoint.getIgnoreCount(); if (ignoreCount > 0) { label.append(' '); - label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.3"), (Object[])new String[]{ Integer.toString(ignoreCount) })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.3"), //$NON-NLS-1$ + (Object[]) new String[] { Integer.toString(ignoreCount) })); } return label; } @@ -483,7 +495,8 @@ public class CDebugUtils { String condition = breakpoint.getCondition(); if (condition != null && condition.length() > 0) { buffer.append(' '); - buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), (Object[])new String[] { condition })); //$NON-NLS-1$ + buffer.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.4"), //$NON-NLS-1$ + (Object[]) new String[] { condition })); } } @@ -491,7 +504,8 @@ public class CDebugUtils { String expression = watchpoint.getExpression(); if (expression != null && expression.length() > 0) { label.append(' '); - label.append(MessageFormat.format( DebugCoreMessages.getString("CDebugUtils.5"), (Object[])new String[] { expression })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.5"), //$NON-NLS-1$ + (Object[]) new String[] { expression })); } } @@ -499,7 +513,8 @@ public class CDebugUtils { String memorySpace = watchpoint.getMemorySpace(); if (memorySpace != null && memorySpace.length() > 0) { label.append(' '); - label.append(MessageFormat.format( DebugCoreMessages.getString("CDebugUtils.6"), (Object[])new String[] { memorySpace })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.6"), //$NON-NLS-1$ + (Object[]) new String[] { memorySpace })); } } @@ -507,11 +522,13 @@ public class CDebugUtils { String range = watchpoint.getRange().toString(); if (range.length() > 0 && !range.equals("0")) { //$NON-NLS-1$ label.append(' '); - label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.7"), (Object[])new String[]{ range })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.7"), //$NON-NLS-1$ + (Object[]) new String[] { range })); } } - - protected static StringBuffer appendBreakpointType(ICBreakpoint breakpoint, StringBuffer label) throws CoreException { + + protected static StringBuffer appendBreakpointType(ICBreakpoint breakpoint, StringBuffer label) + throws CoreException { if (breakpoint instanceof ICBreakpointType) { String typeString = ""; //$NON-NLS-1$ int type = ((ICBreakpointType) breakpoint).getType(); @@ -526,21 +543,21 @@ public class CDebugUtils { typeString = DebugCoreMessages.getString("CDebugUtils.Software"); //$NON-NLS-1$ break; } - + // 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 += "/"; //$NON-NLS-1$ + typeString += "/"; //$NON-NLS-1$ } typeString += DebugCoreMessages.getString("CDebugUtils.Temporary"); //$NON-NLS-1$ } - + if (typeString.length() > 0) { label.append(' '); - label.append(MessageFormat.format( - DebugCoreMessages.getString("CDebugUtils.8"), (Object[])new String[] { typeString })); //$NON-NLS-1$ + label.append(MessageFormat.format(DebugCoreMessages.getString("CDebugUtils.8"), //$NON-NLS-1$ + (Object[]) new String[] { typeString })); } } return label; @@ -549,11 +566,12 @@ public class CDebugUtils { private static boolean isEmpty(String string) { return (string == null || string.trim().length() == 0); } - + private static CharsetDecoder fDecoder; public static CharsetDecoder getCharsetDecoder() { - String charsetName = CDebugCorePlugin.getDefault().getPluginPreferences().getString(ICDebugConstants.PREF_DEBUG_WIDE_CHARSET); + String charsetName = CDebugCorePlugin.getDefault().getPluginPreferences() + .getString(ICDebugConstants.PREF_DEBUG_WIDE_CHARSET); if (fDecoder == null || !fDecoder.charset().name().equals(charsetName)) { Charset charset = Charset.forName(charsetName); fDecoder = charset.newDecoder(); @@ -562,62 +580,64 @@ public class CDebugUtils { } /** - * Note: Moved from AbstractCLaunchDelegate - * @since 6.0 + * Note: Moved from AbstractCLaunchDelegate + * @since 6.0 */ - public static ICProject getCProject(ILaunchConfiguration configuration) throws CoreException { - String projectName = getProjectName(configuration); - if (projectName != null) { - projectName = projectName.trim(); - if (projectName.length() > 0) { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); - ICProject cProject = CCorePlugin.getDefault().getCoreModel().create(project); - if (cProject != null && cProject.exists()) { - return cProject; - } - } - } - return null; - } - - /** - * Note: Moved from AbstractCLaunchDelegate - * @since 6.0 - */ - public static String getProjectName(ILaunchConfiguration configuration) throws CoreException { - return configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String)null); - } - - /** - * Note: Moved from AbstractCLaunchDelegate - * @since 6.0 - */ - public static String getProgramName(ILaunchConfiguration configuration) throws CoreException { - String programName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, (String) null); - if (programName != null) { - programName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(programName); - } - return programName; - } - - /** - * Note: Moved from AbstractCLaunchDelegate - * @since 6.0 - */ - public static IPath getProgramPath(ILaunchConfiguration configuration) throws CoreException { - String path = getProgramName(configuration); - if (path == null || path.trim().length() == 0) { - return null; - } - return new Path(path); - } + public static ICProject getCProject(ILaunchConfiguration configuration) throws CoreException { + String projectName = getProjectName(configuration); + if (projectName != null) { + projectName = projectName.trim(); + if (projectName.length() > 0) { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + ICProject cProject = CCorePlugin.getDefault().getCoreModel().create(project); + if (cProject != null && cProject.exists()) { + return cProject; + } + } + } + return null; + } + + /** + * Note: Moved from AbstractCLaunchDelegate + * @since 6.0 + */ + public static String getProjectName(ILaunchConfiguration configuration) throws CoreException { + return configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null); + } + + /** + * Note: Moved from AbstractCLaunchDelegate + * @since 6.0 + */ + public static String getProgramName(ILaunchConfiguration configuration) throws CoreException { + String programName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, + (String) null); + if (programName != null) { + programName = VariablesPlugin.getDefault().getStringVariableManager() + .performStringSubstitution(programName); + } + return programName; + } + + /** + * Note: Moved from AbstractCLaunchDelegate + * @since 6.0 + */ + public static IPath getProgramPath(ILaunchConfiguration configuration) throws CoreException { + String path = getProgramName(configuration); + if (path == null || path.trim().length() == 0) { + return null; + } + return new Path(path); + } /** * Returns the ICProject associated with the project setting in the Main tab * of a CDT launch configuration, or throws a CoreException providing a * reason (e.g., the setting is empty, the project no longer exists, the * isn't a CDT one, etc). - * + * * @param config * the launch configuration * @return an ICProject; never null. @@ -627,20 +647,21 @@ public class CDebugUtils { public static ICProject verifyCProject(ILaunchConfiguration config) throws CoreException { String name = CDebugUtils.getProjectName(config); if (name == null) { - throwCoreException(DebugCoreMessages.getString("CDebugUtils.C_Project_not_specified"), //$NON-NLS-1$ + throwCoreException(DebugCoreMessages.getString("CDebugUtils.C_Project_not_specified"), //$NON-NLS-1$ ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROJECT); } ICProject cproject = CDebugUtils.getCProject(config); if (cproject == null) { IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(name); if (!proj.exists()) { - throwCoreException(DebugCoreMessages.getFormattedString("CDebugUtils.Project_NAME_does_not_exist", name), //$NON-NLS-1$ + throwCoreException( + DebugCoreMessages.getFormattedString("CDebugUtils.Project_NAME_does_not_exist", name), //$NON-NLS-1$ ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT); } else if (!proj.isOpen()) { throwCoreException(DebugCoreMessages.getFormattedString("CDebugUtils.Project_NAME_is_closed", name), //$NON-NLS-1$ ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT); } - throwCoreException(DebugCoreMessages.getString("CDebugUtils.Not_a_C_CPP_project"), //$NON-NLS-1$ + throwCoreException(DebugCoreMessages.getString("CDebugUtils.Not_a_C_CPP_project"), //$NON-NLS-1$ ICDTLaunchConfigurationConstants.ERR_NOT_A_C_PROJECT); } return cproject; @@ -655,7 +676,7 @@ public class CDebugUtils { * such possible reasons (a problem with the <i>Project</i> setting, an * empty <i>C/C++ Application</i> setting, the combined settings doesn't * resolve to an existing file, etc). - * + * * @param config * the launch configuration * @param ignoreProjectSetting @@ -666,23 +687,24 @@ public class CDebugUtils { * @throws CoreException * @since 7.0 */ - public static IPath verifyProgramPath(ILaunchConfiguration config, boolean ignoreProjectSetting) throws CoreException { + public static IPath verifyProgramPath(ILaunchConfiguration config, boolean ignoreProjectSetting) + throws CoreException { ICProject cproject = null; if (!ignoreProjectSetting) { - cproject = verifyCProject(config); // will throw exception if project setting not valid + cproject = verifyCProject(config); // will throw exception if project setting not valid } IPath programPath = CDebugUtils.getProgramPath(config); if (programPath == null || programPath.isEmpty()) { throwCoreException(DebugCoreMessages.getString("CDebugUtils.Program_file_not_specified"), //$NON-NLS-1$ ICDTLaunchConfigurationConstants.ERR_UNSPECIFIED_PROGRAM); } - - if (programPath != null) { // this check is here only to avoid warning; compiler can't tell we'll throw an exception above + + if (programPath != null) { // this check is here only to avoid warning; compiler can't tell we'll throw an exception above if (!programPath.isAbsolute() && (cproject != null)) { // See if we can brute-force append the program path to the // project location. This allows us to support the program file // being outside the project, even outside the workspace, without - // requiring a linked resource (e.g., the setting could be + // requiring a linked resource (e.g., the setting could be // "..\..\some\dir\myprogram.exe") IPath location = cproject.getProject().getLocation(); if (location != null) { @@ -694,8 +716,8 @@ public class CDebugUtils { try { projFile = cproject.getProject().getFile(CDebugUtils.getProgramPath(config)); } catch (IllegalArgumentException exc) { - // thrown if relative path that resolves to a root file (e.g., "..\somefile") - } + // thrown if relative path that resolves to a root file (e.g., "..\somefile") + } if (projFile != null && projFile.exists()) { programPath = projFile.getLocation(); } @@ -703,10 +725,9 @@ public class CDebugUtils { } } if (!programPath.toFile().exists()) { - throwCoreException( - DebugCoreMessages.getString("CDebugUtils.Program_file_does_not_exist"), //$NON-NLS-1$ - new FileNotFoundException( - DebugCoreMessages.getFormattedString("CDebugUtils.PROGRAM_PATH_not_found", programPath.toOSString())), //$NON-NLS-1$ + throwCoreException(DebugCoreMessages.getString("CDebugUtils.Program_file_does_not_exist"), //$NON-NLS-1$ + new FileNotFoundException(DebugCoreMessages + .getFormattedString("CDebugUtils.PROGRAM_PATH_not_found", programPath.toOSString())), //$NON-NLS-1$ ICDTLaunchConfigurationConstants.ERR_PROGRAM_NOT_EXIST); } } @@ -717,13 +738,13 @@ public class CDebugUtils { * Variant that expects (requires) the launch configuration to have a valid * <i>Project</i> setting. See * {@link #verifyProgramPath(ILaunchConfiguration, boolean)} - * + * * @since 7.0 */ public static IPath verifyProgramPath(ILaunchConfiguration config) throws CoreException { - return verifyProgramPath(config, false); + return verifyProgramPath(config, false); } - + /** Throws a CoreException. Clutter-reducing utility method. */ private static void throwCoreException(String msg, int code) throws CoreException { throwCoreException(msg, null, code); @@ -731,14 +752,15 @@ public class CDebugUtils { /** Throws a CoreException. Clutter-reducing utility method. */ private static void throwCoreException(String msg, Exception innerException, int code) throws CoreException { - throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), code, msg, innerException)); + throw new CoreException( + new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), code, msg, innerException)); } - + /** * Generic method to fetch an attribute from a Map that has keys of type String. The defaultValue * parameter will be returned if the map does not contain the key, or if the matching value is not * of the correct type. - * + * * @param <V> The type of the value we are looking for. Specified by the type of defaultValue. * @param attributes The map with keys of type String, and values of any type. Cannot be null. * @param key They key for which we want the value. @@ -755,13 +777,13 @@ public class CDebugUtils { } return defaultValue; } - + /** - * Overrides the standard project ICBreakpoint toggle breakpoint factory with - * a custom toggle breakpoint factory. The ICBreakpoint toggle breakpoint factory - * will be disabled and it is up to the client to contribute it's own toggle - * breakpoint factory. - * + * Overrides the standard project ICBreakpoint toggle breakpoint factory with + * a custom toggle breakpoint factory. The ICBreakpoint toggle breakpoint factory + * will be disabled and it is up to the client to contribute it's own toggle + * breakpoint factory. + * * @param project a project * @param factoryId a breakpoint toggle factory identifier * @since 7.1 @@ -773,12 +795,12 @@ public class CDebugUtils { pref.flush(); } catch (BackingStoreException e) { CDebugCorePlugin.log(e); - } + } } - + /** * Returns the toggle breakpoint factory identifier for the project - * + * * @param project the project * @return the toggle breakpoint factory identifier, can be {@code null} * @since 7.1 @@ -787,10 +809,10 @@ public class CDebugUtils { IEclipsePreferences pref = new ProjectScope(project.getProject()).getNode(CDebugCorePlugin.PLUGIN_ID); return pref.get(ICDebugConstants.PREF_TOGGLE_BREAKPOINT_MODEL_IDENTIFIER, null); } - + /** * Returns whether the project uses the standard ICBreakpoint toggle breakpoint factory. - * + * * @param project the project * @return {@code true} if the project uses the standard ICBreakpoint breakpoint toggle factory * @since 7.1 @@ -800,9 +822,9 @@ public class CDebugUtils { } /** - * Returns whether the custom toggle breakpoint factory should be consider when evaluating the + * Returns whether the custom toggle breakpoint factory should be consider when evaluating the * enablement of the standard ICBreakpoint toggle breakpoint factory. - * + * * @return true if the custom model breakpoint system property is set * @since 7.1 * @see ICDebugConstants#PREF_TOGGLE_BREAKPOINT_MODEL_IDENTIFIER @@ -824,7 +846,7 @@ public class CDebugUtils { /** * Returns the containing folder of the input file. Can be empty if the * input file was a filename. - * + * * @return containing folder */ public String getFolder() { @@ -834,7 +856,7 @@ public class CDebugUtils { /** * Returns the filename (after last slash) of the input file. Can be * empty if input ended with a slash. - * + * * @return file name */ public String getFileName() { @@ -843,7 +865,7 @@ public class CDebugUtils { /** * Returns the extension of {@link #getFileName()} - * + * * @return the extension */ public String getExtension() { @@ -853,19 +875,20 @@ public class CDebugUtils { /** * CDebugUtils.getFileParts(String) should be called to create FileParts. */ - private FileParts() {} + private FileParts() { + } } /** * Split a Windows or Unix style path into its constituent parts. - * + * * The split does not modify or canonicalize the individual parts of the * file name. Nor does it convert between platforms. - * + * * This method is useful for dealing with Windows paths when running on * Linux and vice versa, it is also useful for non-canonical paths (ones * with .. in them). - * + * * @param file * file name * @return parts of a file diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java index 372ab076532..8de8801dbe3 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.java @@ -22,24 +22,23 @@ public class DebugCoreMessages { private static final String BUNDLE_NAME = "org.eclipse.cdt.debug.core.DebugCoreMessages";//$NON-NLS-1$ - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME ); + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); private DebugCoreMessages() { } static String getFormattedString(String key, String arg) { - return MessageFormat.format(getString(key), new Object[]{arg}); + return MessageFormat.format(getString(key), new Object[] { arg }); } static String getFormattedString(String key, String[] args) { - return MessageFormat.format(getString(key), (Object[])args); + return MessageFormat.format(getString(key), (Object[]) args); } - public static String getString( String key ) { + public static String getString(String key) { try { - return RESOURCE_BUNDLE.getString( key ); - } - catch( MissingResourceException e ) { + return RESOURCE_BUNDLE.getString(key); + } catch (MissingResourceException e) { return '!' + key + '!'; } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICBreakpointListener.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICBreakpointListener.java index 940f1221191..0cf300278d1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICBreakpointListener.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICBreakpointListener.java @@ -29,43 +29,42 @@ import org.eclipse.debug.core.model.IDebugTarget; * Provides event and error notification for C/C++ breakpoints. * Listeners register with the <code>CDebugModel</code>. */ -public interface ICBreakpointListener -{ +public interface ICBreakpointListener { /** * Notification that the given breakpoint is about to be installed in - * the specified target. Returns whether the installation should proceed. - * If any registered listener returns <code>false</code> the breakpoint is + * the specified target. Returns whether the installation should proceed. + * If any registered listener returns <code>false</code> the breakpoint is * not installed in the given target. - * + * * @param target debug target * @param breakpoint breakpoint being installed * @return whether the the breakpoint should be installed in the given target */ - public boolean installingBreakpoint( IDebugTarget target, IBreakpoint breakpoint ); - + public boolean installingBreakpoint(IDebugTarget target, IBreakpoint breakpoint); + /** * Notification that the given breakpoint has been installed in the specified target. - * + * * @param target debug target * @param breakpoint breakpoint being installed */ - public void breakpointInstalled( IDebugTarget target, IBreakpoint breakpoint ); + public void breakpointInstalled(IDebugTarget target, IBreakpoint breakpoint); /** - * Notification that the attributes of the given breakpoint have been changed + * Notification that the attributes of the given breakpoint have been changed * from the specified target. - * + * * @param target debug target * @param breakpoint breakpoint * @param attributes a map of changed attributes */ - public void breakpointChanged( IDebugTarget target, IBreakpoint breakpoint, Map attributes ); + public void breakpointChanged(IDebugTarget target, IBreakpoint breakpoint, Map attributes); /** * Notification that the given breakpoints have been removed from the specified target. - * + * * @param target debug target * @param breakpoints the breakpoints being removed */ - public void breakpointsRemoved( IDebugTarget target, IBreakpoint[] breakpoints ); + public void breakpointsRemoved(IDebugTarget target, IBreakpoint[] breakpoints); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java index 5bb29c4debb..7471b90dfd0 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDTLaunchConfigurationConstants.java @@ -38,62 +38,61 @@ public interface ICDTLaunchConfigurationConstants { * @since 7.1 */ public static final String ID_LAUNCH_C_REMOTE_APP = "org.eclipse.cdt.launch.remoteApplicationLaunchType"; //$NON-NLS-1$ - - /** - * This is the attach launch type id. - * - * @since 6.0 - */ - public static final String ID_LAUNCH_C_ATTACH = "org.eclipse.cdt.launch.attachLaunchType"; //$NON-NLS-1$ - - /** - * This is the post-mortem launch type id. - * - * @since 6.0 - */ - public static final String ID_LAUNCH_C_POST_MORTEM = "org.eclipse.cdt.launch.postmortemLaunchType"; //$NON-NLS-1$ - - /** + + /** + * This is the attach launch type id. + * + * @since 6.0 + */ + public static final String ID_LAUNCH_C_ATTACH = "org.eclipse.cdt.launch.attachLaunchType"; //$NON-NLS-1$ + + /** + * This is the post-mortem launch type id. + * + * @since 6.0 + */ + public static final String ID_LAUNCH_C_POST_MORTEM = "org.eclipse.cdt.launch.postmortemLaunchType"; //$NON-NLS-1$ + + /** * Specifies the default launch delegate for a Local Debug session * @since 7.0 */ - public static final String PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.localCLaunch"; //$NON-NLS-1$ + public static final String PREFERRED_DEBUG_LOCAL_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.localCLaunch"; //$NON-NLS-1$ - /** + /** * Specifies the default launch delegate for a Remote Debug session. * This default is part of the optional plugin org.eclipse.cdt.launch.remote. If that plugin is not installed - * then we won't set a default, which is ok since we only have one other delegate + * then we won't set a default, which is ok since we only have one other delegate * (which is org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch). * @since 7.1 */ - public static final String PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE = "org.eclipse.rse.remotecdt.dsf.debug"; //$NON-NLS-1$ + public static final String PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE = "org.eclipse.rse.remotecdt.dsf.debug"; //$NON-NLS-1$ - - /** + /** * Specifies the default launch delegate for an Attach Debug session * @since 7.0 */ - public static final String PREFERRED_DEBUG_ATTACH_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.attachCLaunch"; //$NON-NLS-1$ + public static final String PREFERRED_DEBUG_ATTACH_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.attachCLaunch"; //$NON-NLS-1$ - /** + /** * Specifies the default launch delegate for a Post Mortem Debug session * @since 7.0 */ - public static final String PREFERRED_DEBUG_POSTMORTEM_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.coreCLaunch"; //$NON-NLS-1$ + public static final String PREFERRED_DEBUG_POSTMORTEM_LAUNCH_DELEGATE = "org.eclipse.cdt.dsf.gdb.launch.coreCLaunch"; //$NON-NLS-1$ - /** - * Specifies the default launch delegate for a Run mode session + /** + * Specifies the default launch delegate for a Run mode session * @since 7.0 */ - public static final String PREFERRED_RUN_LAUNCH_DELEGATE = "org.eclipse.cdt.cdi.launch.localCLaunch"; //$NON-NLS-1$ - + public static final String PREFERRED_RUN_LAUNCH_DELEGATE = "org.eclipse.cdt.cdi.launch.localCLaunch"; //$NON-NLS-1$ + /** * Identifier for the C/C++ program process type, which is annotated on processes created * by the C/C++ application launch delegate. - * + * * (value <code>"C/C++"</code>). */ - public static final String ID_PROGRAM_PROCESS_TYPE = "C/C++"; //$NON-NLS-1$ + public static final String ID_PROGRAM_PROCESS_TYPE = "C/C++"; //$NON-NLS-1$ /** * Launch configuration attribute key. The value is a name of a C/C++ @@ -103,7 +102,7 @@ public interface ICDTLaunchConfigurationConstants { /** * Launch configuration attribute value constants for build before launch. - * + * * @since 7.0 */ public static final int BUILD_BEFORE_LAUNCH_DISABLED = 0; @@ -167,7 +166,7 @@ public interface ICDTLaunchConfigurationConstants { /** * Launch configuration attribute key. The value is a Map specifying the * environment to use when launching a C/C++ application. - * + * * @deprecated - see ILaunchManager.ATTR_ENVIRONMENT_VARIABLES */ @Deprecated @@ -206,13 +205,13 @@ public interface ICDTLaunchConfigurationConstants { public static final String ATTR_DEBUGGER_STOP_AT_MAIN = CDT_LAUNCH_ID + ".DEBUGGER_STOP_AT_MAIN"; //$NON-NLS-1$ /** - * Launch configuration attribute key. The value is a String specifying + * Launch configuration attribute key. The value is a String specifying * the symbol to use for the main breakpoint. */ public static final String ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL = CDT_LAUNCH_ID + ".DEBUGGER_STOP_AT_MAIN_SYMBOL"; //$NON-NLS-1$ /** - * Launch configuration attribute key. The value is a String specifying + * Launch configuration attribute key. The value is a String specifying * the register groups memento. */ public static final String ATTR_DEBUGGER_REGISTER_GROUPS = CDT_LAUNCH_ID + ".DEBUGGER_REGISTER_GROUPS"; //$NON-NLS-1$ @@ -247,13 +246,15 @@ public interface ICDTLaunchConfigurationConstants { * Launch configuration attribute key. The value is a boolean specifying * whether to enable variable bookkeeping. */ - public static final String ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING = CDT_LAUNCH_ID + ".ENABLE_VARIABLE_BOOKKEEPING"; //$NON-NLS-1$ + public static final String ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING = CDT_LAUNCH_ID + + ".ENABLE_VARIABLE_BOOKKEEPING"; //$NON-NLS-1$ /** * Launch configuration attribute key. The value is a boolean specifying * whether to enable register bookkeeping. */ - public static final String ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING = CDT_LAUNCH_ID + ".ENABLE_REGISTER_BOOKKEEPING"; //$NON-NLS-1$ + public static final String ATTR_DEBUGGER_ENABLE_REGISTER_BOOKKEEPING = CDT_LAUNCH_ID + + ".ENABLE_REGISTER_BOOKKEEPING"; //$NON-NLS-1$ /** * launch configuration attribute key. The value is a string specifying the protocol to @@ -268,7 +269,7 @@ public interface ICDTLaunchConfigurationConstants { * memento. */ public static final String ATTR_DEBUGGER_GLOBAL_VARIABLES = CDT_LAUNCH_ID + ".GLOBAL_VARIABLES"; //$NON-NLS-1$ - + /** * Launch configuration attribute key. The value is a format list' * memento. @@ -280,12 +281,12 @@ public interface ICDTLaunchConfigurationConstants { */ public static final String ATTR_DEBUGGER_MEMORY_BLOCKS = CDT_LAUNCH_ID + ".MEMORY_BLOCKS"; //$NON-NLS-1$ - /** + /** * Launch configuration attribute key. The value is a String specifying the type of post mortem launch. * Note that we use the prefix "org.eclipse.cdt.dsf.gdb" for backwards-compatibility. * See bug 476589. * @since 7.7 - */ + */ public static final String ATTR_DEBUGGER_POST_MORTEM_TYPE = "org.eclipse.cdt.dsf.gdb" + ".POST_MORTEM_TYPE"; //$NON-NLS-1$ //$NON-NLS-2$ /** @@ -328,23 +329,23 @@ public interface ICDTLaunchConfigurationConstants { */ public static String DEBUGGER_MODE_CORE = "core"; //$NON-NLS-1$ - /** + /** * Possible attribute value for the key is ATTR_DEBUGGER_POST_MORTEM_TYPE. * Indicates a core file. - * + * * @since 7.7 - */ + */ public static final String DEBUGGER_POST_MORTEM_CORE_FILE = "CORE_FILE"; //$NON-NLS-1$ /** * Possible attribute value for the key is ATTR_DEBUGGER_POST_MORTEM_TYPE. * Indicates a trace data file. - * + * * @since 7.7 - */ + */ public static final String DEBUGGER_POST_MORTEM_TRACE_FILE = "TRACE_FILE"; //$NON-NLS-1$ - /** + /** * Launch configuration attribute value. The key is ATTR_DEBUGGER_POST_MORTEM_TYPE. * @since 7.7 */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java index 2860bb6fe0c..6bbb58b04e3 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java @@ -40,7 +40,7 @@ public interface ICDebugConstants { * view */ public static final String PREF_DEFAULT_REGISTER_FORMAT = PLUGIN_ID + "cDebug.default_register_format"; //$NON-NLS-1$ - + /** * The charset to use for decoding char type strings. We however can't use the ID * "character_set" here because that would break backwards compatibility as it was @@ -102,17 +102,17 @@ public interface ICDebugConstants { */ public static final int MAX_NUMBER_OF_INSTRUCTIONS = 999; - /** - * Preference that saves the default debugger type - * @since 3.1 - */ - public static final String PREF_DEFAULT_DEBUGGER_TYPE = PLUGIN_ID + ".cDebug.defaultDebugger"; //$NON-NLS-1$ + /** + * Preference that saves the default debugger type + * @since 3.1 + */ + public static final String PREF_DEFAULT_DEBUGGER_TYPE = PLUGIN_ID + ".cDebug.defaultDebugger"; //$NON-NLS-1$ - /** - * Preference that saves the deactivated debugger types - * @since 3.1 - */ - public static final String PREF_FILTERED_DEBUGGERS = PLUGIN_ID + ".cDebug.filteredDebuggers"; //$NON-NLS-1$ + /** + * Preference that saves the deactivated debugger types + * @since 3.1 + */ + public static final String PREF_FILTERED_DEBUGGERS = PLUGIN_ID + ".cDebug.filteredDebuggers"; //$NON-NLS-1$ /** * Boolean preference used to persist the instruction-stepping mode. The @@ -120,7 +120,7 @@ public interface ICDebugConstants { * persisted global value when a debug session ends, using the mode that * session is in at that time. In other words, the most recently terminated * debug session dictates the initial mode of the next new debug session. - * + * * Temporary. See bugs 79872 and 80323. */ public static final String PREF_INSTRUCTION_STEP_MODE_ON = PLUGIN_ID + "cDebug.Disassembly.instructionStepOn"; //$NON-NLS-1$ @@ -132,23 +132,23 @@ public interface ICDebugConstants { */ @Deprecated public static final String DEF_CHARSET = "UTF-16"; //$NON-NLS-1$ - - /** - * Specifies the stepping mode (context/source/instruction) - */ - public static final String PREF_STEP_MODE = PLUGIN_ID + ".steppingMode"; //$NON-NLS-1$ - - public static final String PREF_VALUE_STEP_MODE_CONTEXT = "context"; //$NON-NLS-1$ - public static final String PREF_VALUE_STEP_MODE_SOURCE = "source"; //$NON-NLS-1$ - public static final String PREF_VALUE_STEP_MODE_INSTRUCTION = "instruction"; //$NON-NLS-1$ - - /** - * Preference key for toggle breakpoint model identifier. Debugger that contribute custom - * CBreakpoint should set the system property with this key to true. when this system property - * is set to true, the standard ICBreakpoint toggle breakpoint factory enablement will take - * into account for non-standard ICElement input. - * - * @since 7.1 - */ - public static final String PREF_TOGGLE_BREAKPOINT_MODEL_IDENTIFIER = PLUGIN_ID + ".toggleBreakpointModel"; //$NON-NLS-1$ + + /** + * Specifies the stepping mode (context/source/instruction) + */ + public static final String PREF_STEP_MODE = PLUGIN_ID + ".steppingMode"; //$NON-NLS-1$ + + public static final String PREF_VALUE_STEP_MODE_CONTEXT = "context"; //$NON-NLS-1$ + public static final String PREF_VALUE_STEP_MODE_SOURCE = "source"; //$NON-NLS-1$ + public static final String PREF_VALUE_STEP_MODE_INSTRUCTION = "instruction"; //$NON-NLS-1$ + + /** + * Preference key for toggle breakpoint model identifier. Debugger that contribute custom + * CBreakpoint should set the system property with this key to true. when this system property + * is set to true, the standard ICBreakpoint toggle breakpoint factory enablement will take + * into account for non-standard ICElement input. + * + * @since 7.1 + */ + public static final String PREF_TOGGLE_BREAKPOINT_MODEL_IDENTIFIER = PLUGIN_ID + ".toggleBreakpointModel"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java index 5dd162c11df..314a5eccd0d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICWatchpointTarget.java @@ -19,7 +19,7 @@ import org.eclipse.debug.core.IRequest; * View model types for which the "Add Watchpoint (C/C++)" action is applicable * should implement this interface. The action is a popupMenu/objectContribution * that targets this type. - * + * * @since 7.2 */ public interface ICWatchpointTarget { @@ -27,11 +27,13 @@ public interface ICWatchpointTarget { /** IRequest object used in the asynchronous method {@link ICWatchpointTarget#getSize()} */ interface GetSizeRequest extends IRequest { int getSize(); // returns -1 if size not available + void setSize(int size); }; - + interface CanCreateWatchpointRequest extends IRequest { boolean getCanCreate(); + void setCanCreate(boolean value); }; @@ -44,7 +46,7 @@ public interface ICWatchpointTarget { * supports watchpoints (at all or at that particular location). */ void canSetWatchpoint(CanCreateWatchpointRequest request); - + /** * Get the expression or the name of the variable */ @@ -53,7 +55,7 @@ public interface ICWatchpointTarget { /** * Asynchronous method to retrieve the size of the variable/expression, in * bytes. - * + * * @param request * the async request object */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java index f71238ee567..7977271b034 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/BreakpointActionManager.java @@ -62,7 +62,8 @@ public class BreakpointActionManager { private IBreakpointAction createActionFromClassName(String name, String className) { IBreakpointAction action = null; - IExtension[] actionExtensions = CDebugCorePlugin.getDefault().getBreakpointActionManager().getBreakpointActionExtensions(); + IExtension[] actionExtensions = CDebugCorePlugin.getDefault().getBreakpointActionManager() + .getBreakpointActionExtensions(); try { @@ -99,15 +100,15 @@ public class BreakpointActionManager { } return false; } - + public void executeActions(final IBreakpoint breakpoint, final IAdaptable context) { if (breakpoint != null) { IMarker marker = breakpoint.getMarker(); String actionNames = marker.getAttribute(BREAKPOINT_ACTION_ATTRIBUTE, ""); //$NON-NLS-1$ - if (actionNames.length() > 0 ) { + if (actionNames.length() > 0) { final String[] actions = actionNames.split(","); //$NON-NLS-1$ - if (actions.length > 0){ - Job job = new Job("Execute breakpoint actions") { //$NON-NLS-1$ + if (actions.length > 0) { + Job job = new Job("Execute breakpoint actions") { //$NON-NLS-1$ @Override public IStatus run(final IProgressMonitor monitor) { return doExecuteActions(breakpoint, context, actions, monitor); @@ -117,8 +118,7 @@ public class BreakpointActionManager { try { // wait for actions to execute job.join(); - }catch (InterruptedException e) - { + } catch (InterruptedException e) { e.printStackTrace(); } } @@ -126,7 +126,8 @@ public class BreakpointActionManager { } } - private IStatus doExecuteActions(final IBreakpoint breakpoint, final IAdaptable context, String[] actions, IProgressMonitor monitor) { + private IStatus doExecuteActions(final IBreakpoint breakpoint, final IAdaptable context, String[] actions, + IProgressMonitor monitor) { try { for (int i = 0; i < actions.length && !monitor.isCanceled(); i++) { String actionName = actions[i]; @@ -134,7 +135,7 @@ public class BreakpointActionManager { if (action != null) { monitor.setTaskName(action.getSummary()); IStatus status = action.execute(breakpoint, context, monitor); - if (status.getCode() != IStatus.OK) { + if (status.getCode() != IStatus.OK) { // do not log status if user canceled. if (status.getCode() != IStatus.CANCEL) CDebugCorePlugin.log(status); @@ -144,7 +145,8 @@ public class BreakpointActionManager { monitor.worked(1); } } catch (Exception e) { - return new Status( IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), CDebugCorePlugin.INTERNAL_ERROR, "Internal Error", e ); //$NON-NLS-1$ + return new Status(IStatus.ERROR, CDebugCorePlugin.getUniqueIdentifier(), CDebugCorePlugin.INTERNAL_ERROR, + "Internal Error", e); //$NON-NLS-1$ } return monitor.isCanceled() ? Status.CANCEL_STATUS : Status.OK_STATUS; } @@ -159,7 +161,8 @@ public class BreakpointActionManager { public IExtension[] getBreakpointActionExtensions() { if (breakpointActionExtensions == null) { - IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(CDebugCorePlugin.PLUGIN_ID, CDebugCorePlugin.BREAKPOINT_ACTION_EXTENSION_POINT_ID); + IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(CDebugCorePlugin.PLUGIN_ID, + CDebugCorePlugin.BREAKPOINT_ACTION_EXTENSION_POINT_ID); if (point == null) breakpointActionExtensions = new IExtension[0]; else { @@ -253,8 +256,8 @@ public class BreakpointActionManager { for (IBreakpointAction action : getBreakpointActions()) { Element element = doc.createElement("actionEntry"); //$NON-NLS-1$ - element.setAttribute("name", action.getName()); //$NON-NLS-1$ - element.setAttribute("class", action.getClass().getName()); //$NON-NLS-1$ + element.setAttribute("name", action.getName()); //$NON-NLS-1$ + element.setAttribute("class", action.getClass().getName()); //$NON-NLS-1$ element.setAttribute("value", action.getMemento()); //$NON-NLS-1$ rootElement.appendChild(element); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IBreakpointAction.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IBreakpointAction.java index d08bb8bae71..570fdaa0883 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IBreakpointAction.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IBreakpointAction.java @@ -20,11 +20,11 @@ import org.eclipse.debug.core.model.IBreakpoint; /** * Interface implemented by plug-ins that wish to contribute breakpoint actions. - * + * * THIS INTERFACE IS PROVISIONAL AND WILL CHANGE IN THE FUTURE BREAKPOINT ACTION * CONTRIBUTIONS USING THIS INTERFACE WILL NEED TO BE REVISED TO WORK WITH * FUTURE VERSIONS OF CDT. - * + * */ public interface IBreakpointAction { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ILogActionEnabler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ILogActionEnabler.java index 21de8e1686f..0336bdccabb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ILogActionEnabler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ILogActionEnabler.java @@ -14,10 +14,10 @@ package org.eclipse.cdt.debug.core.breakpointactions; /** - * + * * THIS INTERFACE IS PROVISIONAL AND WILL CHANGE IN THE FUTURE PLUG-INS USING * THIS INTERFACE WILL NEED TO BE REVISED TO WORK WITH FUTURE VERSIONS OF CDT. - * + * */ public interface ILogActionEnabler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IResumeActionEnabler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IResumeActionEnabler.java index c6cbedc13d5..4dda915f346 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IResumeActionEnabler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IResumeActionEnabler.java @@ -15,10 +15,10 @@ package org.eclipse.cdt.debug.core.breakpointactions; /** - * + * * THIS INTERFACE IS PROVISIONAL AND WILL CHANGE IN THE FUTURE PLUG-INS USING * THIS INTERFACE WILL NEED TO BE REVISED TO WORK WITH FUTURE VERSIONS OF CDT. - * + * */ public interface IResumeActionEnabler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IReverseDebugEnabler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IReverseDebugEnabler.java index b12a104ce6c..ffa1f1d939b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IReverseDebugEnabler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/IReverseDebugEnabler.java @@ -18,23 +18,23 @@ package org.eclipse.cdt.debug.core.breakpointactions; * @since 7.3 */ public interface IReverseDebugEnabler { - + /** * Toggles the state of the reverse debugging mode. * @throws Exception */ void toggle() throws Exception; - + /** * Enables the reverse debugging mode. No effect if already enabled. * @throws Exception */ void enable() throws Exception; - + /** * Disables the reverse debugging mode. No effect if it's not enabled. * @throws Exception */ void disable() throws Exception; - + } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java index c728ce3bcd0..7c539d26024 100755 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CCommandAdapterFactory.java @@ -20,9 +20,9 @@ import org.eclipse.debug.core.commands.IRestartHandler; /** * Adapter factory for debug commands. - * + * * @see org.eclipse.debug.core.command - * + * * @since 7.0 * */ @@ -42,9 +42,7 @@ public class CCommandAdapterFactory implements IAdapterFactory { @Override public Class<?>[] getAdapterList() { - return new Class[] { - IRestartHandler.class - }; + return new Class[] { IRestartHandler.class }; } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java index 194ef29c194..2da000fc316 100755 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/CForEachCommand.java @@ -39,14 +39,15 @@ public abstract class CForEachCommand extends AbstractDebugCommand { monitor.worked(1); } } - + protected abstract void execute(Object target) throws CoreException; /* (non-Javadoc) * @see org.eclipse.debug.internal.core.commands.DebugCommand#isExecutable(java.lang.Object[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.commands.IEnabledStateRequest) */ @Override - protected boolean isExecutable(Object[] targets, IProgressMonitor monitor, IEnabledStateRequest request) throws CoreException { + protected boolean isExecutable(Object[] targets, IProgressMonitor monitor, IEnabledStateRequest request) + throws CoreException { for (int i = 0; i < targets.length; i++) { if (!isExecutable(targets[i])) { return false; @@ -55,7 +56,7 @@ public abstract class CForEachCommand extends AbstractDebugCommand { } return true; } - + protected abstract boolean isExecutable(Object target); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java index f0c8441a3be..4ffe99c9a72 100755 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/command/RestartCommand.java @@ -21,7 +21,7 @@ import org.eclipse.debug.core.commands.IRestartHandler; /** * Default restart command for CDI - * + * * @since 7.0 */ public class RestartCommand extends CForEachCommand implements IRestartHandler { @@ -33,12 +33,12 @@ public class RestartCommand extends CForEachCommand implements IRestartHandler { @Override protected void execute(Object target) throws CoreException { - ((IRestart)target).restart(); + ((IRestart) target).restart(); } - + @Override protected boolean isExecutable(Object target) { - return ((IRestart)target).canRestart(); + return ((IRestart) target).canRestart(); } /* (non-Javadoc) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextListener.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextListener.java index 16e85d97578..67d392b0400 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextListener.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextListener.java @@ -15,8 +15,8 @@ package org.eclipse.cdt.debug.core.disassembly; /** - * The instances of this interface are notified when - * a disassembly context is registered or unregistered + * The instances of this interface are notified when + * a disassembly context is registered or unregistered * with <code>IDisassemblyContextService</code>. * <p> * This interface is used by the disassembly UI components. @@ -27,20 +27,20 @@ package org.eclipse.cdt.debug.core.disassembly; * This interface is experimental. */ public interface IDisassemblyContextListener { - - /** - * Indicates that <code>context</code> has been registered - * with <code>IDisassemblyContextService</code>. - * - * @param context the disassembly context that is registered - */ - public void contextAdded( Object context ); - /** - * Indicates that <code>context</code> has been unregistered - * with <code>IDisassemblyContextService</code>. - * - * @param context the disassembly context that is unregistered - */ - public void contextRemoved( Object context ); + /** + * Indicates that <code>context</code> has been registered + * with <code>IDisassemblyContextService</code>. + * + * @param context the disassembly context that is registered + */ + public void contextAdded(Object context); + + /** + * Indicates that <code>context</code> has been unregistered + * with <code>IDisassemblyContextService</code>. + * + * @param context the disassembly context that is unregistered + */ + public void contextRemoved(Object context); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextProvider.java index 4e277b12eaa..3a4a79533b9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextProvider.java @@ -24,13 +24,13 @@ package org.eclipse.cdt.debug.core.disassembly; */ public interface IDisassemblyContextProvider { - /** - * Returns the disassembly context object for <code>element</code> - * - * @param element the element being queried for disassembly context - * @return an object that represents the disassembly context - * for the given element, or <code>null</code> if the given element - * doesn't provide a disassembly context - */ - public Object getDisassemblyContext( Object element ); + /** + * Returns the disassembly context object for <code>element</code> + * + * @param element the element being queried for disassembly context + * @return an object that represents the disassembly context + * for the given element, or <code>null</code> if the given element + * doesn't provide a disassembly context + */ + public Object getDisassemblyContext(Object element); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextService.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextService.java index f63b9740dea..7e3b4c0ec56 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextService.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/disassembly/IDisassemblyContextService.java @@ -15,52 +15,52 @@ package org.eclipse.cdt.debug.core.disassembly; /** - * Interface for registering the disassembly context objects. + * Interface for registering the disassembly context objects. * <p> - * Clients interested in the context change notifications + * Clients interested in the context change notifications * may register a listener. * </p> * <p> - * This interface is not intended to be implemented by clients. + * This interface is not intended to be implemented by clients. * It can be accessed from <code>CDebugCorePlugin</code>. * </p> * @see org.eclipse.cdt.debug.core.IDisassemblyContextListener - * + * * This interface is experimental. */ public interface IDisassemblyContextService { - /** - * Adds the given listener to the collection of registered listeners. - * Has no effect if an identical listener is already registered. - * - * @param listener the listener to add - */ - public void addDisassemblyContextListener( IDisassemblyContextListener listener ); + /** + * Adds the given listener to the collection of registered listeners. + * Has no effect if an identical listener is already registered. + * + * @param listener the listener to add + */ + public void addDisassemblyContextListener(IDisassemblyContextListener listener); - /** - * Removes the given listener from the collection of registered listeners. - * Has no effect if an identical listener is not already registered. - * - * @param listener the listener to remove - */ - public void removeDisassemblyContextListener( IDisassemblyContextListener listener ); + /** + * Removes the given listener from the collection of registered listeners. + * Has no effect if an identical listener is not already registered. + * + * @param listener the listener to remove + */ + public void removeDisassemblyContextListener(IDisassemblyContextListener listener); - /** - * Registers the given context with this service. - * Has no effect if an identical context has already been registered. - * The corresponding notifications will be sent to all registered listeners. - * - * @param disassemblyContext the context to register. - */ - public void register( Object disassemblyContext ); + /** + * Registers the given context with this service. + * Has no effect if an identical context has already been registered. + * The corresponding notifications will be sent to all registered listeners. + * + * @param disassemblyContext the context to register. + */ + public void register(Object disassemblyContext); - /** - * Unregisters the given context with this service. - * Has no effect if an identical context has not been registered. - * The corresponding notifications will be sent to all registered listeners. - * - * @param disassemblyContext the context to unregister. - */ - public void unregister( Object disassemblyContext ); + /** + * Unregisters the given context with this service. + * Has no effect if an identical context has not been registered. + * The corresponding notifications will be sent to all registered listeners. + * + * @param disassemblyContext the context to unregister. + */ + public void unregister(Object disassemblyContext); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java index c2f34899049..fa76df42d0c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/Executable.java @@ -47,8 +47,8 @@ public class Executable extends PlatformObject { /** * Poorly named. This does not determine if the the file is an executable - * but rather a binary. Use {@link #isBinaryFile(IPath)} instead. - * + * but rather a binary. Use {@link #isBinaryFile(IPath)} instead. + * * @deprecated use {@link #isBinaryFile(IPath)} */ @Deprecated @@ -62,7 +62,7 @@ public class Executable extends PlatformObject { * shared library. A binary can be an executable but it can also be an * instruction-containing artifact of a build, which typically is linked to * make an executable (.e.,g .o and .obj files) - * + * * @param path * @return * @since 7.1 @@ -101,9 +101,8 @@ public class Executable extends PlatformObject { @Override public boolean equals(Object arg0) { - if (arg0 instanceof Executable) - { - Executable exe = (Executable)arg0; + if (arg0 instanceof Executable) { + Executable exe = (Executable) arg0; return exe.getPath().equals(this.getPath()); } return super.equals(arg0); @@ -139,7 +138,7 @@ public class Executable extends PlatformObject { this.project = project; this.name = new File(path.toOSString()).getName(); this.resource = resource; - this.remappers = sourceFileRemappings; + this.remappers = sourceFileRemappings; remappedPaths = new HashMap<ITranslationUnit, String>(); sourceFiles = new ArrayList<ITranslationUnit>(); refreshSourceFiles = true; @@ -169,7 +168,7 @@ public class Executable extends PlatformObject { return (T) this.getProject(); return super.getAdapter(adapter); } - + private String remapSourceFile(String filename) { for (ISourceFileRemapping remapper : remappers) { String remapped = remapper.remapSourceFile(this.getPath(), filename); @@ -179,20 +178,21 @@ public class Executable extends PlatformObject { } return filename; } - /** * @noreference This method is not intended to be referenced by clients. * @since 6.0 */ public synchronized ITranslationUnit[] getSourceFiles(IProgressMonitor monitor) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null); - + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null); + if (!refreshSourceFiles && !remapSourceFiles) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "returning cached result"); //$NON-NLS-1$ - return sourceFiles.toArray(new TranslationUnit[sourceFiles.size()]) ; + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "returning cached result"); //$NON-NLS-1$ + return sourceFiles.toArray(new TranslationUnit[sourceFiles.size()]); } - + // Try to get the list of source files used to build the binary from the // symbol information. @@ -204,8 +204,7 @@ public class Executable extends PlatformObject { ICProject cproject = factory.create(project); - if (refreshSourceFiles) - { + if (refreshSourceFiles) { symReaderSources = ExecutablesManager.getExecutablesManager().getSourceFiles(this, monitor); } if (symReaderSources != null && symReaderSources.length > 0) { @@ -253,7 +252,8 @@ public class Executable extends PlatformObject { if (sourceFile.exists()) wkspFile = sourceFile; else { - IFile[] filesInWP = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(URIUtil.toURI(sourcePath)); + IFile[] filesInWP = ResourcesPlugin.getWorkspace().getRoot() + .findFilesForLocationURI(URIUtil.toURI(sourcePath)); for (IFile fileInWP : filesInWP) { if (fileInWP.isAccessible()) { wkspFile = fileInWP; @@ -276,7 +276,8 @@ public class Executable extends PlatformObject { // Be careful not to convert a unix path like // "/src/home" to "c:\source\home" on Windows. See // bugzilla 297781 - URI uri = (isNativeAbsPath && sourcePath.toFile().exists()) ? URIUtil.toURI(sourcePath) : URIUtil.toURI(filename, true); + URI uri = (isNativeAbsPath && sourcePath.toFile().exists()) ? URIUtil.toURI(sourcePath) + : URIUtil.toURI(filename, true); tu = new ExternalTranslationUnit(cproject, uri, id); } @@ -290,10 +291,10 @@ public class Executable extends PlatformObject { } } } - + refreshSourceFiles = false; remapSourceFiles = false; - return sourceFiles.toArray(new TranslationUnit[sourceFiles.size()]) ; + return sourceFiles.toArray(new TranslationUnit[sourceFiles.size()]); } /** @@ -302,16 +303,17 @@ public class Executable extends PlatformObject { * source files referenced in the executable. Digging into the binary for * that list can be expensive, so we cache the results. However, if the * executable is rebuilt, the cache can no longer be trusted. - * + * * Note that calling this also invalidates any mappings we have cached, so * there is no need to call both this method and * {@link #setRemapSourceFiles(boolean)}. That latter is automatic. - * + * * @since 6.0 */ public void setRefreshSourceFiles(boolean refreshSourceFiles) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, refreshSourceFiles); - + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null, refreshSourceFiles); + this.refreshSourceFiles = refreshSourceFiles; } @@ -331,23 +333,24 @@ public class Executable extends PlatformObject { * in an executable to a usable path on the local machine. E.g., a user * debugging an executable built by someone else likely needs to configure * source locator(s) to point Eclipse to his local copy of the sources. - * + * * <p> * Remapping source paths is expensive, so we cache the results. However, if * applicable source locators have been added, removed or changed, then the * cache can no longer be trusted. - * + * * <p> * Note that we separately cache the (unmapped) file specifications * referenced in the executable, as that is also expensive to fetch. Calling * this method does not invalidate that cache. However, that cache can be * invalidated via {@link #setRefreshSourceFiles(boolean)}, which also ends * up invalidating any mappings we have cached. - * + * * @since 7.0 */ public void setRemapSourceFiles(boolean remapSourceFiles) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, remapSourceFiles); + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null, remapSourceFiles); this.remapSourceFiles = remapSourceFiles; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java index ab306a322eb..803eab9b2c4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java @@ -71,32 +71,32 @@ import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant; * The Executables Manager maintains a collection of executables built by all of * the projects in the workspace. Executables are contributed by instances of * IExecutablesProvider. - * + * * @author Ken Ryall - * + * */ -public class ExecutablesManager extends PlatformObject implements ICProjectDescriptionListener, IElementChangedListener, IResourceChangeListener { +public class ExecutablesManager extends PlatformObject + implements ICProjectDescriptionListener, IElementChangedListener, IResourceChangeListener { private Map<IProject, IProjectExecutablesProvider> executablesProviderMap = new HashMap<IProject, IProjectExecutablesProvider>(); - private List<IExecutablesChangeListener> changeListeners = Collections.synchronizedList(new ArrayList<IExecutablesChangeListener>()); + private List<IExecutablesChangeListener> changeListeners = Collections + .synchronizedList(new ArrayList<IExecutablesChangeListener>()); private List<IProjectExecutablesProvider> executableProviders; private List<ISourceFilesProvider> sourceFileProviders; private List<ISourceFileRemappingFactory> sourceFileRemappingFactories; private List<IExecutableImporter> executableImporters; - - + /** * Map of launch config names to the path locator memento string in the * launch config, recorded in the most recent launch config change * notification. We use this to ensure we flush source file mappings only * when the launch config change involves a change to the source locators. */ - private Map<String, String> locatorMementos = new HashMap<String,String>(); - + private Map<String, String> locatorMementos = new HashMap<String, String>(); /** - * A cache of the executables in the workspace, categorized by project. - * + * A cache of the executables in the workspace, categorized by project. + * * <p> * This cache is updated by scheduling an asynchronous search. SearchJob is * the only class that should <i>modify</i> this collection, including the @@ -107,16 +107,16 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * The same Executable may appear more than once. */ private Map<IProject, List<Executable>> executablesMap = new HashMap<IProject, List<Executable>>(); - + /** * Provide a flat list of the executables in {@link #executablesMap}, with * duplicates removed. That is effectively the list of all executables in * the workspace that we know of as of now. - * + * * @return */ private List<Executable> flattenExecutablesMap() { - List<Executable> result = new ArrayList<Executable>(executablesMap.size() * 5); // most projects will have less than five executables + List<Executable> result = new ArrayList<Executable>(executablesMap.size() * 5); // most projects will have less than five executables synchronized (executablesMap) { for (List<Executable> exes : executablesMap.values()) { for (Executable exe : exes) { @@ -128,7 +128,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } return result; } - + /** * Job which searches through CDT projects for executables. Only one thread * should be running this job at any one time. Running job should be @@ -139,37 +139,36 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr super("Executables Search"); //$NON-NLS-1$ } - /** * The projects given to us when scheduled. If null, flush our entire * cache and search all projects */ private IProject[] projectsToRefresh; - + @Override public IStatus run(IProgressMonitor monitor) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Search for executables started"); //$NON-NLS-1$ - + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Search for executables started"); //$NON-NLS-1$ + IStatus status = Status.OK_STATUS; // The executables we know of now. We'll compare the search results // to this and see if we need to notify change listeners List<Executable> before = flattenExecutablesMap(); - - // Get the CDT projects in the workspace that we have no cached + + // Get the CDT projects in the workspace that we have no cached // results for (are not in 'executablesMap'). Also, we may have been // asked to refresh the cache for some projects we've search before List<IProject> projects = new ArrayList<IProject>(); synchronized (executablesMap) { if (projectsToRefresh == null) { executablesMap.clear(); - } - else { + } else { for (IProject project : projectsToRefresh) { executablesMap.remove(project); } } - + // Get the list of projects we plan to search for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) { if (!executablesMap.containsKey(project) && CoreModel.hasCNature(project)) { @@ -178,24 +177,27 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } - SubMonitor subMonitor = SubMonitor.convert(monitor, projects.size()); for (IProject project : projects) { if (subMonitor.isCanceled()) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Search for executables canceled"); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Search for executables canceled"); //$NON-NLS-1$ status = Status.CANCEL_STATUS; break; // we've already changed our model; stop searching but proceed to notify listeners that the model changed } - + subMonitor.subTask("Checking project: " + project.getName()); //$NON-NLS-1$ // get the executables provider for this project IProjectExecutablesProvider provider = getExecutablesProviderForProject(project); if (provider != null) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Getting executables for project: " + project.getName() + " using " + provider.toString()); //$NON-NLS-1$ //$NON-NLS-2$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Getting executables for project: " + project.getName() + " using " //$NON-NLS-1$//$NON-NLS-2$ + + provider.toString()); - List<Executable> executables = provider.getExecutables(project, subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE)); + List<Executable> executables = provider.getExecutables(project, + subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE)); // store the list of executables for this project synchronized (executablesMap) { executablesMap.put(project, executables); @@ -203,7 +205,6 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } - // See if, after all that work, there's a net change in the // executables list. If so, notify listeners. List<Executable> after = flattenExecutablesMap(); @@ -221,10 +222,10 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr // New interface if (listener instanceof IExecutablesChangeListener2) { if (removed.size() > 0) { - ((IExecutablesChangeListener2)listener).executablesRemoved(removed); + ((IExecutablesChangeListener2) listener).executablesRemoved(removed); } if (added.size() > 0) { - ((IExecutablesChangeListener2)listener).executablesAdded(added); + ((IExecutablesChangeListener2) listener).executablesAdded(added); } } // Old interface @@ -233,7 +234,8 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Search for executables finished"); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Search for executables finished"); //$NON-NLS-1$ return status; } @@ -241,7 +243,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr /** * Schedules the search job. Use this, not the standard Job.schedule() * method. - * + * * @param projectsToRefresh * if null, all CDT projects in the workspace are searched. * If not null, we search only newly present projects and the @@ -253,7 +255,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr super.schedule(); } }; - + /** The search job. We only let one of these run at any one time */ private SearchJob searchJob = new SearchJob(); @@ -274,103 +276,122 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr public ExecutablesManager() { searchJob.setPriority(Job.SHORT); - + // load the extension points loadExecutableProviderExtensions(); loadSoureFileProviderExtensions(); loadSoureRemappingExtensions(); loadExecutableImporterExtensions(); - + // add the standard providers executableProviders.add(0, new StandardExecutableProvider()); sourceFileProviders.add(0, new StandardSourceFilesProvider()); sourceFileRemappingFactories.add(0, new StandardSourceFileRemappingFactory()); executableImporters.add(0, new StandardExecutableImporter()); - + // listen for events we're interested in CModelManager.getDefault().addElementChangedListener(this); CoreModel.getDefault().getProjectDescriptionManager().addCProjectDescriptionListener(this, CProjectDescriptionEvent.APPLIED); - + // Listen for changes to the global source locators. These locators // affect how source files are found locally. The Executable objects // cache their local source file paths and rely on us to tell them to // flush those caches when applicable locators change. - CDebugCorePlugin.getDefault().getCommonSourceLookupDirector().addParticipants(new ISourceLookupParticipant[] { new ISourceLookupParticipant(){ + CDebugCorePlugin.getDefault().getCommonSourceLookupDirector() + .addParticipants(new ISourceLookupParticipant[] { new ISourceLookupParticipant() { + + @Override + public void init(ISourceLookupDirector director) { + } + + @Override + public Object[] findSourceElements(Object object) { + return new Object[0]; + } + + @Override + public String getSourceName(Object object) throws CoreException { + return ""; //$NON-NLS-1$ + } + + @Override + public void dispose() { + } + + @Override + public void sourceContainersChanged(ISourceLookupDirector director) { + // Unfortunately, it would be extremely difficult/costly to + // determine which binaries are effected by the source locator + // change, so we have to tell all Executables to flush + flushExecutablesSourceMappings(); + } + } }); - @Override - public void init(ISourceLookupDirector director) {} - @Override - public Object[] findSourceElements(Object object) { return new Object[0]; } - @Override - public String getSourceName(Object object) throws CoreException { return ""; } //$NON-NLS-1$ - @Override - public void dispose() {} - @Override - public void sourceContainersChanged(ISourceLookupDirector director) { - // Unfortunately, it would be extremely difficult/costly to - // determine which binaries are effected by the source locator - // change, so we have to tell all Executables to flush - flushExecutablesSourceMappings(); - } - } }); - // Source locators are also in launch configurations, and those too come // into play when an Executable looks for a source file locally. So, // listen for changes in those locators, too. DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(new ILaunchConfigurationListener() { @Override public void launchConfigurationChanged(ILaunchConfiguration configuration) { - // Expect lots of noise for working copies. We only care about + // Expect lots of noise for working copies. We only care about // changes to actual configs if (configuration.isWorkingCopy()) { return; } - - // If the source locators in the launch config were not modified, then no-op + + // If the source locators in the launch config were not modified, then no-op try { String configName = configuration.getName(); String mementoBefore = locatorMementos.get(configName); - String mementoNow = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, ""); //$NON-NLS-1$ + String mementoNow = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_MEMENTO, + ""); //$NON-NLS-1$ if (mementoNow.equals(mementoBefore)) { return; // launch config change had no affect on source locators } - locatorMementos.put(configName, mementoNow); + locatorMementos.put(configName, mementoNow); } catch (CoreException e) { CDebugCorePlugin.log(e); } - // TODO: For now, just tell all Executables to flush. Look - // into identifying which binary the config is associated + // TODO: For now, just tell all Executables to flush. Look + // into identifying which binary the config is associated // with so we can flush only that Executable flushExecutablesSourceMappings(); } + @Override - public void launchConfigurationRemoved(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); } + public void launchConfigurationRemoved(ILaunchConfiguration configuration) { + configAddedOrRemoved(configuration); + } + @Override - public void launchConfigurationAdded(ILaunchConfiguration configuration) { configAddedOrRemoved(configuration); } + public void launchConfigurationAdded(ILaunchConfiguration configuration) { + configAddedOrRemoved(configuration); + } + private void configAddedOrRemoved(ILaunchConfiguration configuration) { - // Expect lots of noise for working copies. We only care about + // Expect lots of noise for working copies. We only care about // changes to actual configs if (configuration.isWorkingCopy()) { return; } - - // The addition or removal of a launch config could affect - // how files are found. It would be extremely costly to - // determine here whether it will or not, so assume it will. - - // TODO: For now, just tell all Executables to flush. Look - // into identifying which binary the config is associated + + // The addition or removal of a launch config could affect + // how files are found. It would be extremely costly to + // determine here whether it will or not, so assume it will. + + // TODO: For now, just tell all Executables to flush. Look + // into identifying which binary the config is associated // with so we can flush only that Executable flushExecutablesSourceMappings(); } }); - + // schedule a refresh so we get up to date scheduleExecutableSearch(null); } - + /** * Tell all Executable objects to flush their source file mappings, then * notify our listeners that the executables changed. Even though the @@ -379,7 +400,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * information the Executable provided, that info can no longer be trusted. * The primary purpose of an Executable is to provide source file path * information--not only the compile paths burned into the executable but - * also the local mappings of those paths. + * also the local mappings of those paths. */ private void flushExecutablesSourceMappings() { List<Executable> exes = flattenExecutablesMap(); @@ -413,7 +434,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * Gets the list of executables in the workspace. This method doesn't * initiate a search. It returns the cached results of the most recent * search, or waits for the ongoing search to complete. - * + * * @param wait * Whether or not to wait if the cache is in the process of being * updated when this method is called. When true, the call will @@ -428,19 +449,23 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * @since 7.0 */ public Collection<Executable> getExecutables(boolean wait) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, Boolean.valueOf(wait)); - + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null, Boolean.valueOf(wait)); + // Wait for running search to finish, if asked to if (wait && searchJob.getState() != Job.NONE) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Waiting for executable search to finish..."); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Waiting for executable search to finish..."); //$NON-NLS-1$ try { searchJob.join(); } catch (InterruptedException e) { } - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "...executable search finished."); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "...executable search finished."); //$NON-NLS-1$ } - - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceExit(null); + + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceExit(null); return flattenExecutablesMap(); } @@ -453,7 +478,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr public Collection<Executable> getExecutables() { return getExecutables(false); } - + /** * @since 7.0 * Gets the collection of executables for the given project @@ -498,7 +523,8 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr if (p0 > p1) return -1; return 0; - }}); + } + }); for (IExecutableImporter importer : executableImporters) { handled = importer.importExecutables(fileNames, new SubProgressMonitor(monitor, 1)); @@ -507,7 +533,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } } - + if (handled) scheduleExecutableSearch(null); } @@ -527,7 +553,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } } - + return false; } @@ -538,8 +564,9 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * @return an array of source files which may be empty */ public String[] getSourceFiles(final Executable executable, IProgressMonitor monitor) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, executable); - + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null, executable); + String[] result = new String[0]; synchronized (sourceFileProviders) { @@ -554,21 +581,25 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr if (p0 > p1) return -1; return 0; - }}); - + } + }); + monitor.beginTask("Finding source files in " + executable.getName(), sourceFileProviders.size() * 1000); //$NON-NLS-1$ for (ISourceFilesProvider provider : sourceFileProviders) { String[] sourceFiles = provider.getSourceFiles(executable, new SubProgressMonitor(monitor, 1000)); if (sourceFiles.length > 0) { result = sourceFiles; - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Got " + sourceFiles.length + " files from " + provider.toString()); //$NON-NLS-1$ //$NON-NLS-2$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, + "Got " + sourceFiles.length + " files from " + provider.toString()); //$NON-NLS-1$ //$NON-NLS-2$ break; } } monitor.done(); } - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceExit(null, result); + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceExit(null, result); return result; } @@ -577,15 +608,16 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * @param executables the array of executables to be removed * @param monitor progress monitor * @return IStatus of the operation - * + * * @since 6.0 */ public IStatus removeExecutables(Executable[] executables, IProgressMonitor monitor) { - MultiStatus status = new MultiStatus(CDebugCorePlugin.PLUGIN_ID, IStatus.WARNING, "Couldn't remove all of the selected executables", null); //$NON-NLS-1$ - + MultiStatus status = new MultiStatus(CDebugCorePlugin.PLUGIN_ID, IStatus.WARNING, + "Couldn't remove all of the selected executables", null); //$NON-NLS-1$ + monitor.beginTask("Remove Executables", executables.length); //$NON-NLS-1$ for (Executable executable : executables) { - + IProjectExecutablesProvider provider = getExecutablesProviderForProject(executable.getProject()); if (provider != null) { IStatus result = provider.removeExecutable(executable, new SubProgressMonitor(monitor, 1)); @@ -594,11 +626,11 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } } - + // We don't need to directly call our listeners. The file removal will // cause a C model change, which we will react to by then calling the // listeners - + return status; } @@ -606,12 +638,12 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * Initiates an asynchronous search of workspace CDT projects for * executables. If a search is ongoing, it's cancelled and a new one is * started. In all cases, this method returns quickly (does not wait/block). - * + * * <p> * Listeners are notified when the search is complete and there is a change * in the collection of found executables. The results of the search can be * obtained by calling {@link #getExecutables(boolean)}. - * + * * @param projectsToRefresh * if null, we discard our entire Executables cache and search * all CDT projects in the workspace. If not null, we purge our @@ -621,11 +653,12 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * executables in any newly available projects. This parameter is * simply a way to get us to <i>not</i> skip one or more projects * we already have the executables list for. - * + * * @since 7.0 */ public void refresh(List<IProject> projectsToRefresh) { - scheduleExecutableSearch(projectsToRefresh != null ? projectsToRefresh.toArray(new IProject[projectsToRefresh.size()]) : null); + scheduleExecutableSearch( + projectsToRefresh != null ? projectsToRefresh.toArray(new IProject[projectsToRefresh.size()]) : null); } /** @@ -636,21 +669,23 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr */ @Override @Deprecated - public void resourceChanged(IResourceChangeEvent event) {} + public void resourceChanged(IResourceChangeEvent event) { + } /** * @since 7.0 */ @Override public void handleEvent(CProjectDescriptionEvent event) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, event); - + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null, event); + // this handles the cases where the active build configuration changes, // and when new projects are created or loaded at startup. int eventType = event.getEventType(); if (eventType == CProjectDescriptionEvent.APPLIED) { - + // see if the active build config has changed ICProjectDescription newDesc = event.getNewCProjectDescription(); ICProjectDescription oldDesc = event.getOldCProjectDescription(); @@ -658,13 +693,16 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr String newConfigName = newDesc.getActiveConfiguration().getName(); String oldConfigName = oldDesc.getActiveConfiguration().getName(); if (!newConfigName.equals(oldConfigName)) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Scheduling refresh because active build configuration changed"); //$NON-NLS-1$ - scheduleExecutableSearch(new IProject[]{newDesc.getProject()}); + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Scheduling refresh because active build configuration changed"); //$NON-NLS-1$ + scheduleExecutableSearch(new IProject[] { newDesc.getProject() }); } } else if (newDesc != null && oldDesc == null) { // project just created scheduleExecutableSearch(null); - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Scheduling refresh because project " + newDesc.getProject().getName() + " created"); //$NON-NLS-1$//$NON-NLS-2$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, + "Scheduling refresh because project " + newDesc.getProject().getName() + " created"); //$NON-NLS-1$//$NON-NLS-2$ } } } @@ -676,7 +714,8 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * takes an array instead of a list */ private void scheduleExecutableSearch(final IProject[] projectsToRefresh) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null, projectsToRefresh); + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null, projectsToRefresh); // Don't schedule multiple search jobs simultaneously. If one is // running, cancel it, wait for it to terminate, then schedule a new @@ -690,18 +729,20 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr searchJob.cancel(); if (searchJob.getState() != Job.NONE) { try { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Waiting for canceled job to terminate"); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Waiting for canceled job to terminate"); //$NON-NLS-1$ searchJob.join(); } catch (InterruptedException e) { } } - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "Scheduling new search job"); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "Scheduling new search job"); //$NON-NLS-1$ searchJob.schedule(projectsToRefresh); } - + return Status.OK_STATUS; } - + }; job.setPriority(Job.SHORT); job.schedule(); @@ -724,7 +765,7 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr naturesMatched++; } } - + if (naturesMatched > mostNaturesMatched) { provider = exeProvider; mostNaturesMatched = naturesMatched; @@ -738,72 +779,75 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr e.printStackTrace(); } } - + return provider; } - + ISourceFileRemappingFactory[] getSourceFileRemappingFactories() { - return sourceFileRemappingFactories.toArray(new ISourceFileRemappingFactory[sourceFileRemappingFactories.size()]); + return sourceFileRemappingFactories + .toArray(new ISourceFileRemappingFactory[sourceFileRemappingFactories.size()]); } private void loadExecutableProviderExtensions() { executableProviders = Collections.synchronizedList(new ArrayList<IProjectExecutablesProvider>()); IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".ExecutablesProvider"); //$NON-NLS-1$ + IExtensionPoint extensionPoint = extensionRegistry + .getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".ExecutablesProvider"); //$NON-NLS-1$ IExtension[] extensions = extensionPoint.getExtensions(); - + for (int i = 0; i < extensions.length; i++) { IExtension extension = extensions[i]; IConfigurationElement[] elements = extension.getConfigurationElements(); IConfigurationElement element = elements[0]; - + boolean failed = false; try { Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ if (extObject instanceof IProjectExecutablesProvider) { - executableProviders.add((IProjectExecutablesProvider)extObject); + executableProviders.add((IProjectExecutablesProvider) extObject); } else { failed = true; } - } - catch (CoreException e) { + } catch (CoreException e) { failed = true; } - + if (failed) { - CDebugCorePlugin.log("Unable to load ExecutablesProvider extension from " + extension.getContributor().getName()); //$NON-NLS-1$ + CDebugCorePlugin.log( + "Unable to load ExecutablesProvider extension from " + extension.getContributor().getName()); //$NON-NLS-1$ } } } - + private void loadSoureFileProviderExtensions() { sourceFileProviders = Collections.synchronizedList(new ArrayList<ISourceFilesProvider>()); IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".SourceFilesProvider"); //$NON-NLS-1$ + IExtensionPoint extensionPoint = extensionRegistry + .getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".SourceFilesProvider"); //$NON-NLS-1$ IExtension[] extensions = extensionPoint.getExtensions(); - + for (int i = 0; i < extensions.length; i++) { IExtension extension = extensions[i]; IConfigurationElement[] elements = extension.getConfigurationElements(); IConfigurationElement element = elements[0]; - + boolean failed = false; try { Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ if (extObject instanceof ISourceFilesProvider) { - sourceFileProviders.add((ISourceFilesProvider)extObject); + sourceFileProviders.add((ISourceFilesProvider) extObject); } else { failed = true; } - } - catch (CoreException e) { + } catch (CoreException e) { failed = true; } - + if (failed) { - CDebugCorePlugin.log("Unable to load SourceFilesProvider extension from " + extension.getContributor().getName()); //$NON-NLS-1$ + CDebugCorePlugin.log( + "Unable to load SourceFilesProvider extension from " + extension.getContributor().getName()); //$NON-NLS-1$ } } } @@ -812,29 +856,30 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr sourceFileRemappingFactories = Collections.synchronizedList(new ArrayList<ISourceFileRemappingFactory>()); IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".SourceRemappingProvider"); //$NON-NLS-1$ + IExtensionPoint extensionPoint = extensionRegistry + .getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".SourceRemappingProvider"); //$NON-NLS-1$ IExtension[] extensions = extensionPoint.getExtensions(); - + for (int i = 0; i < extensions.length; i++) { IExtension extension = extensions[i]; IConfigurationElement[] elements = extension.getConfigurationElements(); IConfigurationElement element = elements[0]; - + boolean failed = false; try { Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ if (extObject instanceof ISourceFileRemappingFactory) { - sourceFileRemappingFactories.add((ISourceFileRemappingFactory)extObject); + sourceFileRemappingFactories.add((ISourceFileRemappingFactory) extObject); } else { failed = true; } - } - catch (CoreException e) { + } catch (CoreException e) { failed = true; } - + if (failed) { - CDebugCorePlugin.log("Unable to load SourceRemappingProvider extension from " + extension.getContributor().getName()); //$NON-NLS-1$ + CDebugCorePlugin.log("Unable to load SourceRemappingProvider extension from " //$NON-NLS-1$ + + extension.getContributor().getName()); } } } @@ -843,29 +888,30 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr executableImporters = Collections.synchronizedList(new ArrayList<IExecutableImporter>()); IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry(); - IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".ExecutablesImporter"); //$NON-NLS-1$ + IExtensionPoint extensionPoint = extensionRegistry + .getExtensionPoint(CDebugCorePlugin.PLUGIN_ID + ".ExecutablesImporter"); //$NON-NLS-1$ IExtension[] extensions = extensionPoint.getExtensions(); - + for (int i = 0; i < extensions.length; i++) { IExtension extension = extensions[i]; IConfigurationElement[] elements = extension.getConfigurationElements(); IConfigurationElement element = elements[0]; - + boolean failed = false; try { Object extObject = element.createExecutableExtension("class"); //$NON-NLS-1$ if (extObject instanceof IExecutableImporter) { - executableImporters.add((IExecutableImporter)extObject); + executableImporters.add((IExecutableImporter) extObject); } else { failed = true; } - } - catch (CoreException e) { + } catch (CoreException e) { failed = true; } - + if (failed) { - CDebugCorePlugin.log("Unable to load ExecutablesImporter extension from " + extension.getContributor().getName()); //$NON-NLS-1$ + CDebugCorePlugin.log( + "Unable to load ExecutablesImporter extension from " + extension.getContributor().getName()); //$NON-NLS-1$ } } } @@ -874,36 +920,44 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * We listen to C model changes and see if they affect what executables are * in the workspace, and/or if the executables we already know of have * changed. - * + * * @since 7.1 */ @Override public void elementChanged(ElementChangedEvent event) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().traceEntry(null); - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "event = \n" + event); // must be done separately because of traceEntry() limitation //$NON-NLS-1$ - + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().traceEntry(null); + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "event = \n" + event); // must be done separately because of traceEntry() limitation //$NON-NLS-1$ + // Examine the event and figure out what needs to be done - Set<IProject> refreshProjects = new HashSet<IProject>(5); + Set<IProject> refreshProjects = new HashSet<IProject>(5); Set<Executable> executablesChanged = new HashSet<Executable>(5); Set<Executable> executablesRemoved = new HashSet<Executable>(5); - processDeltas(event.getDelta().getAddedChildren(), null, refreshProjects, executablesRemoved, executablesChanged); - processDeltas(event.getDelta().getChangedChildren(), null, refreshProjects, executablesRemoved, executablesChanged); - processDeltas(event.getDelta().getRemovedChildren(), null, refreshProjects, executablesRemoved, executablesChanged); - - // Schedule executable searches in projects + processDeltas(event.getDelta().getAddedChildren(), null, refreshProjects, executablesRemoved, + executablesChanged); + processDeltas(event.getDelta().getChangedChildren(), null, refreshProjects, executablesRemoved, + executablesChanged); + processDeltas(event.getDelta().getRemovedChildren(), null, refreshProjects, executablesRemoved, + executablesChanged); + + // Schedule executable searches in projects if (refreshProjects.size() > 0) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "One or more projects need to be re-searched"); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "One or more projects need to be re-searched"); //$NON-NLS-1$ scheduleExecutableSearch(refreshProjects.toArray(new IProject[refreshProjects.size()])); } - + // Invalidate the source file cache in changed Executables and inform // listeners if (executablesChanged.size() > 0) { - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "One or more executables changed"); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "One or more executables changed"); //$NON-NLS-1$ for (Executable exec : executablesChanged) { exec.setRefreshSourceFiles(true); } - List<Executable> list = Arrays.asList(executablesChanged.toArray(new Executable[executablesChanged.size()])); + List<Executable> list = Arrays + .asList(executablesChanged.toArray(new Executable[executablesChanged.size()])); synchronized (changeListeners) { for (IExecutablesChangeListener listener : changeListeners) { listener.executablesChanged(list); @@ -912,7 +966,8 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } if (executablesRemoved.size() > 0) { // Update our model (i.e., our collection of Executables) and inform listeners - if (Trace.DEBUG_EXECUTABLES) Trace.getTrace().trace(null, "One or more executables were removed"); //$NON-NLS-1$ + if (Trace.DEBUG_EXECUTABLES) + Trace.getTrace().trace(null, "One or more executables were removed"); //$NON-NLS-1$ synchronized (executablesMap) { for (Executable executableRemoved : executablesRemoved) { List<Executable> execs = executablesMap.get(executableRemoved.getProject()); @@ -922,12 +977,13 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } } - List<Executable> list = Arrays.asList(executablesRemoved.toArray(new Executable[executablesRemoved.size()])); + List<Executable> list = Arrays + .asList(executablesRemoved.toArray(new Executable[executablesRemoved.size()])); synchronized (changeListeners) { for (IExecutablesChangeListener listener : changeListeners) { // call newer interface if supported if (listener instanceof IExecutablesChangeListener2) { - ((IExecutablesChangeListener2)listener).executablesRemoved(list); + ((IExecutablesChangeListener2) listener).executablesRemoved(list); } // and call older interface, which is less informative listener.executablesListChanged(); @@ -936,11 +992,11 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } return; } - + /** * Drills down a hierarchy of CDT model change events to determine the * course of action. - * + * * @param deltas * CDT model events received by the viewer * @param cproject @@ -961,13 +1017,14 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr * Executable objects that have changed, requiring listeners to * be notified. */ - private void processDeltas(ICElementDelta[] deltas, ICProject cproject, final Set<IProject> projectsToRefresh, final Set<Executable> removedExecutables, final Set<Executable> changedExecutables) { + private void processDeltas(ICElementDelta[] deltas, ICProject cproject, final Set<IProject> projectsToRefresh, + final Set<Executable> removedExecutables, final Set<Executable> changedExecutables) { for (ICElementDelta delta : deltas) { ICElement element = delta.getElement(); if (element instanceof ICProject) { // When a project is deleted, we get a REMOVED delta for the - // project only--none for the elements in the project. - IProject project = ((ICProject)element).getProject(); + // project only--none for the elements in the project. + IProject project = ((ICProject) element).getProject(); if (delta.getKind() == ICElementDelta.REMOVED) { projectsToRefresh.add(project); List<Executable> execs = null; @@ -977,37 +1034,35 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr if (execs != null) { for (Executable exec : execs) { if (exec.getResource().equals(delta.getElement().getResource())) { - removedExecutables.add(exec); + removedExecutables.add(exec); break; } } } - // Note that it's not our job to update 'executablesMap'. - // The async exec search job will do that. + // Note that it's not our job to update 'executablesMap'. + // The async exec search job will do that. } - } - else if (element instanceof IBinary) { + } else if (element instanceof IBinary) { IProject project = cproject.getProject(); int deltaKind = delta.getKind(); switch (deltaKind) { case ICElementDelta.ADDED: projectsToRefresh.add(project); break; - case ICElementDelta.REMOVED: + case ICElementDelta.REMOVED: case ICElementDelta.CHANGED: { List<Executable> execs = null; synchronized (executablesMap) { execs = executablesMap.get(project); if (execs == null) { - // Somehow, we missed the addition of the project. - // Request that the project be researched for + // Somehow, we missed the addition of the project. + // Request that the project be researched for // executables projectsToRefresh.add(project); - } - else { + } else { // See if it's one of the executables we already know - // is in the project. If so, we'll update our + // is in the project. If so, we'll update our // executables map (if removed) and notifying // listeners for (Executable exec : execs) { @@ -1026,10 +1081,11 @@ public class ExecutablesManager extends PlatformObject implements ICProjectDescr } } if (element instanceof ICProject) { - cproject = (ICProject)element; + cproject = (ICProject) element; } // recursively call ourselves to handle this delta's children - processDeltas(delta.getAffectedChildren(), cproject, projectsToRefresh, removedExecutables, changedExecutables); + processDeltas(delta.getAffectedChildren(), cproject, projectsToRefresh, removedExecutables, + changedExecutables); } } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutableImporter.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutableImporter.java index b8940cc48c1..fc46a12b690 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutableImporter.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutableImporter.java @@ -29,13 +29,13 @@ public interface IExecutableImporter { * @since 6.0 */ public static final int HIGH_PRIORITY = 75; - + /** * Gets the priority to be used when importing these executables. * The priority is used by the Executables Manager when multiple IExecutableImporters are available. - * IExecutableImporter.importExecutables will be called for each one in priority order and will + * IExecutableImporter.importExecutables will be called for each one in priority order and will * stop with the first one that returns TRUE. - * + * * @param executable * @return the priority level to be used for this ISourceFilesProvider * @since 6.0 diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener.java index c78a2cca46c..8d2db61d6a1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener.java @@ -20,14 +20,14 @@ import java.util.List; /** * Listener interface for finding out when the list of Executable objects in the * workspace changes or when the objects themselves change. - * + * * <p> * Executable objects are ephemeral representations of Eclipse workspace model * elements. A particular executable in the workspace is typically represented * by many Executable objects. For example, an executable in the workspace that * changes twice can cause the listener's {@link #executablesChanged(List)} to * be called with a different Executable instance each of the two times it's invoked. - * + * */ public interface IExecutablesChangeListener extends EventListener { @@ -40,9 +40,9 @@ public interface IExecutablesChangeListener extends EventListener { * cleaned * <li>user deletes one or more executables * </ul> - * + * * Clients can get the list by calling {@link ExecutablesManager#getExecutables()} - * + * * @since 7.0 */ public void executablesListChanged(); @@ -54,7 +54,7 @@ public interface IExecutablesChangeListener extends EventListener { * object provides has changed. One such case is when there's a change in * the source locators, as such locators guide the Executable in finding the * local path for the compile path. - * + * * <p> * The Executable instances in the given list have had their caches flushed * by ExecutableManager. Clients that keep references to Executable objects @@ -62,7 +62,7 @@ public interface IExecutablesChangeListener extends EventListener { * managed by ExecutableManager and as such it is the client's * responsibility to tell those instances to flush when this listener method * is called. E.g., - * + * * <p><pre> * public void executablesChanged(List<Executable> executables) { * for (Executable e : executables) { @@ -72,10 +72,10 @@ public interface IExecutablesChangeListener extends EventListener { * } * } * </pre> - * + * * <p> * This is not called when an executable is added or removed - * + * * @param executables * @since 7.0 */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener2.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener2.java index 39e022ec164..a3873c618b3 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener2.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IExecutablesChangeListener2.java @@ -16,11 +16,10 @@ package org.eclipse.cdt.debug.core.executables; import java.util.List; - /** * Extension of IExecutablesChangeListener which allows listeners to more * precisely find out when an Executable is added or removed from the workspace - * + * * @since 7.1 */ public interface IExecutablesChangeListener2 extends IExecutablesChangeListener { @@ -30,11 +29,11 @@ public interface IExecutablesChangeListener2 extends IExecutablesChangeListener * workspace */ public void executablesAdded(List<Executable> executables); - + /** * Called when one or more Executable objects have been removed from the * workspace */ - public void executablesRemoved(List<Executable> executables); + public void executablesRemoved(List<Executable> executables); }
\ No newline at end of file diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java index 01bc0d786ee..5e75281913f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java @@ -22,10 +22,10 @@ import org.eclipse.core.runtime.IStatus; /** * IProjectExecutablesProvider supplies a list of executables for a project * to the Executables Manager. - * + * * @author Warren Paul * @since 7.0 - * + * */ public interface IProjectExecutablesProvider { @@ -36,8 +36,8 @@ public interface IProjectExecutablesProvider { * project natures the closest will be chosen. * @return the list of project nature id's */ - List<String> getProjectNatures(); - + List<String> getProjectNatures(); + /** * Get the list of executables for the active configuration of the given * project diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemapping.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemapping.java index b7b596dba37..9d02af52807 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemapping.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemapping.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.IPath; /** * ISourceFileRemapping is used by the Executables Manager when finding missing * source files. - * + * * @author Ken Ryall - * + * */ public interface ISourceFileRemapping { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemappingFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemappingFactory.java index be97fc25ef6..39ae7e6f2ce 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemappingFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFileRemappingFactory.java @@ -18,7 +18,7 @@ import org.eclipse.cdt.core.model.IBinary; /** * Factory that creates an ISourceFileRemapping instance for a particular binary * object - * + * * @since 7.0 */ public interface ISourceFileRemappingFactory { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFilesProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFilesProvider.java index f05e32b3f09..ae31fdd33dd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFilesProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ISourceFilesProvider.java @@ -17,29 +17,29 @@ import org.eclipse.core.runtime.IProgressMonitor; /** * ISourceFileProvider supplies a list of source files used by a given Executable. - * + * * @author Ken Ryall * @since 6.0 - * + * */ public interface ISourceFilesProvider { - + public static final int LOW_PRIORITY = 25; public static final int NORMAL_PRIORITY = 50; public static final int HIGH_PRIORITY = 75; - + /** * Gets the priority to be used for this executable. * The priority is used by the Executables Manager when multiple ISourceFilesProviders are available. * ISourceFilesProvider.getSourceFiles will be called for each one in priority order and will use the * first one that returns a non empty result. - * + * * @param executable * @return the priority level to be used for this ISourceFilesProvider */ int getPriority(Executable executable); - + /** * Returns a list of source files used by an executable. * @param executable diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java index 68dc6d348ba..19455417697 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java @@ -44,12 +44,12 @@ import org.eclipse.debug.core.DebugPlugin; public class StandardExecutableProvider implements IProjectExecutablesProvider { List<String> supportedNatureIds = new ArrayList<String>(); - + public StandardExecutableProvider() { supportedNatureIds.add(CProjectNature.C_NATURE_ID); supportedNatureIds.add(CCProjectNature.CC_NATURE_ID); } - + @Override public List<String> getProjectNatures() { return supportedNatureIds; @@ -58,7 +58,7 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider { @Override public List<Executable> getExecutables(IProject project, IProgressMonitor monitor) { List<Executable> executables = new ArrayList<Executable>(); - + ICProject cproject = CModelManager.getDefault().create(project); try { // Start out by getting all binaries in all build configurations. If @@ -68,18 +68,19 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider { if (allBinaries.length == 0) { return executables; // save ourselves a lot of pointless busy work } - + // Get the output directories of the active build configuration then // go through the list of all binaries and pick only the ones that // are in these output directories List<IBinary> binaries = null; - ICProjectDescription projDesc = CProjectDescriptionManager.getInstance().getProjectDescription(project, false); + ICProjectDescription projDesc = CProjectDescriptionManager.getInstance().getProjectDescription(project, + false); if (projDesc != null) { ICConfigurationDescription cfg = projDesc.getActiveConfiguration(); if (cfg != null) { binaries = new ArrayList<IBinary>(allBinaries.length); ICOutputEntry[] cfgOutDirs = cfg.getBuildSetting().getOutputDirectories(); - for (IBinary allBinary : allBinaries) { + for (IBinary allBinary : allBinaries) { for (ICOutputEntry outdir : cfgOutDirs) { if (outdir.getFullPath().isPrefixOf(allBinary.getPath())) { binaries.add(allBinary); @@ -108,22 +109,24 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider { if (exePath == null) exePath = binary.getPath(); List<ISourceFileRemapping> srcRemappers = new ArrayList<ISourceFileRemapping>(2); - ISourceFileRemappingFactory[] factories = ExecutablesManager.getExecutablesManager().getSourceFileRemappingFactories(); + ISourceFileRemappingFactory[] factories = ExecutablesManager.getExecutablesManager() + .getSourceFileRemappingFactories(); for (ISourceFileRemappingFactory factory : factories) { ISourceFileRemapping remapper = factory.createRemapper(binary); if (remapper != null) { srcRemappers.add(remapper); } } - executables.add(new Executable(exePath, project, binary.getResource(), srcRemappers.toArray(new ISourceFileRemapping[srcRemappers.size()]))); + executables.add(new Executable(exePath, project, binary.getResource(), + srcRemappers.toArray(new ISourceFileRemapping[srcRemappers.size()]))); } - + progress.worked(1); } } catch (CoreException e) { CDebugCorePlugin.log(e); } - + return executables; } @@ -134,10 +137,11 @@ public class StandardExecutableProvider implements IProjectExecutablesProvider { try { exeResource.delete(true, monitor); } catch (CoreException e) { - DebugPlugin.log( e ); + DebugPlugin.log(e); } return Status.OK_STATUS; } - return new Status(IStatus.WARNING, CDebugCorePlugin.PLUGIN_ID, "Can't remove " + executable.getName() + ": it is built by project \"" + executable.getProject().getName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ + return new Status(IStatus.WARNING, CDebugCorePlugin.PLUGIN_ID, "Can't remove " + executable.getName() //$NON-NLS-1$ + + ": it is built by project \"" + executable.getProject().getName() + "\""); //$NON-NLS-1$//$NON-NLS-2$ } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigDelegate.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigDelegate.java index bc41cb2c6ce..0d58c3018ff 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigDelegate.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigDelegate.java @@ -31,7 +31,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; /** * Delegate for Generic Launches over the Generic Launch Target. Can be * overriden to support launch customization for similar targets. - * + * * @since 8.3 */ public class CoreBuildGenericLaunchConfigDelegate extends CoreBuildLaunchConfigDelegate { @@ -55,7 +55,7 @@ public class CoreBuildGenericLaunchConfigDelegate extends CoreBuildLaunchConfigD } location = substLocation; } - + if (!new File(location).canExecute()) { throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.PLUGIN_ID, String.format(Messages.CoreBuildGenericLaunchConfigDelegate_CommandNotValid, location))); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigProvider.java index 24439e69d5d..4f23d237552 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildGenericLaunchConfigProvider.java @@ -19,7 +19,7 @@ import org.eclipse.launchbar.core.target.ILaunchTargetManager; /** * Core launch configuration provider used by generic target types. - * + * * @since 8.3 */ public class CoreBuildGenericLaunchConfigProvider extends AbstractLaunchConfigProvider { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java index bcd0e231060..99791dc2465 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchBarTracker.java @@ -42,7 +42,7 @@ import org.eclipse.launchbar.core.target.ILaunchTarget; /** * A launchbar listener that attempts to set the active core build configuration * on the project adapted from the launch descriptor. - * + * * @since 8.3 */ public class CoreBuildLaunchBarTracker implements ILaunchBarListener { @@ -70,7 +70,7 @@ public class CoreBuildLaunchBarTracker implements ILaunchBarListener { if (!projectName.isEmpty()) { project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); } - + if (project == null) { // Try the mapped resources IResource[] mappedResources = configuration.getMappedResources(); @@ -134,7 +134,7 @@ public class CoreBuildLaunchBarTracker implements ILaunchBarListener { desc.setActiveBuildConfig(buildConfig.getBuildConfiguration().getName()); finalProject.setDescription(desc, monitor); // notify the active build config that it is active - ((ICBuildConfiguration2)buildConfig).setActive(); + ((ICBuildConfiguration2) buildConfig).setActive(); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java index e9b5abbf80b..8c29617c243 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/CoreBuildLaunchConfigDelegate.java @@ -33,7 +33,7 @@ import org.eclipse.launchbar.core.target.launch.LaunchConfigurationTargetedDeleg /** * Common launch delegate code for core build launches. - * + * * @since 8.1 */ public abstract class CoreBuildLaunchConfigDelegate extends LaunchConfigurationTargetedDelegate { @@ -111,11 +111,12 @@ public abstract class CoreBuildLaunchConfigDelegate extends LaunchConfigurationT } } if (exeFile == null) { - throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.PLUGIN_ID, InternalDebugCoreMessages.CoreBuildLaunchConfigDelegate_noBinaries)); + throw new CoreException(new Status(IStatus.ERROR, CDebugCorePlugin.PLUGIN_ID, + InternalDebugCoreMessages.CoreBuildLaunchConfigDelegate_noBinaries)); } return exeFile; } - + @Override protected IProject[] getBuildOrder(ILaunchConfiguration configuration, String mode) throws CoreException { // 1. Extract project from configuration diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/GenericTargetTypeProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/GenericTargetTypeProvider.java index 3807c9cffd5..9e1a29056db 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/GenericTargetTypeProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/GenericTargetTypeProvider.java @@ -16,7 +16,7 @@ import org.eclipse.launchbar.core.target.ILaunchTargetProvider; import org.eclipse.launchbar.core.target.TargetStatus; /** - * + * * @since 8.3 */ public class GenericTargetTypeProvider implements ILaunchTargetProvider { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/NullProcess.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/NullProcess.java index 5421632bf8e..b4164db4e08 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/NullProcess.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/launch/NullProcess.java @@ -22,7 +22,7 @@ import org.eclipse.debug.core.model.IStreamsProxy; /** * A simple process that only spits out a message then terminates. - * + * * @since 8.3 */ public class NullProcess extends PlatformObject implements IProcess { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java index c1a28221d5e..01143359371 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/CDebugElementState.java @@ -17,29 +17,29 @@ package org.eclipse.cdt.debug.core.model; * The state of a debug element. */ public class CDebugElementState { - + private final String fName; - - private CDebugElementState( String name ) { + + private CDebugElementState(String name) { this.fName = name; } - + @Override public String toString() { return this.fName; } - public static final CDebugElementState UNDEFINED = new CDebugElementState( "undefined" ); //$NON-NLS-1$ - public static final CDebugElementState TERMINATING = new CDebugElementState( "terminating" ); //$NON-NLS-1$ - public static final CDebugElementState TERMINATED = new CDebugElementState( "terminated" ); //$NON-NLS-1$ - public static final CDebugElementState DISCONNECTING = new CDebugElementState( "disconnecting" ); //$NON-NLS-1$ - public static final CDebugElementState DISCONNECTED = new CDebugElementState( "disconnected" ); //$NON-NLS-1$ - public static final CDebugElementState RESUMING = new CDebugElementState( "resuming" ); //$NON-NLS-1$ - public static final CDebugElementState RESUMED = new CDebugElementState( "resumed" ); //$NON-NLS-1$ - public static final CDebugElementState STEPPING = new CDebugElementState( "stepping" ); //$NON-NLS-1$ - public static final CDebugElementState STEPPED = new CDebugElementState( "stepped" ); //$NON-NLS-1$ - public static final CDebugElementState SUSPENDING = new CDebugElementState( "suspending" ); //$NON-NLS-1$ - public static final CDebugElementState SUSPENDED = new CDebugElementState( "suspended" ); //$NON-NLS-1$ - public static final CDebugElementState RESTARTING = new CDebugElementState( "restarting" ); //$NON-NLS-1$ - public static final CDebugElementState EXITED = new CDebugElementState( "exited" ); //$NON-NLS-1$ + public static final CDebugElementState UNDEFINED = new CDebugElementState("undefined"); //$NON-NLS-1$ + public static final CDebugElementState TERMINATING = new CDebugElementState("terminating"); //$NON-NLS-1$ + public static final CDebugElementState TERMINATED = new CDebugElementState("terminated"); //$NON-NLS-1$ + public static final CDebugElementState DISCONNECTING = new CDebugElementState("disconnecting"); //$NON-NLS-1$ + public static final CDebugElementState DISCONNECTED = new CDebugElementState("disconnected"); //$NON-NLS-1$ + public static final CDebugElementState RESUMING = new CDebugElementState("resuming"); //$NON-NLS-1$ + public static final CDebugElementState RESUMED = new CDebugElementState("resumed"); //$NON-NLS-1$ + public static final CDebugElementState STEPPING = new CDebugElementState("stepping"); //$NON-NLS-1$ + public static final CDebugElementState STEPPED = new CDebugElementState("stepped"); //$NON-NLS-1$ + public static final CDebugElementState SUSPENDING = new CDebugElementState("suspending"); //$NON-NLS-1$ + public static final CDebugElementState SUSPENDED = new CDebugElementState("suspended"); //$NON-NLS-1$ + public static final CDebugElementState RESTARTING = new CDebugElementState("restarting"); //$NON-NLS-1$ + public static final CDebugElementState EXITED = new CDebugElementState("exited"); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmInstruction.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmInstruction.java index c267761fca7..9bc70255b15 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmInstruction.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmInstruction.java @@ -22,43 +22,43 @@ public interface IAsmInstruction { /** * Returns the address of this instruction. - * + * * @return the address of this instruction */ IAddress getAdress(); - + /** - * Returns the function name of this instruction, + * Returns the function name of this instruction, * or empty string if function is not available. - * + * * @return the function name of this instruction */ String getFunctionName(); - + /** * Returns the instruction's text. - * + * * @return the instruction's text. */ String getInstructionText(); - + /** * Returns the opcode of this instruction. - * + * * @return the opcode of this instruction */ String getOpcode(); /** * Returns the arguments to the opcode. - * + * * @return the arguments to the opcode */ String getArguments(); /** * Returns the offset of this machine instruction. - * + * * @return the offset of this machine instruction */ long getOffset(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmSourceLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmSourceLine.java index 5a0c7333418..41aed25198d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmSourceLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IAsmSourceLine.java @@ -20,14 +20,14 @@ public interface IAsmSourceLine { /** * Returns the array of the disassembly instructions associated with this source line. - * + * * @return the array of the disassembly instructions associated with this source line */ - IAsmInstruction[] getInstructions(); + IAsmInstruction[] getInstructions(); /** * Returns the number of this line in the source file - * + * * @return the line number */ int getLineNumber(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java index d83a68623f1..49537b061dd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICAddressBreakpoint.java @@ -17,11 +17,11 @@ package org.eclipse.cdt.debug.core.model; * A breakpoint that suspend the execution when a particular address is reached. */ public interface ICAddressBreakpoint extends ICLineBreakpoint { - - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_ADDRESS_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cAddressBreakpointMarker"; //$NON-NLS-1$ + + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_ADDRESS_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cAddressBreakpointMarker"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java index 568ca59cd75..9735b502cec 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java @@ -29,28 +29,28 @@ import org.eclipse.debug.core.model.IBreakpoint; */ public interface ICBreakpoint extends IBreakpoint { - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cBreakpointMarker"; //$NON-NLS-1$ - - /** - * This debug model identifier can be returned by a debug implementation - * to indicate that a given debugger integration is using C Breakpoints. - * This model ID will allow toggle breakpoint actions to configure their - * default selection. - * - * @since 7.0 - */ - public static final String C_BREAKPOINTS_DEBUG_MODEL_ID = CDIDebugModel.getPluginIdentifier() + ".cbreakpoints"; //$NON-NLS-1$ - + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cBreakpointMarker"; //$NON-NLS-1$ + + /** + * This debug model identifier can be returned by a debug implementation + * to indicate that a given debugger integration is using C Breakpoints. + * This model ID will allow toggle breakpoint actions to configure their + * default selection. + * + * @since 7.0 + */ + public static final String C_BREAKPOINTS_DEBUG_MODEL_ID = CDIDebugModel.getPluginIdentifier() + ".cbreakpoints"; //$NON-NLS-1$ + /** * Breakpoint attribute storing the number of debug targets a breakpoint is * installed in (value * <code>"org.eclipse.cdt.debug.core.installCount"</code>). This * attribute is an <code>int</code>. - * + * * Note: this attribute is used only for notifying listeners * (IBreakpointListener) of a change in the install count. The attribute is * not used by the CDT breakpoint object to manage the install count, since @@ -61,49 +61,49 @@ public interface ICBreakpoint extends IBreakpoint { * time, there are no installed breakpoints). At that time, the attribute * means absolutely nothing. */ - public static final String INSTALL_COUNT = "org.eclipse.cdt.debug.core.installCount"; //$NON-NLS-1$ + public static final String INSTALL_COUNT = "org.eclipse.cdt.debug.core.installCount"; //$NON-NLS-1$ /** * Breakpoint attribute storing the conditional expression associated with - * this breakpoint (value <code>"org.eclipse.cdt.debug.core.condition"</code>). + * this breakpoint (value <code>"org.eclipse.cdt.debug.core.condition"</code>). * This attribute is a <code>String</code>. */ - public static final String CONDITION = "org.eclipse.cdt.debug.core.condition"; //$NON-NLS-1$ + public static final String CONDITION = "org.eclipse.cdt.debug.core.condition"; //$NON-NLS-1$ /** * Breakpoint attribute storing a breakpoint's ignore count value (value * <code>"org.eclipse.cdt.debug.core.ignoreCount"</code>). This attribute * is an <code>int</code>. */ - public static final String IGNORE_COUNT = "org.eclipse.cdt.debug.core.ignoreCount"; //$NON-NLS-1$ + public static final String IGNORE_COUNT = "org.eclipse.cdt.debug.core.ignoreCount"; //$NON-NLS-1$ /** * Breakpoint attribute storing an identifier of the thread this breakpoint - * is restricted in (value <code>"org.eclipse.cdt.debug.core.threadId"</code>). + * is restricted in (value <code>"org.eclipse.cdt.debug.core.threadId"</code>). * This attribute is a <code>String</code>. */ - public static final String THREAD_ID = "org.eclipse.cdt.debug.core.threadId"; //$NON-NLS-1$ + public static final String THREAD_ID = "org.eclipse.cdt.debug.core.threadId"; //$NON-NLS-1$ /** * Breakpoint attribute storing the source handle of the file this breakpoint - * is set in (value <code>"org.eclipse.cdt.debug.core.sourceHandle"</code>). + * is set in (value <code>"org.eclipse.cdt.debug.core.sourceHandle"</code>). * This attribute is a <code>String</code>. */ - public static final String SOURCE_HANDLE = "org.eclipse.cdt.debug.core.sourceHandle"; //$NON-NLS-1$ + public static final String SOURCE_HANDLE = "org.eclipse.cdt.debug.core.sourceHandle"; //$NON-NLS-1$ /** * Breakpoint attribute storing the module name this breakpoint - * is set in (value <code>"org.eclipse.cdt.debug.core.module"</code>). + * is set in (value <code>"org.eclipse.cdt.debug.core.module"</code>). * This attribute is a <code>String</code>. - * + * * @since 3.0 */ - public static final String MODULE = "org.eclipse.cdt.debug.core.module"; //$NON-NLS-1$ + public static final String MODULE = "org.eclipse.cdt.debug.core.module"; //$NON-NLS-1$ /** * Returns whether this breakpoint is installed in at least one debug * target. - * + * * @return whether this breakpoint is installed * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -112,7 +112,7 @@ public interface ICBreakpoint extends IBreakpoint { /** * Returns whether this breakpoint is conditional. - * + * * @return whether this breakpoint is conditional * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -121,7 +121,7 @@ public interface ICBreakpoint extends IBreakpoint { /** * Returns the conditional expression associated with this breakpoint. - * + * * @return this breakpoint's conditional expression * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -130,16 +130,16 @@ public interface ICBreakpoint extends IBreakpoint { /** * Sets the condition associated with this breakpoint. - * + * * @param condition the conditional expression * @exception CoreException if unable to access the property on this breakpoint's * underlying marker */ - public void setCondition( String condition ) throws CoreException; + public void setCondition(String condition) throws CoreException; /** * Returns the ignore count used by this breakpoint. - * + * * @return the ignore count used by this breakpoint * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -148,16 +148,16 @@ public interface ICBreakpoint extends IBreakpoint { /** * Sets the ignore count attribute for this breakpoint. - * + * * @param ignoreCount the new ignore count * @exception CoreException if unable to access the property on this breakpoint's * underlying marker */ - public void setIgnoreCount( int ignoreCount ) throws CoreException; + public void setIgnoreCount(int ignoreCount) throws CoreException; /** * Returns the identifier of the thread this breakpoint is restricted in. - * + * * @return the thread identifier * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -167,16 +167,16 @@ public interface ICBreakpoint extends IBreakpoint { /** * Restricts this breakpoint to suspend only in the given thread when * encounterd in the given thread's target. - * + * * @param threadId the thread identifier * @exception CoreException if unable to access the property on this breakpoint's * underlying marker */ - public void setThreadId( String threadId ) throws CoreException; + public void setThreadId(String threadId) throws CoreException; /** * Returns the module name this breakpoint is set in. - * + * * @return the module name * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -185,16 +185,16 @@ public interface ICBreakpoint extends IBreakpoint { /** * Sets the module name of this breakpoint. - * + * * @param module the module name * @exception CoreException if unable to access the property on this breakpoint's * underlying marker */ - public void setModule( String module ) throws CoreException; + public void setModule(String module) throws CoreException; /** * Returns the source handle this breakpoint is set in. - * + * * @return the source handle * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -203,47 +203,48 @@ public interface ICBreakpoint extends IBreakpoint { /** * Sets the source handle of this breakpoint. - * + * * @param sourceHandle the source handle * @exception CoreException if unable to access the property on this breakpoint's * underlying marker */ - public void setSourceHandle( String sourceHandle ) throws CoreException; + public void setSourceHandle(String sourceHandle) throws CoreException; /** * Increments the install count of this breakpoint - * + * * @return the new install count value - * @throws CoreException if unable to access the property + * @throws CoreException if unable to access the property * on this breakpoint's underlying marker */ public int incrementInstallCount() throws CoreException; /** * Decrements the install count of this breakpoint. - * + * * @return the new install caount value - * @throws CoreException if unable to access the property + * @throws CoreException if unable to access the property * on this breakpoint's underlying marker */ public int decrementInstallCount() throws CoreException; /** * Resets the install count of this breakpoint - * - * @throws CoreException if unable to access the property + * + * @throws CoreException if unable to access the property * on this breakpoint's underlying marker */ public void resetInstallCount() throws CoreException; /** - * Returns a breakpoint extension registered for the given debug model - * and of the given type. - * + * Returns a breakpoint extension registered for the given debug model + * and of the given type. + * * @param debugModelId Debug model ID of the extension. * @param extensionType Type of the extension. * @return Extension instance. * @throws CoreException Throws exception in case the extension doesn't exist or cannot be initialized. */ - public <V extends ICBreakpointExtension> V getExtension(String debugModelId, Class<V> extensionType) throws CoreException; + public <V extends ICBreakpointExtension> V getExtension(String debugModelId, Class<V> extensionType) + throws CoreException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint2.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint2.java index bfa374617f7..c1c1db75ae4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint2.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint2.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -17,38 +17,38 @@ import org.eclipse.core.runtime.CoreException; /** * Extension that allows client to force breakpoint message to refresh. - * + * * @since 7.2 * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ public interface ICBreakpoint2 extends ICBreakpoint { - /** - * Refresh the marker message for the breakpoint. - * <p> - * Many of breakpoint settings are backed by marker attributes and it is - * sometimes more convenient to modify those attributes in the marker - * directly rather than through accessor methods of the breakpoint. This - * method allows the client to force the breakpoint to refresh its - * {@link org.eclipse.core.resources.IMarker#MESSAGE} attribute to reflect - * its current attribute values. - * </p> - * - * @throws CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public void refreshMessage() throws CoreException; + /** + * Refresh the marker message for the breakpoint. + * <p> + * Many of breakpoint settings are backed by marker attributes and it is + * sometimes more convenient to modify those attributes in the marker + * directly rather than through accessor methods of the breakpoint. This + * method allows the client to force the breakpoint to refresh its + * {@link org.eclipse.core.resources.IMarker#MESSAGE} attribute to reflect + * its current attribute values. + * </p> + * + * @throws CoreException if unable to access the property + * on this breakpoint's underlying marker + */ + public void refreshMessage() throws CoreException; - /** - * Returns the marker type of the given CDT Breakpoint. - * @return marker type ID - */ - public String getMarkerType(); + /** + * Returns the marker type of the given CDT Breakpoint. + * @return marker type ID + */ + public String getMarkerType(); /** * Obtain the combined message from all installed extensions on the * breakpoint. See {@link ICBreakpointExtension#getExtensionMessage} - * + * * @return extension message, or empty-string ({@code ""}) for no message * @since 8.2 */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java index 5276d2cfff3..0f26369e81f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointExtension.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -16,38 +16,38 @@ package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.CoreException; /** - * An extension to {@link ICBreakpoint} with model-specific breakpoint - * attributes. Different debug models can use the standard C breakpoints that - * extend the basic <code>ICBreakpiont</code>. The can use this extension - * mechanism to edit and store model-specific data in the original breakpoint + * An extension to {@link ICBreakpoint} with model-specific breakpoint + * attributes. Different debug models can use the standard C breakpoints that + * extend the basic <code>ICBreakpiont</code>. The can use this extension + * mechanism to edit and store model-specific data in the original breakpoint * object. - * - * A breakpoint extension is defined by an extension of kind + * + * A breakpoint extension is defined by an extension of kind * <code>"org.eclipse.cdt.debug.core.BreakpointExtension"</code></li>. - * The <code>ICBreakpoint</code> implementation instantiates breakpoint + * The <code>ICBreakpoint</code> implementation instantiates breakpoint * extensions registered for its specific marker type when a client requests - * extensions for a given debug model type. Thus the extension classes and - * plugins that declare them are not loaded unless requested by a client. - * + * extensions for a given debug model type. Thus the extension classes and + * plugins that declare them are not loaded unless requested by a client. + * * @see ICBreakpoint#getExtension(String, Class) */ public interface ICBreakpointExtension { - - /** - * Initializes the extension with the given breakpoint instance. - * The breakpoint extension may initialize its data using attributes - * stored in the breakpoint marker. - * - * @param breakpoint Breakpoint instance that this extension belongs to. - * @throws CoreException Thrown in case of errors reading the breakpoint - * marker. - */ - public void initialize(ICBreakpoint breakpoint) throws CoreException; + + /** + * Initializes the extension with the given breakpoint instance. + * The breakpoint extension may initialize its data using attributes + * stored in the breakpoint marker. + * + * @param breakpoint Breakpoint instance that this extension belongs to. + * @throws CoreException Thrown in case of errors reading the breakpoint + * marker. + */ + public void initialize(ICBreakpoint breakpoint) throws CoreException; /** * Return the message associated with this breakpoint extension. This * message will form part of the marker's message in the Eclipse UI. - * + * * @return custom message, or empty-string ({@code ""}) for no message * @since 8.2 */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java index 90e6c71209b..ac94799d1c6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpointType.java @@ -19,10 +19,10 @@ import org.eclipse.core.runtime.CoreException; public interface ICBreakpointType { /** * Breakpoint attribute storing the type of the breakpoint - * This attribute is a <code>int</code>. Strictly speaking, - * types are even values, but the least-significant bit - * is used to qualify it as temporary. See {@link #TEMPORARY} - * + * This attribute is a <code>int</code>. Strictly speaking, + * types are even values, but the least-significant bit + * is used to qualify it as temporary. See {@link #TEMPORARY} + * * @since 5.0 */ public static final String TYPE = "org.eclipse.cdt.debug.core.breakpointType"; //$NON-NLS-1$ @@ -41,13 +41,13 @@ public interface ICBreakpointType { * installation mechanism (hardware vs software) is up to the discretion of * the debugger backend A common backend approach is to try one way first * and then the other if the first attempt fails. - * + * * <p> * In the future, we will expose a preference that lets the user dictate his * preference to the backend. That is, the user will be able to say "I want * the backend to install regular breakpoints using hardware breakpoint * capabilities on the target." - * + * * <p> * It's important to realize that how a backend ends up installing the * breakpoint does not alter the type of the breakpoint in the Eclipse/CDT @@ -56,12 +56,12 @@ public interface ICBreakpointType { * hardware). */ final static public int REGULAR = 0x0 << 1; - + /** * A HARDWARE breakpoint is a line, function or address breakpoint that the * user wants installed using a hardware breakpoint facility on the target. * If it cannot be installed that way, it should not be installed at all. - * + * * For example, the hardware may have a breakpoint register where an address * can be set. The target will halt itself when the PC matches that register * value. Hardware breakpoints have several advantages. They're @@ -78,12 +78,12 @@ public interface ICBreakpointType { * user wants installed by swapping out instructions in the target code * memory with an opcode that causes the target to halt. If it cannot be * installed that way, it should not be installed at all. - * + * * The only advantage to software breakpoints is that there is no limit to * how many can be set. The disadvantages are that they are intrusive and * thus more difficult to install/uninstall/manage and, of course, they * can't be set in ROM code. - * + * */ final static public int SOFTWARE = 0x2 << 1; @@ -91,30 +91,30 @@ public interface ICBreakpointType { // ALL FUTURE ADDITIONS MUST HAVE EVEN VALUES. The lease-significant // bit is reserved. // ------------------------------------------------------------------------ - + /** * Returns the type of this breakpoint - * + * * @return type of breakpoint. Defaults to REGULAR if property does not * exists in the underlying marker. * @exception CoreException * if unable to access the property on this breakpoint's * underlying marker - * + * * @since 5.0 */ public int getType() throws CoreException; - + /** * Sets the type of this breakpoint. - * + * * @param type * breakpoint type * @exception CoreException * if unable to access the property on this breakpoint's * underlying marker - * + * * @since 5.0 */ - public void setType( int type ) throws CoreException; + public void setType(int type) throws CoreException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElement.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElement.java index bdb1fb07860..c53f7039257 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElement.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElement.java @@ -22,15 +22,14 @@ public interface ICDebugElement extends IDebugElement { /** * Returns the current state of this element. - * + * * @return the current state */ public CDebugElementState getState(); - /** * Returns the info object associated with the current state. - * + * * @return the info object associated with the current state */ public Object getCurrentStateInfo(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElementStatus.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElementStatus.java index 61dc6d0bc24..652b879f3e3 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElementStatus.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDebugElementStatus.java @@ -19,25 +19,25 @@ package org.eclipse.cdt.debug.core.model; public interface ICDebugElementStatus { /** - * Status severity constant (value 0) indicating this status represents + * Status severity constant (value 0) indicating this status represents * the nominal case. */ public static final int OK = 0; /** - * Status severity constant (value 1) indicating indicating this status + * Status severity constant (value 1) indicating indicating this status * represents a warning. */ public static final int WARNING = 1; /** - * Status severity constant (value 2) indicating indicating this status + * Status severity constant (value 2) indicating indicating this status * represents an error. */ public static final int ERROR = 2; /** - * Returns whether this status indicates everything is okay + * Returns whether this status indicates everything is okay * (neither warning, nor error). * * @return <code>true</code> if this status has severity @@ -53,7 +53,7 @@ public interface ICDebugElementStatus { * <li><code>OK</code> - everything is just fine</li> * </ul> * - * @return the severity: one of <code>OK</code>, <code>ERROR</code>, + * @return the severity: one of <code>OK</code>, <code>ERROR</code>, * or <code>WARNING</code> */ int getSeverity(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDynamicPrintf.java index 151bcb334a9..d7d439b3bf5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDynamicPrintf.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDynamicPrintf.java @@ -17,40 +17,40 @@ import org.eclipse.core.runtime.CoreException; /** * A dynamic printf specific to the C/C++ debug model. - * + * * @since 7.5 */ public interface ICDynamicPrintf extends ICLineBreakpoint { - /** - * Breakpoint marker type for this breakpoint type. - */ - public static final String C_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cDynamicPrintfMarker"; //$NON-NLS-1$ + /** + * Breakpoint marker type for this breakpoint type. + */ + public static final String C_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cDynamicPrintfMarker"; //$NON-NLS-1$ - /** - * Breakpoint marker type for this breakpoint type. - */ - public static final String C_LINE_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cLineDynamicPrintfMarker"; //$NON-NLS-1$ - - /** - * Breakpoint marker type for this breakpoint type. - */ - public static final String C_ADDRESS_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cAddressDynamicPrintfMarker"; //$NON-NLS-1$ + /** + * Breakpoint marker type for this breakpoint type. + */ + public static final String C_LINE_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cLineDynamicPrintfMarker"; //$NON-NLS-1$ - /** - * Breakpoint marker type for this breakpoint type. - */ - public static final String C_FUNCTION_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cFunctionDynamicPrintfMarker"; //$NON-NLS-1$ + /** + * Breakpoint marker type for this breakpoint type. + */ + public static final String C_ADDRESS_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cAddressDynamicPrintfMarker"; //$NON-NLS-1$ - /** + /** + * Breakpoint marker type for this breakpoint type. + */ + public static final String C_FUNCTION_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cFunctionDynamicPrintfMarker"; //$NON-NLS-1$ + + /** * Dynamic printf attribute storing the string to be printed (value * <code>"org.eclipse.cdt.debug.core.printf_string"</code>). This attribute * is a <code>String</code>. */ - public static final String PRINTF_STRING = "org.eclipse.cdt.debug.core.printf_string"; //$NON-NLS-1$ + public static final String PRINTF_STRING = "org.eclipse.cdt.debug.core.printf_string"; //$NON-NLS-1$ /** * Returns the string used by this dynamic printf. - * + * * @return the string used by this dynamic printf * @exception CoreException if unable to access the property on this dynamic printf's * underlying marker @@ -59,7 +59,7 @@ public interface ICDynamicPrintf extends ICLineBreakpoint { /** * Sets the string attribute for this dynamic printf - * + * * @param message The new string * @exception CoreException if unable to access the property on this dynamic printf's * underlying marker diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICEventBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICEventBreakpoint.java index 7a508b0d101..8f08ab614b5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICEventBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICEventBreakpoint.java @@ -1,6 +1,6 @@ /******************************************************************************* * Copyright (c) 2008, 2012 QNX Software Systems and others. - * + * * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -20,27 +20,27 @@ import org.eclipse.core.runtime.CoreException; /** * Interface for debugger event breakpoints. Example of event breakpoint * is break on raising exception in C++, or break on receiving signal. - * + * * @sinse 5.0 * @since 7.0 */ public interface ICEventBreakpoint extends ICBreakpoint { - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_EVENT_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cEventBreakpointMarker"; //$NON-NLS-1$; - + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_EVENT_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cEventBreakpointMarker"; //$NON-NLS-1$; + /** * Breakpoint attribute storing the event breakpoint event id. Basically, * this indicates what type of event the breakpoint catches--e.g., a C++ * exception throw, a library load, a thread exit, etc. Event types are * contributed via the "breakpointContribution" extension point. - * + * * <p> * This attribute is a <code>String</code>. - * + * */ public static final String EVENT_TYPE_ID = "org.eclipse.cdt.debug.core.eventbreakpoint_event_id"; //$NON-NLS-1$ @@ -50,12 +50,12 @@ public interface ICEventBreakpoint extends ICBreakpoint { * representation of another type (it may be a number, for example). * Currently, an event type can have only one argument */ - public static final String EVENT_ARG = "org.eclipse.cdt.debug.core.eventbreakpoint_event_arg"; //$NON-NLS-1$ + public static final String EVENT_ARG = "org.eclipse.cdt.debug.core.eventbreakpoint_event_arg"; //$NON-NLS-1$ /** * Get the event breakpoint type. Same as querying the property * {@link #EVENT_TYPE_ID} - * + * * @return event breakpoint type id (not null) * @throws CoreException */ @@ -65,7 +65,7 @@ public interface ICEventBreakpoint extends ICBreakpoint { * Get the event argument, if the type has one. Currently, an event type can * have at most one argument. Same as querying the property * {@link #EVENT_ARG} - * + * * @return event argument, or null if not applicable * @throws CoreException */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java index 0e3542d8989..7b2e3c4cb78 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICFunctionBreakpoint.java @@ -13,15 +13,14 @@ *******************************************************************************/ package org.eclipse.cdt.debug.core.model; - /** * A breakpoint that suspends the execution when a function is entered. */ public interface ICFunctionBreakpoint extends ICLineBreakpoint { - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_FUNCTION_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cFunctionBreakpointMarker"; //$NON-NLS-1$ + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_FUNCTION_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cFunctionBreakpointMarker"; //$NON-NLS-1$ } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java index 78215bc7bf6..ef75403243b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint.java @@ -22,29 +22,29 @@ import org.eclipse.debug.core.model.ILineBreakpoint; */ public interface ICLineBreakpoint extends ICBreakpoint, ILineBreakpoint { - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_LINE_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cLineBreakpointMarker"; //$NON-NLS-1$ - + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_LINE_BREAKPOINT_MARKER = "org.eclipse.cdt.debug.core.cLineBreakpointMarker"; //$NON-NLS-1$ + /** * Breakpoint attribute storing the function this breakpoint suspends * execution at (value <code>"org.eclipse.cdt.debug.core.function"</code>). * This attribute is a <code>String</code>. */ - public static final String FUNCTION = "org.eclipse.cdt.debug.core.function"; //$NON-NLS-1$ + public static final String FUNCTION = "org.eclipse.cdt.debug.core.function"; //$NON-NLS-1$ /** * Breakpoint attribute storing the address this breakpoint suspends * execution at (value <code>"org.eclipse.cdt.debug.core.address"</code>). * This attribute is a <code>String</code>. */ - public static final String ADDRESS = "org.eclipse.cdt.debug.core.address"; //$NON-NLS-1$ + public static final String ADDRESS = "org.eclipse.cdt.debug.core.address"; //$NON-NLS-1$ /** * Returns the address this breakpoint suspends execution at. - * + * * @return the address this breakpoint suspends execution at * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -53,16 +53,16 @@ public interface ICLineBreakpoint extends ICBreakpoint, ILineBreakpoint { /** * Sets the address this breakpoint suspends execution at. - * + * * @param address the address this breakpoint suspends execution at * @exception CoreException if unable to access the property on this breakpoint's * underlying marker */ - public void setAddress( String address ) throws CoreException; + public void setAddress(String address) throws CoreException; /** * Returns the function this breakpoint suspends execution in. - * + * * @return the function this breakpoint suspends execution in * @exception CoreException if unable to access the property on this breakpoint's * underlying marker @@ -71,16 +71,16 @@ public interface ICLineBreakpoint extends ICBreakpoint, ILineBreakpoint { /** * Sets the function this breakpoint suspends execution in. - * + * * @param function the function this breakpoint suspends execution in * @exception CoreException if unable to access the property on this breakpoint's * underlying marker */ - public void setFunction( String function ) throws CoreException; + public void setFunction(String function) throws CoreException; /** * Returns the source file (if available) of this breakpoint. - * + * * @return the source file of this breakpoint * @throws CoreException if unable to access the property on this breakpoint's * underlying marker diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint2.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint2.java index 0d1d7c09c36..69519d8c432 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint2.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICLineBreakpoint2.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Wind River Systems - initial API and implementation *******************************************************************************/ @@ -17,177 +17,176 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; /** - * Line breakpoint extension that allows a breakpoint to be relocated by a - * debugger to a valid source line. - * <p>Clients which can determine a valid source based on debuggers symbol - * information should call the various <code>setInstalled...</code> methods with - * the corrected location attributes. Note, there is no <code>setInstalledSourceHandle</code>, + * Line breakpoint extension that allows a breakpoint to be relocated by a + * debugger to a valid source line. + * <p>Clients which can determine a valid source based on debuggers symbol + * information should call the various <code>setInstalled...</code> methods with + * the corrected location attributes. Note, there is no <code>setInstalledSourceHandle</code>, * clients should call {@link ICBreakpoint#setSourceHandle(String)}. If multiple - * clients try to change the installed breakpoint location, the last call will - * take precedence. This way debuggers may update the location upon active debug + * clients try to change the installed breakpoint location, the last call will + * take precedence. This way debuggers may update the location upon active debug * context change. <br/> - * The original breakpoint location as configured by the user can always be + * The original breakpoint location as configured by the user can always be * retrieved using the <code>getRequested...</code> methods. - * </p> + * </p> * @since 7.2 * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. */ public interface ICLineBreakpoint2 extends ICLineBreakpoint, ICBreakpoint2 { - /** - * Breakpoint attribute storing the original requested line for this breakpoint - * This attribute is a <code>int</code>. - */ - public static final String REQUESTED_LINE = "requestedLine"; //$NON-NLS-1$ - - /** - * Breakpoint attribute storing the original requested column for this breakpoint - * This attribute is a <code>int</code>. - */ - public static final String REQUESTED_CHAR_START = "requestedCharStart"; //$NON-NLS-1$ - - /** - * Breakpoint attribute storing the original requested column for this breakpoint - * This attribute is a <code>int</code>. - */ - public static final String REQUESTED_CHAR_END = "requestedCharEnd"; //$NON-NLS-1$ - - /** - * Breakpoint attribute storing the original requested file name this breakpoint - * is set in. - * This attribute is a <code>String</code>. - */ - public static final String REQUESTED_SOURCE_HANDLE = "requestedSourceHandle"; //$NON-NLS-1$ - - /** - * Breakpoint attribute which is set if the installed line number of a - * breakpoint is changed. - * - * Triggers an update of the installed location, if set. - * - * This attribute is a <code>Boolean</code>. - * - * @since 8.0 - */ - public static final String RESET_INSTALLED_LOCATION = "resetInstalledLocation"; //$NON-NLS-1$ - - /** - * Returns the line number where the breakpoint was set before it was relocated to a - * valid source line. - * - * @return Returns the requested line number attribute. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public int getRequestedLine() throws CoreException; - - /** - * Sets the line number where the breakpoint should be set. - * - * @param The requested line number attribute. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public void setRequestedLine(int line) throws CoreException; - - /** - * Returns starting source index where the breakpoint was set before it - * was moved to a valid source location. - * - * @return Returns the requested start index attribute. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public int getRequestedCharStart() throws CoreException; - - - /** - * Sets the starting source index where the breakpoint should be set. - * - * @param The requested start index attribute. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public void setRequestedCharStart(int charStart) throws CoreException; - - /** - * Returns ending source index where the breakpoint was set before it - * was moved to a valid source location. - * - * @return Returns the requested end index attribute. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public int getRequestedCharEnd() throws CoreException; - - /** - * Sets the staring source index where the breakpoint should be set. - * - * @param The requested end index attribute. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public void setRequestedCharEnd(int charEnd) throws CoreException; - - /** - * Returns the file name where the breakpoint was set before it was relocated to a - * valid file. - * - * @return Returns the requested file name. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public String getRequestedSourceHandle() throws CoreException; - - /** - * Sets the file name where the breakpoint should be set. May be an empty string - * if the file is not known. - * - * @param Requested file name. - * @exception CoreException if unable to access the property on this breakpoint's - * underlying marker - */ - public void setRequestedSourceHandle(String fileName) throws CoreException; - - /** - * Sets the line number where the breakpoint is actually installed. This - * method only updates the {@link IMarker#LINE_NUMBER} attribute and the - * breakpoint message. - * - * @param line Installed line number - * @throws CoreException if unable to access the property - * on this breakpoint's underlying marker - */ - public void setInstalledLineNumber(int line) throws CoreException; - - /** - * Sets the start index where the breakpoint is actually installed. This method - * only updates the {@link IMarker#CHAR_START} attribute and the breakpoint - * message. - * - * @param charStart Installed char start - * @throws CoreException - */ - public void setInstalledCharStart(int charStart) throws CoreException; - - /** - * Sets the end index where the breakpoint is actually installed. This method - * only updates the {@link IMarker#CHAR_END} attribute and the breakpoint - * message. - * - * @param charEnd Installed char start - * @throws CoreException - */ - public void setInstalledCharEnd(int charStart) throws CoreException; - - /** - * Resets the breakpoint location back to the values specified by the - * REQUESTED_* attributes. This operation should be called automatically - * by the implementation when the install count is reset to 0, and does - * not need to be called by the client at that time. - * - * @throws CoreException - */ - public void resetInstalledLocation() throws CoreException; + /** + * Breakpoint attribute storing the original requested line for this breakpoint + * This attribute is a <code>int</code>. + */ + public static final String REQUESTED_LINE = "requestedLine"; //$NON-NLS-1$ + + /** + * Breakpoint attribute storing the original requested column for this breakpoint + * This attribute is a <code>int</code>. + */ + public static final String REQUESTED_CHAR_START = "requestedCharStart"; //$NON-NLS-1$ + + /** + * Breakpoint attribute storing the original requested column for this breakpoint + * This attribute is a <code>int</code>. + */ + public static final String REQUESTED_CHAR_END = "requestedCharEnd"; //$NON-NLS-1$ + + /** + * Breakpoint attribute storing the original requested file name this breakpoint + * is set in. + * This attribute is a <code>String</code>. + */ + public static final String REQUESTED_SOURCE_HANDLE = "requestedSourceHandle"; //$NON-NLS-1$ + + /** + * Breakpoint attribute which is set if the installed line number of a + * breakpoint is changed. + * + * Triggers an update of the installed location, if set. + * + * This attribute is a <code>Boolean</code>. + * + * @since 8.0 + */ + public static final String RESET_INSTALLED_LOCATION = "resetInstalledLocation"; //$NON-NLS-1$ + + /** + * Returns the line number where the breakpoint was set before it was relocated to a + * valid source line. + * + * @return Returns the requested line number attribute. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public int getRequestedLine() throws CoreException; + + /** + * Sets the line number where the breakpoint should be set. + * + * @param The requested line number attribute. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public void setRequestedLine(int line) throws CoreException; + + /** + * Returns starting source index where the breakpoint was set before it + * was moved to a valid source location. + * + * @return Returns the requested start index attribute. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public int getRequestedCharStart() throws CoreException; + + /** + * Sets the starting source index where the breakpoint should be set. + * + * @param The requested start index attribute. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public void setRequestedCharStart(int charStart) throws CoreException; + + /** + * Returns ending source index where the breakpoint was set before it + * was moved to a valid source location. + * + * @return Returns the requested end index attribute. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public int getRequestedCharEnd() throws CoreException; + + /** + * Sets the staring source index where the breakpoint should be set. + * + * @param The requested end index attribute. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public void setRequestedCharEnd(int charEnd) throws CoreException; + + /** + * Returns the file name where the breakpoint was set before it was relocated to a + * valid file. + * + * @return Returns the requested file name. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public String getRequestedSourceHandle() throws CoreException; + + /** + * Sets the file name where the breakpoint should be set. May be an empty string + * if the file is not known. + * + * @param Requested file name. + * @exception CoreException if unable to access the property on this breakpoint's + * underlying marker + */ + public void setRequestedSourceHandle(String fileName) throws CoreException; + + /** + * Sets the line number where the breakpoint is actually installed. This + * method only updates the {@link IMarker#LINE_NUMBER} attribute and the + * breakpoint message. + * + * @param line Installed line number + * @throws CoreException if unable to access the property + * on this breakpoint's underlying marker + */ + public void setInstalledLineNumber(int line) throws CoreException; + + /** + * Sets the start index where the breakpoint is actually installed. This method + * only updates the {@link IMarker#CHAR_START} attribute and the breakpoint + * message. + * + * @param charStart Installed char start + * @throws CoreException + */ + public void setInstalledCharStart(int charStart) throws CoreException; + + /** + * Sets the end index where the breakpoint is actually installed. This method + * only updates the {@link IMarker#CHAR_END} attribute and the breakpoint + * message. + * + * @param charEnd Installed char start + * @throws CoreException + */ + public void setInstalledCharEnd(int charStart) throws CoreException; + + /** + * Resets the breakpoint location back to the values specified by the + * REQUESTED_* attributes. This operation should be called automatically + * by the implementation when the install count is reset to 0, and does + * not need to be called by the client at that time. + * + * @throws CoreException + */ + public void resetInstalledLocation() throws CoreException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java index 6989e8c5eac..93b4458a0c9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICModule.java @@ -11,16 +11,16 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.model; +package org.eclipse.cdt.debug.core.model; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.DebugException; - + /** * Represents a module in the process being debugged. - * + * * @since 3.0 */ public interface ICModule extends ICDebugElement { @@ -37,104 +37,104 @@ public interface ICModule extends ICDebugElement { /** * Returns the type of this module. - * The returned value will be one of <code>EXECUTABLE</code>, + * The returned value will be one of <code>EXECUTABLE</code>, * <code>SHARED_LIBRARY</code>, <code>CORE</code>. - * + * * @return the type of this module */ public int getType(); /** * Returns the name of this module. - * + * * @return the name of this module */ public String getName(); /** - * Returns the image name of this module. The name may or may not + * Returns the image name of this module. The name may or may not * contain a full path. - * + * * @return the image name of this module */ public IPath getImageName(); /** * Returns the full path of the file from which symbols to be loaded. - * + * * @return the full path of the file from which symbols to be loaded */ public IPath getSymbolsFileName(); /** * Associate the specified file as a symbol provider for this module. - * If <code>null</code> is passed as a file name the internal symbols + * If <code>null</code> is passed as a file name the internal symbols * search mechanism will be used. - * + * * @param symbolsFile the symbol provider for this module. * @throws DebugException if this method fails. Reasons include: */ - public void setSymbolsFileName( IPath symbolsFile ) throws DebugException; + public void setSymbolsFileName(IPath symbolsFile) throws DebugException; /** * Returns the base address of this module. - * + * * @return the base address of this module */ public IAddress getBaseAddress(); /** * Returns the size of this module. - * + * * @return the size of this module */ public long getSize(); /** * Returns whether the symbols of this module are read. - * + * * @return whether the symbols of this module are read */ public boolean areSymbolsLoaded(); /** * Returns whether the module's symbols can be loaded or reloaded. - * + * * @return whether the module's symbols can be loaded or reloaded */ public boolean canLoadSymbols(); /** * Loads the module symbols from the specified file. - * + * * @throws DebugException if this method fails. Reasons include: */ public void loadSymbols() throws DebugException; /** * Returns the name of the platform. - * + * * @return the name of the platform */ public String getPlatform(); /** * Returns whether this module is little endian. - * + * * @return whether this module is little endian */ public boolean isLittleEndian(); /** * Returns the address factory associated with this module. - * + * * @return the address factory */ public IAddressFactory getAddressFactory(); /** * Returns the CPU identifier. - * + * * @return the CPU identifier */ public String getCPU(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICSignal.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICSignal.java index ab6b746d9c7..03f26984eaf 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICSignal.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICSignal.java @@ -21,65 +21,65 @@ import org.eclipse.debug.core.DebugException; * @since: Mar 5, 2004 */ public interface ICSignal extends ICDebugElement { - + /** * Returns the name of this signal - * + * * @return this signal's name * @throws DebugException if this method fails. */ public String getName() throws DebugException; - + /** * Returns the description of this signal. - * + * * @return this signal's description * @throws DebugException if this method fails. */ public String getDescription() throws DebugException; - + /** * Returns whether "pass" is in effect for this signal. - * + * * @return whether "pass" is in effect for this signal * @throws DebugException if this method fails. */ public boolean isPassEnabled() throws DebugException; - + /** * Returns whether "stop" is in effect for this signal. - * + * * @return whether "stop" is in effect for this signal * @throws DebugException if this method fails. */ public boolean isStopEnabled() throws DebugException; - + /** * Enables/disables the "pass" flag of this signal. - * + * * @param enable the flag value to set * @throws DebugException if this method fails. */ - public void setPassEnabled( boolean enable ) throws DebugException; - + public void setPassEnabled(boolean enable) throws DebugException; + /** * Enables/disables the "stop" flag of this signal. - * + * * @param enable the flag value to set * @throws DebugException if this method fails. */ - public void setStopEnabled( boolean enable ) throws DebugException; + public void setStopEnabled(boolean enable) throws DebugException; /** * Resumes execution, but immediately gives the target this signal. - * + * * @throws DebugException if this method fails. */ public void signal() throws DebugException; - + /** * Returns whether modification is allowed for this signal's parameters. - * + * * @return whether modification is allowed for this signal's parameters */ public boolean canModify(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICStackFrame.java index e1d245976d9..f0df391c8fb 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICStackFrame.java @@ -21,19 +21,20 @@ import org.eclipse.debug.core.model.IValue; /** * C/C++ specific extension of <code>IStackFrame</code>. */ -public interface ICStackFrame extends IRunToLine, IRunToAddress, IResumeAtLine, IResumeAtAddress, IStackFrame, ICDebugElement { +public interface ICStackFrame + extends IRunToLine, IRunToAddress, IResumeAtLine, IResumeAtAddress, IStackFrame, ICDebugElement { /** * Returns the address of this stack frame. - * + * * @return the address of this stack frame */ public IAddress getAddress(); - + /** * Returns the source file of this stack frame or <code>null</code> * if the source file is unknown. - * + * * @return the source file of this stack frame */ public String getFile(); @@ -41,7 +42,7 @@ public interface ICStackFrame extends IRunToLine, IRunToAddress, IResumeAtLine, /** * Returns the function of this stack frame or <code>null</code> * if the function is unknown. - * + * * @return the function of this stack frame */ public String getFunction(); @@ -49,40 +50,40 @@ public interface ICStackFrame extends IRunToLine, IRunToAddress, IResumeAtLine, /** * Returns the line number of this stack frame or <code>0</code> * if the line number is unknown. - * + * * @return the line number of this stack frame */ public int getFrameLineNumber(); /** * Returns the level of this stack frame. - * - * @return the level of this stack frame + * + * @return the level of this stack frame */ public int getLevel(); /** * Evaluates the given expression in the context of this stack frame. - * + * * @param expression expression to evaluate * @return the evaluation result * @throws DebugException if this method fails. */ - public IValue evaluateExpression( String expression ) throws DebugException; + public IValue evaluateExpression(String expression) throws DebugException; /** - * Evaluates the specified expression in the context of this stack frame + * Evaluates the specified expression in the context of this stack frame * and returns the evaluation result as a string. - * + * * @param expression the expression to evaluate * @return the evaluation result * @throws DebugException on failure. Reasons include: */ - public String evaluateExpressionToString( String expression ) throws DebugException; + public String evaluateExpressionToString(String expression) throws DebugException; /** * Returns whether this stack frame can currently evaluate an expression. - * + * * @return whether this stack frame can currently evaluate an expression */ boolean canEvaluate(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICThread.java index 7e10cafe73a..d1f95c4b639 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICThread.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICThread.java @@ -11,7 +11,7 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.model; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.model.IThread; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java index c668d433a18..49871ae9ba1 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICTracepoint.java @@ -17,45 +17,45 @@ import org.eclipse.core.runtime.CoreException; /** * A tracepoint specific to the C/C++ debug model. - * + * * @since 7.0 */ public interface ICTracepoint extends ICLineBreakpoint { - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cTracepointMarker"; //$NON-NLS-1$ + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cTracepointMarker"; //$NON-NLS-1$ + + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_LINE_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cLineTracepointMarker"; //$NON-NLS-1$ - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_LINE_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cLineTracepointMarker"; //$NON-NLS-1$ - - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_ADDRESS_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cAddressTracepointMarker"; //$NON-NLS-1$ + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_ADDRESS_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cAddressTracepointMarker"; //$NON-NLS-1$ + + /** + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_FUNCTION_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cFunctionTracepointMarker"; //$NON-NLS-1$ - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_FUNCTION_TRACEPOINT_MARKER = "org.eclipse.cdt.debug.core.cFunctionTracepointMarker"; //$NON-NLS-1$ - /** * Tracepoint attribute storing a tracepoint's pass count value (value * <code>"org.eclipse.cdt.debug.core.passCount"</code>). This attribute * is an <code>int</code>. */ - public static final String PASS_COUNT = "org.eclipse.cdt.debug.core.passCount"; //$NON-NLS-1$ + public static final String PASS_COUNT = "org.eclipse.cdt.debug.core.passCount"; //$NON-NLS-1$ /** * Returns the pass count used by this tracepoint. - * + * * @return the pass count used by this breakpoint * @exception CoreException if unable to access the property on this tracepoint's * underlying marker @@ -64,7 +64,7 @@ public interface ICTracepoint extends ICLineBreakpoint { /** * Sets the pass count attribute for this tracepoint. - * + * * @param passCount the new pass count * @exception CoreException if unable to access the property on this tracepoint's * underlying marker diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICType.java index cc729d99c2b..1dd4f2512a6 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICType.java @@ -14,78 +14,78 @@ package org.eclipse.cdt.debug.core.model; /** - * Represents a type of a varibale. + * Represents a type of a varibale. * Used by the UI responsible components for variable rendering. */ public interface ICType { /** * Returns the name of this type. - * + * * @return the name of this type */ String getName(); /** * Returns whether this is an array type. - * + * * @return whether this is an array type */ boolean isArray(); /** - * Returns the array dimensions for array types, + * Returns the array dimensions for array types, * otherwise returns an empty array. - * + * * @return the array dimensions */ int[] getArrayDimensions(); /** * Returns whether this is a structure or a class type. - * + * * @return whether this is a structure or a class type */ boolean isStructure(); /** * Returns whether this is a character type. - * + * * @return whether this is a character type */ boolean isCharacter(); /** * Returns whether this is a floating point type. - * + * * @return whether this is a floating point type */ boolean isFloatingPointType(); /** * Returns whether this is a pointer type. - * + * * @return whether this is a pointer type */ boolean isPointer(); /** * Returns whether this is a reference type. - * + * * @return whether this is a reference type */ boolean isReference(); /** * Returns whether this is an unsigned type. - * + * * @return whether this is an unsigned type */ boolean isUnsigned(); /** * Returns whether this is an integral type. - * + * * @return whether this is an integral type */ boolean isIntegralType(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICValue.java index 66004abe573..59b6d5e09f9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICValue.java @@ -20,8 +20,8 @@ import org.eclipse.debug.core.model.IValue; * Extends the IValue interface by C/C++ specific functionality. */ public interface ICValue extends IValue, ICDebugElement { - + ICType getType() throws DebugException; - String evaluateAsExpression( ICStackFrame frame ); + String evaluateAsExpression(ICStackFrame frame); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java index d2313f0a0d5..e7772a54740 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint.java @@ -21,24 +21,24 @@ import org.eclipse.debug.core.model.ILineBreakpoint; */ public interface ICWatchpoint extends ICBreakpoint, ILineBreakpoint { - /** - * Breakpoint marker type for this breakpoint type. - * @since 7.2 - */ - public static final String C_WATCHPOINT_MARKER = "org.eclipse.cdt.debug.core.cWatchpointMarker"; //$NON-NLS-1$ - /** - * Watchpoint attribute storing the expression associated with this + * Breakpoint marker type for this breakpoint type. + * @since 7.2 + */ + public static final String C_WATCHPOINT_MARKER = "org.eclipse.cdt.debug.core.cWatchpointMarker"; //$NON-NLS-1$ + + /** + * Watchpoint attribute storing the expression associated with this * watchpoint (value <code>"org.eclipse.cdt.debug.core.expression"</code>). * This attribute is a <code>String</code>. */ - public static final String EXPRESSION = "org.eclipse.cdt.debug.core.expression"; //$NON-NLS-1$ + public static final String EXPRESSION = "org.eclipse.cdt.debug.core.expression"; //$NON-NLS-1$ /** * Write access watchpoint attribute (value <code>"org.eclipse.cdt.debug.core.write"</code>). * This attribute is a <code>boolean</code>. */ - public static final String WRITE = "org.eclipse.cdt.debug.core.write"; //$NON-NLS-1$ + public static final String WRITE = "org.eclipse.cdt.debug.core.write"; //$NON-NLS-1$ /** * Read access watchpoint attribute (value <code>"org.eclipse.cdt.debug.core.read"</code>). @@ -48,21 +48,21 @@ public interface ICWatchpoint extends ICBreakpoint, ILineBreakpoint { /** * Returns whether this watchppoint is a write watchpoint. - * + * * @return whether this watchppoint is a write watchpoint */ boolean isWriteType() throws CoreException; /** * Returns whether this watchppoint is a read watchpoint. - * + * * @return whether this watchppoint is a read watchpoint */ boolean isReadType() throws CoreException; /** * Returns the watchpoint's expression. - * + * * @return the expression of this watchpoint * @throws CDIException if this method fails. Reasons include: */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint2.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint2.java index 1afa2a2d294..a6be6cacdbc 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint2.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICWatchpoint2.java @@ -20,30 +20,30 @@ import org.eclipse.core.runtime.CoreException; public interface ICWatchpoint2 extends ICWatchpoint { /** - * Watchpoint attribute storing the memory space associated with this + * Watchpoint attribute storing the memory space associated with this * watchpoint (value <code>"org.eclipse.cdt.debug.core.memoryspace"</code>). * This attribute is a <code>String</code>. */ - public static final String MEMORYSPACE = "org.eclipse.cdt.debug.core.memoryspace"; //$NON-NLS-1$ + public static final String MEMORYSPACE = "org.eclipse.cdt.debug.core.memoryspace"; //$NON-NLS-1$ /** - * Watchpoint attribute storing the range associated with this + * Watchpoint attribute storing the range associated with this * watchpoint (value <code>"org.eclipse.cdt.debug.core.range"</code>). * This attribute is an <code>int</code>. */ - public static final String RANGE = "org.eclipse.cdt.debug.core.range"; //$NON-NLS-1$ + public static final String RANGE = "org.eclipse.cdt.debug.core.range"; //$NON-NLS-1$ /** * Returns the watchpoint's memory space. - * + * * @return the memory space of this watchpoint * @throws CDIException if this method fails. Reasons include: */ String getMemorySpace() throws CoreException; - + /** * Returns the watchpoint's range. - * + * * @return the range of this watchpoint * @throws CDIException if this method fails. Reasons include: */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToArray.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToArray.java index 79e3b8358c8..941c1da6239 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToArray.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToArray.java @@ -22,18 +22,18 @@ public interface ICastToArray extends ICastToType { /** * Returns whether this element can be currently casted to array. - * + * * @return whether this element can be currently casted to array */ boolean canCastToArray(); /** * Performs the casting. The element is transformed to the array of the same type. - * - * @param startIndex the index of the first element of the array. 0 means that - * the original element is the first member of the array. + * + * @param startIndex the index of the first element of the array. 0 means that + * the original element is the first member of the array. * @param length tha array size * @throws DebugException */ - void castToArray( int startIndex, int length ) throws DebugException; + void castToArray(int startIndex, int length) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToType.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToType.java index 0c541d7ae2d..218285bd63b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToType.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICastToType.java @@ -23,36 +23,36 @@ public interface ICastToType extends IAdaptable { /** * Returns whether this element can currently be casted. - * + * * @return whether this element can currently be casted */ boolean canCast(); /** * Returns the string presentation of the current type. - * + * * @return the string presentation of the current type */ String getCurrentType(); /** * Performs the casting to the given type. - * + * * @param type a type to cast to. * @throws DebugException */ - void cast( String type ) throws DebugException; + void cast(String type) throws DebugException; /** * Restores the original type. - * + * * @throws DebugException */ void restoreOriginal() throws DebugException; /** * Returns whether this element is casted. - * + * * @return whether this element is casted */ boolean isCasted(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java index 8655c893f6e..10759123925 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IChangeReverseMethodHandler.java @@ -25,25 +25,27 @@ public interface IChangeReverseMethodHandler extends IReverseToggleHandler, IDeb /** * List of different values for the reverse debugging method. */ - enum ReverseDebugMethod {OFF, SOFTWARE, HARDWARE, BRANCH_TRACE, PROCESSOR_TRACE, GDB_TRACE}; + enum ReverseDebugMethod { + OFF, SOFTWARE, HARDWARE, BRANCH_TRACE, PROCESSOR_TRACE, GDB_TRACE + }; - /** - * Sets the value for the reverse debugging method to be used when the button is toggled. - */ - void setReverseDebugMethod(ReverseDebugMethod traceMethod); + /** + * Sets the value for the reverse debugging method to be used when the button is toggled. + */ + void setReverseDebugMethod(ReverseDebugMethod traceMethod); - /** - * Return the reverse debugging method currently selected. - * - * @param context is the currently active context in the debug view - */ - ReverseDebugMethod getReverseDebugMethod(Object context); + /** + * Return the reverse debugging method currently selected. + * + * @param context is the currently active context in the debug view + */ + ReverseDebugMethod getReverseDebugMethod(Object context); - /** - * Return the reverse debugging method that was selected before the - * currently selected one. - * - * @param context is the currently active context in the debug view - */ - ReverseDebugMethod getPreviousReverseDebugMethod(Object context); + /** + * Return the reverse debugging method that was selected before the + * currently selected one. + * + * @param context is the currently active context in the debug view + */ + ReverseDebugMethod getPreviousReverseDebugMethod(Object context); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IConnectHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IConnectHandler.java index ceb0591682c..22dfdf97d95 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IConnectHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IConnectHandler.java @@ -17,7 +17,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Handler interface to for the connect command - * + * * @since 7.3 */ public interface IConnectHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebugNewExecutableHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebugNewExecutableHandler.java index 44c398e8cae..d16e7c59e40 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebugNewExecutableHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebugNewExecutableHandler.java @@ -18,7 +18,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Command handler for the "Debug New Executable" command. - * + * * @since 7.3 */ public interface IDebugNewExecutableHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebuggerProcessSupport.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebuggerProcessSupport.java index 153f43a37f2..e732b2588e7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebuggerProcessSupport.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDebuggerProcessSupport.java @@ -15,14 +15,13 @@ package org.eclipse.cdt.debug.core.model; /** * Provides the functionality to support debugger console. - * + * * @since: Oct 23, 2002 */ -public interface IDebuggerProcessSupport -{ +public interface IDebuggerProcessSupport { boolean supportsDebuggerProcess(); - + boolean isDebuggerProcessDefault(); - - void setDebuggerProcessDefault( boolean value ); + + void setDebuggerProcessDefault(boolean value); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassembly.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassembly.java index 2df32b4d80f..8a6c6d8b4e5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassembly.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassembly.java @@ -24,26 +24,26 @@ public interface IDisassembly extends ICDebugElement { /** * Returns the disassembly block for given stack frame. - * + * * @param frame the stack frame for which the disassembly is required * @return the disassembly block for given stack frame * @throws DebugException if this method fails. */ - IDisassemblyBlock getDisassemblyBlock( ICStackFrame frame ) throws DebugException; + IDisassemblyBlock getDisassemblyBlock(ICStackFrame frame) throws DebugException; /** * Returns the disassembly block for given stack frame. - * + * * @param address the address from which the disassembly starts * @return the disassembly block for given memory address * @throws DebugException if this method fails. * @since 6.0 */ - IDisassemblyBlock getDisassemblyBlock( IAddress address ) throws DebugException; - + IDisassemblyBlock getDisassemblyBlock(IAddress address) throws DebugException; + /** * Returns the address factory associated with this element. - * + * * @return the address factory */ IAddressFactory getAddressFactory(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyBlock.java index 1f567b91d14..0627c5bea13 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyBlock.java @@ -17,49 +17,48 @@ package org.eclipse.cdt.debug.core.model; * Represents a contiguous segment of disassembly in an execution context. */ public interface IDisassemblyBlock { - + /** * Returns the parent disassembly object. - * + * * @return the parent disassembly object */ IDisassembly getDisassembly(); /** - * Returns the platform-dependent path of the executable associated + * Returns the platform-dependent path of the executable associated * with this segment. - * + * * @return the platform-dependent path of the executable */ String getModuleFile(); - /** - * Returns the source element (<code>IFile</code> or <code>File></code>) + * Returns the source element (<code>IFile</code> or <code>File></code>) * of the source file associated with this segment or null if no source file is associated. - * + * * @return the source element */ Object getSourceElement(); /** * Returns whether this block contains given stack frame. - * + * * @param frame the stack frame * @return whether this block contains given stack frame */ - boolean contains( ICStackFrame frame ); + boolean contains(ICStackFrame frame); /** * Return the array of source lines associated with this block. - * + * * @return the array of source lines associated with this block */ IAsmSourceLine[] getSourceLines(); /** * Returns whether this block contains mixed source/disassembly information. - * + * * @return whether this block contains mixed source/disassembly information */ boolean isMixedMode(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyLine.java index 42483f5003c..fd6cbe06cc7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblyLine.java @@ -15,7 +15,7 @@ package org.eclipse.cdt.debug.core.model; /** - * org.eclipse.cdt.debug.core.model.IDisassemblyLine: + * org.eclipse.cdt.debug.core.model.IDisassemblyLine: * //TODO Add description. */ public interface IDisassemblyLine extends ICDebugElement { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblySourceLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblySourceLine.java index 9e6f4c396a5..9972d540bbd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblySourceLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDisassemblySourceLine.java @@ -20,6 +20,6 @@ import java.io.File; * Represents a source line in disassembly. */ public interface IDisassemblySourceLine extends IAsmSourceLine, IDisassemblyLine { - - public File getFile(); + + public File getFile(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDummyStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDummyStackFrame.java index 21a4c3c452e..d1a8f783f37 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDummyStackFrame.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IDummyStackFrame.java @@ -14,7 +14,7 @@ package org.eclipse.cdt.debug.core.model; /** - * Represents a dummy stack frame used to indicate that the stack depth is greater + * Represents a dummy stack frame used to indicate that the stack depth is greater * than the number of displayed frames. */ public interface IDummyStackFrame { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEditRegisterGroupHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEditRegisterGroupHandler.java index a4c246e25da..6c2f627993d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEditRegisterGroupHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEditRegisterGroupHandler.java @@ -21,4 +21,3 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; */ public interface IEditRegisterGroupHandler extends IDebugCommandHandler { } - diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEnableDisableTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEnableDisableTarget.java index cf6bb71f577..a5c3f8e9f29 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEnableDisableTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IEnableDisableTarget.java @@ -11,10 +11,10 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.model; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; - + /** * Provides support for enable/disable actions. */ @@ -22,24 +22,24 @@ public interface IEnableDisableTarget { /** * Returns whether this object supports enable/disable operations. - * + * * @return whether this object supports enable/disable operations */ boolean canEnableDisable(); - + /** * Returns whether this object is enabled. - * - * @return <code>true</code> if this obvject is enabled, + * + * @return <code>true</code> if this obvject is enabled, * or <code>false</code> otherwise. */ boolean isEnabled(); /** * Enables/disables this object - * + * * @param enabled enablement flag value * @throws DebugException */ - void setEnabled( boolean enabled ) throws DebugException; + void setEnabled(boolean enabled) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGlobalVariableDescriptor.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGlobalVariableDescriptor.java index 38a0066f06d..5fa24093695 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGlobalVariableDescriptor.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGlobalVariableDescriptor.java @@ -22,15 +22,15 @@ public interface IGlobalVariableDescriptor { /** * Returns the name of the global variable - * + * * @return the name of the global variable */ public String getName(); /** - * Returns the path of the source file that contains + * Returns the path of the source file that contains * the definition of the global variable. - * + * * @return the path of the source file */ public IPath getPath(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGroupDebugContextsHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGroupDebugContextsHandler.java index 36cb2d8b0ea..cd28259da88 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGroupDebugContextsHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IGroupDebugContextsHandler.java @@ -16,9 +16,9 @@ package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.commands.IDebugCommandHandler; /** - * Handler interface to perform grouping of debug contexts. - * - * @since 7.1 + * Handler interface to perform grouping of debug contexts. + * + * @since 7.1 */ public interface IGroupDebugContextsHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMemoryBlockAddressInfoRetrieval.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMemoryBlockAddressInfoRetrieval.java index 63c491d7353..98b6a4f6a5f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMemoryBlockAddressInfoRetrieval.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMemoryBlockAddressInfoRetrieval.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Ericsson - initial API and implementation *******************************************************************************/ @@ -22,12 +22,11 @@ import org.eclipse.debug.core.model.IMemoryBlock; * An interface that offers the possibility to request information related to addresses for a given memory block * and within a specific context. It also offers the possibility to register listeners, listeners that can receive * notifications of changes/updates to the address information - * + * * @since 8.0 */ public interface IMemoryBlockAddressInfoRetrieval { - /** * An indication of the type of change which may render the current memory address information out of date */ @@ -116,7 +115,7 @@ public interface IMemoryBlockAddressInfoRetrieval { */ public interface IAddressInfoUpdateListener { /** - * This method will be called for each registered listener, when there is a session change that may render + * This method will be called for each registered listener, when there is a session change that may render * previous memory address information out of date * @param update optional General purpose update object to e.g. determine changed values */ @@ -124,25 +123,25 @@ public interface IMemoryBlockAddressInfoRetrieval { } /** - * Triggers an asynchronous request for Memory block address information - * + * Triggers an asynchronous request for Memory block address information + * * @param context A reference to a session context * @param memoryBlock The memory block to be used in conjunction with the requested Address information - * @param request This is the async request instance. Overriding its method "done()" allows to read and - * use the information items collected + * @param request This is the async request instance. Overriding its method "done()" allows to read and + * use the information items collected */ void getMemoryBlockAddressInfo(Object context, IMemoryBlock memoryBlock, IGetMemoryBlockAddressInfoReq request); /** * Register a listener so it can receive notifications of changes to address information items - * + * * @param listener */ void addAddressInfoUpdateListener(IAddressInfoUpdateListener listener); /** * Removes a listener so it no longer receives notifications - * + * * @param The listener to remove. Nothing will happen if that listener is not registered already */ void removeAddressInfoUpdateListener(IAddressInfoUpdateListener listener); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IModuleRetrieval.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IModuleRetrieval.java index 8fa36f20f0a..20ca0e33881 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IModuleRetrieval.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IModuleRetrieval.java @@ -11,27 +11,27 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.model; +package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; - + /** * Comment for . */ public interface IModuleRetrieval { - + /** * Returns whether there are modules currently loaded in this debug target. - * + * * @return whether there are modules currently loaded in this debug target - * + * * @throws DebugException */ public boolean hasModules() throws DebugException; /** * Returns the array of the currently loaded modules. - * + * * @return the array of the currently loaded modules * @throws DebugException if this method fails. Reasons include: */ @@ -39,7 +39,7 @@ public interface IModuleRetrieval { /** * Load symbols for all currently loaded modules. - * + * * @throws DebugException if this method fails. Reasons include: */ public void loadSymbolsForAllModules() throws DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToAddress.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToAddress.java index 4abd5f78b15..0e88eed633e 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToAddress.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToAddress.java @@ -27,12 +27,12 @@ public interface IMoveToAddress { * * @return whether this operation is currently available */ - public boolean canMoveToAddress( IAddress address ); + public boolean canMoveToAddress(IAddress address); /** * Causes this element can move the instruction pointer to the specified address. * * @exception DebugException on failure. Reasons include: */ - public void moveToAddress( IAddress address ) throws DebugException; + public void moveToAddress(IAddress address) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToLine.java index fcbccfd3b0e..bf7eb93ab14 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IMoveToLine.java @@ -23,15 +23,15 @@ public interface IMoveToLine { /** * Returns whether this operation is currently available for this file and line number. - * + * * @return whether this operation is currently available */ - public boolean canMoveToLine( String fileName, int lineNumber ); + public boolean canMoveToLine(String fileName, int lineNumber); /** * Causes this element to move the instruction pointer to the specified line. - * + * * @exception DebugException on failure. Reasons include: */ - public void moveToLine( String fileName, int lineNumber ) throws DebugException; + public void moveToLine(String fileName, int lineNumber) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IPersistableRegisterGroup.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IPersistableRegisterGroup.java index d3af56d154a..45ec7f5daad 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IPersistableRegisterGroup.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IPersistableRegisterGroup.java @@ -11,46 +11,46 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.model; +package org.eclipse.cdt.debug.core.model; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.model.IRegisterGroup; - + /** - * A register group to be persisted and restored. + * A register group to be persisted and restored. * To be used for the user-defined register groups. - * + * * @since 3.0 */ public interface IPersistableRegisterGroup extends IRegisterGroup { /** * Returns a memento that can be used to reconstruct this group - * + * * @return a memento that can be used to reconstruct this group * @exception CoreException if unable to construct a memento */ public String getMemento() throws CoreException; - + /** * Initializes this group based on the given memento. - * + * * @param memento a memento to initialize this group - * @exception CoreException on failure to initialize + * @exception CoreException on failure to initialize */ - public void initializeFromMemento( String memento ) throws CoreException; + public void initializeFromMemento(String memento) throws CoreException; /** * Returns the array of group's register descriptors. - * + * * @return the array of group's register descriptors */ public IRegisterDescriptor[] getRegisterDescriptors(); /** * Replaces the group register descriptors by the specified descriptors. - * + * * @param the array of register descriptors */ - public void setRegisterDescriptors( IRegisterDescriptor[] registerDescriptors ); + public void setRegisterDescriptors(IRegisterDescriptor[] registerDescriptors); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRegisterDescriptor.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRegisterDescriptor.java index ac2e0e70b4b..a0b3a8ef5af 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRegisterDescriptor.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRegisterDescriptor.java @@ -11,25 +11,25 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.model; +package org.eclipse.cdt.debug.core.model; /** * Describes a register. - * + * * @since 3.0 */ public interface IRegisterDescriptor { /** * Returns the regiser's name - * + * * @return the register's name */ public String getName(); /** * Returns the name of the hardware register group this register belongs to - * + * * @return the name of the hardware register group */ public String getGroupName(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRestart.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRestart.java index df7c6b28a6b..51b99207d0b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRestart.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRestart.java @@ -16,21 +16,21 @@ package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; + /** - * Provides the ability to restart a debug target. + * Provides the ability to restart a debug target. * <p> * Note: Debug elements which support restart should implement this interface. - * Adopting to this interface is not enough. + * Adopting to this interface is not enough. * </p> * <p> - * Note 2: Debugger can also implement the asynchronous + * Note 2: Debugger can also implement the asynchronous * {@link org.eclipse.debug.core.commands.IRestartHandler}. * </p> - * + * * @see org.eclipse.debug.core.commands.IRestartHandler */ -public interface IRestart -{ +public interface IRestart { /** * Returns whether this element can currently be restarted. * @@ -45,4 +45,3 @@ public interface IRestart */ public void restart() throws DebugException; } - diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtAddress.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtAddress.java index 78cb1606cf4..da7122a5576 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtAddress.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtAddress.java @@ -24,15 +24,15 @@ public interface IResumeAtAddress { /** * Returns whether this operation is currently available for this element. - * + * * @return whether this operation is currently available */ - public boolean canResumeAtAddress( IAddress address ); + public boolean canResumeAtAddress(IAddress address); /** * Causes this element to resume the execution at the specified address. - * + * * @exception DebugException on failure. Reasons include: */ - public void resumeAtAddress( IAddress address ) throws DebugException; + public void resumeAtAddress(IAddress address) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtLine.java index abd0b2a683d..b1231ee3259 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeAtLine.java @@ -24,30 +24,30 @@ public interface IResumeAtLine { /** * Returns whether this operation is currently available for this file and line number. - * + * * @return whether this operation is currently available */ - public boolean canResumeAtLine( IFile file, int lineNumber ); + public boolean canResumeAtLine(IFile file, int lineNumber); /** * Causes this element to resume the execution at the specified line. - * + * * @exception DebugException * on failure. Reasons include: */ - public void resumeAtLine( IFile file, int lineNumber ) throws DebugException; + public void resumeAtLine(IFile file, int lineNumber) throws DebugException; /** * Returns whether this operation is currently available for this file and line number. - * + * * @return whether this operation is currently available */ - public boolean canResumeAtLine( String fileName, int lineNumber ); + public boolean canResumeAtLine(String fileName, int lineNumber); /** * Causes this element to resume the execution at the specified line. - * + * * @exception DebugException on failure. Reasons include: */ - public void resumeAtLine( String fileName, int lineNumber ) throws DebugException; + public void resumeAtLine(String fileName, int lineNumber) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignal.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignal.java index 7049609ee82..41bc5731a7a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignal.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignal.java @@ -16,18 +16,17 @@ package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.DebugException; /** - * Provides the ability to resume execution without giving a signal. - * This is useful when the program stopped on account of a signal and would + * Provides the ability to resume execution without giving a signal. + * This is useful when the program stopped on account of a signal and would * ordinary see the signal when resumed. - * + * * @since: Feb 4, 2003 */ -public interface IResumeWithoutSignal -{ +public interface IResumeWithoutSignal { /** * Causes this element to resume its execution ignoring a signal. * Has no effect on an element that is not suspended because of a signal. - * + * * @exception DebugException on failure. Reasons include: */ public void resumeWithoutSignal() throws DebugException; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignalHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignalHandler.java index 006ee24eb8b..e9f980c3977 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignalHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IResumeWithoutSignalHandler.java @@ -17,7 +17,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Handler interface to perform a resume without signal operation - * + * * @since 7.0 */ public interface IResumeWithoutSignalHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java index 9879722aede..51cb8642205 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseResumeHandler.java @@ -17,7 +17,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Handler interface to perform a reverse Resume operation - * + * * @since 7.0 */ public interface IReverseResumeHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java index 1d1b04e8e1a..2ff92e1363d 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepIntoHandler.java @@ -17,7 +17,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Handler interface to perform a reverse StepInto operation - * + * * @since 7.0 */ public interface IReverseStepIntoHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java index bc600ee1857..7ab3b00cb87 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseStepOverHandler.java @@ -17,7 +17,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Handler interface to perform a reverse StepOver operation - * + * * @since 7.0 */ public interface IReverseStepOverHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java index 79371c1a092..2a31b66ff49 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IReverseToggleHandler.java @@ -17,7 +17,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Handler interface to toggle reverse debugging - * + * * @since 7.0 */ public interface IReverseToggleHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToAddress.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToAddress.java index 8b1057b10ee..f0603e01319 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToAddress.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToAddress.java @@ -23,15 +23,15 @@ public interface IRunToAddress { /** * Returns whether this operation is currently available for this element. - * + * * @return whether this operation is currently available */ - public boolean canRunToAddress( IAddress address ); + public boolean canRunToAddress(IAddress address); /** * Causes this element to run to specified address. - * + * * @exception DebugException on failure. Reasons include: */ - public void runToAddress( IAddress address, boolean skipBreakpoints ) throws DebugException; + public void runToAddress(IAddress address, boolean skipBreakpoints) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToLine.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToLine.java index a8a4b51e386..fb511ccbe67 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToLine.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IRunToLine.java @@ -23,29 +23,29 @@ public interface IRunToLine { /** * Returns whether this operation is currently available for this file and line number. - * + * * @return whether this operation is currently available */ - public boolean canRunToLine( IFile file, int lineNumber ); + public boolean canRunToLine(IFile file, int lineNumber); /** * Causes this element to run to specified location. - * + * * @exception DebugException on failure. Reasons include: */ - public void runToLine( IFile file, int lineNumber, boolean skipBreakpoints ) throws DebugException; + public void runToLine(IFile file, int lineNumber, boolean skipBreakpoints) throws DebugException; /** * Returns whether this operation is currently available for this file and line number. - * + * * @return whether this operation is currently available */ - public boolean canRunToLine( String fileName, int lineNumber ); + public boolean canRunToLine(String fileName, int lineNumber); /** * Causes this element to run to specified location. - * + * * @exception DebugException on failure. Reasons include: */ - public void runToLine( String fileName, int lineNumber, boolean skipBreakpoints ) throws DebugException; + public void runToLine(String fileName, int lineNumber, boolean skipBreakpoints) throws DebugException; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISaveTraceDataHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISaveTraceDataHandler.java index 020bf8b5486..4e47ff21922 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISaveTraceDataHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISaveTraceDataHandler.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Ericsson - initial API and implementation *******************************************************************************/ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStartTracingHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStartTracingHandler.java index bcd9f1bcdd7..2d552ab2487 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStartTracingHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStartTracingHandler.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Ericsson - initial API and implementation *******************************************************************************/ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStepIntoSelectionHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStepIntoSelectionHandler.java index 4f24f4a4f2a..a7084435148 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStepIntoSelectionHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStepIntoSelectionHandler.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Alvaro Sanchez-Leon (Ericsson AB) - Support for Step into selection (bug 244865) *******************************************************************************/ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISteppingModeTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISteppingModeTarget.java index 6d27595d659..41e526e54e9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISteppingModeTarget.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ISteppingModeTarget.java @@ -27,15 +27,15 @@ public interface ISteppingModeTarget { /** * Sets whether the instruction stepping are enabled in this debug target. - * + * * @param enabled whether the instruction stepping are enabled in this debug target */ - void enableInstructionStepping( boolean enabled ); - + void enableInstructionStepping(boolean enabled); + /** * Returns whether the instruction stepping are currently enabled in this * debug target. - * + * * @return whether the instruction stepping are currently enabled in this * debug target */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStopTracingHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStopTracingHandler.java index dacd5ce5de0..25b71750de4 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStopTracingHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IStopTracingHandler.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Ericsson - initial API and implementation *******************************************************************************/ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ITargetProperties.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ITargetProperties.java index 4bff30488e0..52bf6363421 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ITargetProperties.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ITargetProperties.java @@ -28,7 +28,7 @@ public interface ITargetProperties { * * @param listener a property change listener */ - void addPropertyChangeListener( Preferences.IPropertyChangeListener listener ); + void addPropertyChangeListener(Preferences.IPropertyChangeListener listener); /** * Removes the given listener from this target. @@ -36,5 +36,5 @@ public interface ITargetProperties { * * @param listener a property change listener */ - void removePropertyChangeListener( Preferences.IPropertyChangeListener listener ); + void removePropertyChangeListener(Preferences.IPropertyChangeListener listener); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java index 417c9119429..0dd649337c8 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUncallHandler.java @@ -17,7 +17,7 @@ import org.eclipse.debug.core.commands.IDebugCommandHandler; /** * Handler interface to perform an Uncall operation (reverse debugging) - * + * * @since 7.0 */ public interface IUncallHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUngroupDebugContextsHandler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUngroupDebugContextsHandler.java index bafddaf3d67..fb4f936b8fc 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUngroupDebugContextsHandler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IUngroupDebugContextsHandler.java @@ -16,9 +16,9 @@ package org.eclipse.cdt.debug.core.model; import org.eclipse.debug.core.commands.IDebugCommandHandler; /** - * Handler interface to perform ungrouping of debug contexts. - * - * @since 7.1 + * Handler interface to perform ungrouping of debug contexts. + * + * @since 7.1 */ public interface IUngroupDebugContextsHandler extends IDebugCommandHandler { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IViewInMemory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IViewInMemory.java index 87a80b084dc..a3fa8b2ce2c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IViewInMemory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/IViewInMemory.java @@ -23,11 +23,11 @@ public interface IViewInMemory extends IAdaptable { /** * Returns whether this element can currently be viewed in the memory view. - * + * * @return whether this element can currently be viewed in the memory view. */ boolean canViewInMemory(); - + /** * Displays the element in the memory view. */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemoryRenderingViewportProvider.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemoryRenderingViewportProvider.java index db7e440dc32..3e9f540579c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemoryRenderingViewportProvider.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemoryRenderingViewportProvider.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Freescale Semiconductor - initial API and implementation *******************************************************************************/ @@ -21,7 +21,7 @@ import java.math.BigInteger; * changes. */ public interface IMemoryRenderingViewportProvider { - + /** * Return the first address being shown in the rendering. Subject to scrolling. */ diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlock.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlock.java index e543dc28918..3b34fab77bd 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlock.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlock.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Texas Instruments, Freescale Semiconductor - initial API and implementation *******************************************************************************/ @@ -19,14 +19,14 @@ import org.eclipse.debug.core.model.IMemoryBlockExtension; * An extension of IMemoryBlockExtension that supports memory spaces. An * instance of this is returned from IMemorySpaceAwareMemoryBlockRetrieval. The * memory space interface is provisional, thus this class cannot yet be API. - * + * * @author Alain Lee and John Cortell */ public interface IMemorySpaceAwareMemoryBlock extends IMemoryBlockExtension { /** * Returns the memory space associated with this block - * + * * @return a memory space ID, or null if the block was created without a * memory space identifier. These IDs originate from the backend. See * {@link IMemorySpaceAwareMemoryBlockRetrieval#getMemorySpaces(Object, IRequestListener)} diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlockRetrieval.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlockRetrieval.java index 47fd5327d79..c6474cca32b 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlockRetrieval.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IMemorySpaceAwareMemoryBlockRetrieval.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Texas Instruments, Freescale Semiconductor - initial API and implementation *******************************************************************************/ @@ -22,7 +22,7 @@ import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension; * An extension of the IMemoryBlockRetrievalExtension interface that supports * memory spaces. The memory space interface is provisional, thus this class * cannot yet be API. - * + * * @author Alain Lee and John Cortell */ public interface IMemorySpaceAwareMemoryBlockRetrieval extends IMemoryBlockRetrievalExtension { @@ -34,6 +34,7 @@ public interface IMemorySpaceAwareMemoryBlockRetrieval extends IMemoryBlockRetri */ interface GetMemorySpacesRequest extends IRequest { String[] getMemorySpaces(); + void setMemorySpaces(String[] memorySpaceIds); } @@ -41,7 +42,7 @@ public interface IMemorySpaceAwareMemoryBlockRetrieval extends IMemoryBlockRetri * Provides the string encoding of a memory space qualified address. This * method is called when having to represent a memory-space qualified * address as a single string. - * + * * @param expression * the expression representing a location within a memory space. * This can be a simple numeric expression like "0x10000" or @@ -55,7 +56,7 @@ public interface IMemorySpaceAwareMemoryBlockRetrieval extends IMemoryBlockRetri /** * The inverse of {@link #encodeAddress(String, String)}. - * + * * @param str * the encoded string * @return the result of decoding the string into its components; never null @@ -66,12 +67,13 @@ public interface IMemorySpaceAwareMemoryBlockRetrieval extends IMemoryBlockRetri interface DecodeResult { String getMemorySpaceId(); + String getExpression(); } - + /** * Provides the memory spaces available for the given debug context. - * + * * @param context * a debug context * @param request @@ -82,7 +84,7 @@ public interface IMemorySpaceAwareMemoryBlockRetrieval extends IMemoryBlockRetri /** * Retrieves and returns a memory block. - * + * * @param expression * expression to be evaluated to an address * @param context @@ -94,7 +96,8 @@ public interface IMemorySpaceAwareMemoryBlockRetrieval extends IMemoryBlockRetri * @throws DebugException * if unable to retrieve the specified memory */ - public IMemorySpaceAwareMemoryBlock getMemoryBlock(String expression, Object context, String memorySpaceID) throws DebugException; + public IMemorySpaceAwareMemoryBlock getMemoryBlock(String expression, Object context, String memorySpaceID) + throws DebugException; /** * Return true if creating a memory block with a null memory space ID is NOT diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IRecurringDebugContext.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IRecurringDebugContext.java index 072933988f2..db1c6c4cb28 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IRecurringDebugContext.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/provisional/IRecurringDebugContext.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * Texas Instruments - initial API and implementation *******************************************************************************/ @@ -27,11 +27,11 @@ import org.eclipse.debug.core.DebugException; * identifiers that are assigned by the underlying runtime system (e.g., PIDs * and TIDs), since such IDs are often assigned and reused in non-deterministic * ways. - * + * * @author Alain Lee */ public interface IRecurringDebugContext { - + /** * Returns the unique identifier associated with this recurring context. If * this context re-appears in a future debug session, it should return the diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java index 375d8040abc..34d797c1a7f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/AbsolutePathSourceContainer.java @@ -28,16 +28,16 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer { * Unique identifier for the absolute source container type * (value <code>org.eclipse.cdt.debug.core.containerType.absolutePath</code>). */ - public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.absolutePath"; //$NON-NLS-1$ + public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.absolutePath"; //$NON-NLS-1$ public boolean isValidAbsoluteFilePath(String name) { - return isValidAbsoluteFilePath(new File(name)); + return isValidAbsoluteFilePath(new File(name)); } public boolean isValidAbsoluteFilePath(File file) { - return file.isAbsolute() && file.exists() && file.isFile(); + return file.isAbsolute() && file.exists() && file.isFile(); } - + @Override public Object[] findSourceElements(String name) throws CoreException { if (name != null) { @@ -66,11 +66,11 @@ public class AbsolutePathSourceContainer extends AbstractSourceContainer { public int hashCode() { return TYPE_ID.hashCode(); } - + @Override public boolean equals(Object obj) { - if (!(obj instanceof AbsolutePathSourceContainer)) - return false; - return true; - } + if (!(obj instanceof AbsolutePathSourceContainer)) + return false; + return true; + } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java index fbee8afb064..a767873f698 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/CProjectSourceContainer.java @@ -43,7 +43,7 @@ import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer; * A project in the workspace. Source is searched for in the root project * folder and all folders within the project recursively. Optionally, * referenced projects may be searched as well. - * + * * Source elements returned from <code>findSourceElements(...)</code> are instances of * <code>IFile</code>. * <p> @@ -57,9 +57,8 @@ public class CProjectSourceContainer extends CompositeSourceContainer { * Unique identifier for the project source container type * (value <code>org.eclipse.cdt.debug.core.containerType.project</code>). */ - public static final String TYPE_ID = - CDebugCorePlugin.getUniqueIdentifier() + ".containerType.project"; //$NON-NLS-1$ - private final IProject fOwnProject; // Project assigned to this container at construction time. + public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.project"; //$NON-NLS-1$ + private final IProject fOwnProject; // Project assigned to this container at construction time. private IProject fProject; private boolean fSearchReferencedProjects; private URI fRootURI; @@ -68,7 +67,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /** * Constructs a project source container. - * + * * @param project the project to search for source in * @param referenced whether referenced projects should be considered */ @@ -80,7 +79,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /** * Returns the project this source container references. - * + * * @return the project this source container references */ public IProject getProject() { @@ -121,11 +120,11 @@ public class CProjectSourceContainer extends CompositeSourceContainer { ArrayList<Object> sources = new ArrayList<Object>(); - // An IllegalArgumentException is thrown from the "getFile" method - // if the path created by appending the file name to the container + // An IllegalArgumentException is thrown from the "getFile" method + // if the path created by appending the file name to the container // path doesn't conform with Eclipse resource restrictions. - // To prevent the interruption of the search procedure we check - // if the path is valid before passing it to "getFile". + // To prevent the interruption of the search procedure we check + // if the path is valid before passing it to "getFile". if (validateFile(name)) { IFile file = fProject.getFile(new Path(name)); if (file.exists()) { @@ -147,12 +146,12 @@ public class CProjectSourceContainer extends CompositeSourceContainer { } } else if (files.length > 0) { sources.add(files[0]); - } + } } } } - // Check sub-folders + // Check sub-folders if ((isFindDuplicates() && true) || (sources.isEmpty() && true)) { ISourceContainer[] containers = getSourceContainers(); for (int i = 0; i < containers.length; i++) { @@ -168,18 +167,18 @@ public class CProjectSourceContainer extends CompositeSourceContainer { break; } } - } - + } + if (sources.isEmpty()) return EMPTY; return sources.toArray(); } - + /* (non-Javadoc) * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainer#getName() */ @Override - public String getName() { + public String getName() { return fProject != null ? fProject.getName() : InternalSourceLookupMessages.CProjectSourceContainer_0; } @@ -191,10 +190,10 @@ public class CProjectSourceContainer extends CompositeSourceContainer { if (obj != null && obj instanceof CProjectSourceContainer) { CProjectSourceContainer loc = (CProjectSourceContainer) obj; return fProject == null ? loc.fProject == null : fProject.equals(loc.fProject); - } + } return false; - } - + } + /* (non-Javadoc) * @see java.lang.Object#hashCode() */ @@ -229,7 +228,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { } } return containers.toArray(new ISourceContainer[containers.size()]); - } + } return createFolderSourceContainers(fProject); } return new ISourceContainer[0]; @@ -246,13 +245,13 @@ public class CProjectSourceContainer extends CompositeSourceContainer { ISourceContainer[] containers = list.toArray(new ISourceContainer[list.size()]); for (ISourceContainer container : containers) { container.init(getDirector()); - } + } return containers; } /** - * Validates the given string as a path for a file in this container. - * + * Validates the given string as a path for a file in this container. + * * @param name path name */ private boolean validateFile(String name) { @@ -265,7 +264,7 @@ public class CProjectSourceContainer extends CompositeSourceContainer { /** * Returns whether referenced projects are considered. - * + * * @return whether referenced projects are considered */ public boolean isSearchReferencedProjects() { diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java index 65b5fe1a06c..e8219007772 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocation.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; /** - * + * * A source location defines the location of a repository * of source code. A source location is capable of retrieving * source elements. @@ -25,56 +25,55 @@ import org.eclipse.core.runtime.IAdaptable; * For example, a source location could be a project, zip/archive * file, or a directory in the file system. * </p> - * + * * @since Sep 23, 2002 */ -public interface ICSourceLocation extends IAdaptable -{ +public interface ICSourceLocation extends IAdaptable { /** * Returns an object representing the source code * for a file with the specified name, or <code>null</code> - * if none could be found. The source element + * if none could be found. The source element * returned is implementation specific - for example, a * resource, a local file, a zip file entry, etc. - * + * * @param name the name of the object for which source is being searched for - * + * * @return source element * @exception CoreException if an exception occurs while searching for the specified source element */ - Object findSourceElement( String name ) throws CoreException; + Object findSourceElement(String name) throws CoreException; /** * Returns a memento for this source location from which this * source location can be reconstructed. - * + * * @return a memento for this source location * @exception CoreException if unable to create a memento */ String getMemento() throws CoreException; - + /** * Initializes this source location from the given memento. - * + * * @param memento a memento generated by this source location * @exception CoreException if unable to initialize this source * location */ - void initializeFrom( String memento ) throws CoreException; + void initializeFrom(String memento) throws CoreException; /** * Returns whether to search for all source elements, or just the first match. - * + * * @return whether to search for all source elements, or just the first match */ boolean searchForDuplicateFiles(); /** * Sets the value of the 'search for duplicate source files' flag. - * + * * @param search - a value to set */ - void setSearchForDuplicateFiles( boolean search ); + void setSearchForDuplicateFiles(boolean search); void dispose(); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java index f844b0d319b..6506ab2d22c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ICSourceLocator.java @@ -19,78 +19,77 @@ import org.eclipse.debug.core.model.ISourceLocator; import org.eclipse.debug.core.model.IStackFrame; /** - * - * A C/C++ extension of <code>ISourceLocator</code>. + * + * A C/C++ extension of <code>ISourceLocator</code>. * Provides constants and methods to manage different source modes. - * + * * @since Aug 19, 2002 */ -public interface ICSourceLocator extends ISourceLocator -{ +public interface ICSourceLocator extends ISourceLocator { /** * Returns the project this source locator is associated with or <code>null</code>. - * + * * @return project this source locator is associated with or <code>null</code> */ IProject getProject(); /** - * Returns the line number of the instruction pointer in the specified - * stack frame that corresponds to a line in an associated source element, + * Returns the line number of the instruction pointer in the specified + * stack frame that corresponds to a line in an associated source element, * or -1 if line number information is unavailable. - * + * * @param frameInfo the frame data - * @return line number of instruction pointer in this stack frame, + * @return line number of instruction pointer in this stack frame, * or -1 if line number information is unavailable */ - int getLineNumber( IStackFrame stackFrame ); + int getLineNumber(IStackFrame stackFrame); /** * Returns the source locations of this locator. - * + * * @return the source locations of this locator */ ICSourceLocation[] getSourceLocations(); - + /** * Sets the source locations of this locator. - * + * * @param location - an array of source locations */ - void setSourceLocations( ICSourceLocation[] locations ); + void setSourceLocations(ICSourceLocation[] locations); /** * Returns whether this locator is able to locate the given resource. - * + * * @param resource the resource to locate * @return whether this locator is able to locate the given resource */ - boolean contains( IResource resource ); - + boolean contains(IResource resource); + /** * Returns an object representing the source code * for a type with the specified name, or <code>null</code> - * if none could be found. The source element + * if none could be found. The source element * returned is implementation specific - for example, a * resource, a local file, a zip file entry, etc. - * + * * @param name the name of the object for which source is being searched for - * + * * @return source element */ - Object findSourceElement( String fileName ); + Object findSourceElement(String fileName); /** * Returns whether to search for all source elements, or just the first match. - * + * * @return whether to search for all source elements, or just the first match */ boolean searchForDuplicateFiles(); /** * Sets the value of the 'search for duplicate source files' flag. - * + * * @param search - a value to set */ - void setSearchForDuplicateFiles( boolean search ); + void setSearchForDuplicateFiles(boolean search); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IDirectorySourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IDirectorySourceLocation.java index 36244a230ac..f60faeb101c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IDirectorySourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IDirectorySourceLocation.java @@ -16,13 +16,12 @@ package org.eclipse.cdt.debug.core.sourcelookup; import org.eclipse.core.runtime.IPath; /** - * + * * Enter type comment. - * + * * @since Dec 24, 2002 */ -public interface IDirectorySourceLocation extends ICSourceLocation -{ +public interface IDirectorySourceLocation extends ICSourceLocation { IPath getDirectory(); IPath getAssociation(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IMappingSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IMappingSourceContainer.java index 2f75ef54aee..bed577d2647 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IMappingSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IMappingSourceContainer.java @@ -25,7 +25,7 @@ public interface IMappingSourceContainer extends ISourceContainer { /** * Returns path to the file as it appears in the debug information generated by the C/C++ * compiler. - * @param sourceName absolute filesystem path to a source or header file. + * @param sourceName absolute filesystem path to a source or header file. * @return path to the file as it appears in the debug information generated by the compiler. */ public IPath getCompilationPath(String sourceName); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IProjectSourceLocation.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IProjectSourceLocation.java index 49f6b5684d8..dea38e5b124 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IProjectSourceLocation.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/IProjectSourceLocation.java @@ -16,13 +16,12 @@ package org.eclipse.cdt.debug.core.sourcelookup; import org.eclipse.core.resources.IProject; /** - * + * * Enter type comment. - * + * * @since Dec 24, 2002 */ -public interface IProjectSourceLocation extends ICSourceLocation -{ +public interface IProjectSourceLocation extends ICSourceLocation { IProject getProject(); boolean isGeneric(); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ISourceLookupChangeListener.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ISourceLookupChangeListener.java index afc8ac12459..9576db9b92c 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ISourceLookupChangeListener.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ISourceLookupChangeListener.java @@ -11,17 +11,17 @@ * Contributors: * QNX Software Systems - Initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.debug.core.sourcelookup; +package org.eclipse.cdt.debug.core.sourcelookup; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; - /** - * A source lookup change listener is notified of changes in the source lookup path. - */ +/** +* A source lookup change listener is notified of changes in the source lookup path. +*/ public interface ISourceLookupChangeListener { /** * Notification that the source lookup containers have changed. */ - public void sourceContainersChanged( ISourceLookupDirector director ); + public void sourceContainersChanged(ISourceLookupDirector director); } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java index ee15bacbbd0..4970a011730 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/MappingSourceContainer.java @@ -12,7 +12,7 @@ * QNX Software Systems - Initial API and implementation * Sergey Prigogin (Google) *******************************************************************************/ -package org.eclipse.cdt.debug.core.sourcelookup; +package org.eclipse.cdt.debug.core.sourcelookup; import java.util.ArrayList; import java.util.Arrays; @@ -30,7 +30,7 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourceContainerType; import org.eclipse.debug.core.sourcelookup.containers.AbstractSourceContainer; - + /** * The source container for path mappings. */ @@ -39,14 +39,14 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I * Unique identifier for the mapping source container type * (value <code>org.eclipse.cdt.debug.core.containerType.mapping</code>). */ - public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapping"; //$NON-NLS-1$ + public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.mapping"; //$NON-NLS-1$ private String fName; private ArrayList<MapEntrySourceContainer> fContainers; private boolean fIsMappingWithBackendEnabled = true; - /** - * Constructor for MappingSourceContainer. + /** + * Constructor for MappingSourceContainer. */ public MappingSourceContainer(String name) { fName = name; @@ -106,16 +106,15 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I if (objects.length == 1) { return objects; } - return new Object[]{ objects[0] }; + return new Object[] { objects[0] }; } } } catch (CoreException e) { if (single == null) { single = e; } else if (multiStatus == null) { - multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), - DebugPlugin.INTERNAL_ERROR, new IStatus[] { single.getStatus() }, - SourceLookupMessages.MappingSourceContainer_0, null); + multiStatus = new MultiStatus(DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, + new IStatus[] { single.getStatus() }, SourceLookupMessages.MappingSourceContainer_0, null); multiStatus.add(e.getStatus()); } else { multiStatus.add(e.getStatus()); @@ -187,7 +186,7 @@ public class MappingSourceContainer extends AbstractSourceContainer implements I } return copy; } - + public void setName(String name) { fName = name; } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java index b61b8fc0f6e..5edaffcacd9 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/ProgramRelativePathSourceContainer.java @@ -34,16 +34,16 @@ import org.eclipse.debug.core.ILaunchConfiguration; * A source container that converts relative paths to absolute ones using the * program (executable) location as the reference point. The conversion is * successful only if such a file actually exists. - * + * * @since 7.0 */ -public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ +public class ProgramRelativePathSourceContainer extends AbstractSourceContainer { /** * Unique identifier for the relative path source container type * (value <code>org.eclipse.cdt.debug.core.containerType.programRelativePath</code>). */ public static final String TYPE_ID = CDebugCorePlugin.getUniqueIdentifier() + ".containerType.programRelativePath"; //$NON-NLS-1$ - + /** * The program's path. */ @@ -54,7 +54,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ */ public ProgramRelativePathSourceContainer() { } - + /** * Special constructor used when trying to locate a source file without a * launch or launch configuration context, but when a Binary context is @@ -66,7 +66,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ * launch/launch-configuration context, it can explicitly create an instance * using this constructor and call our {@link #findSourceElements(String)} * method. - * + * * @param program * the executable context. Calling this with null is equivalent * to calling the default constructor. @@ -76,13 +76,13 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ fProgramPath = program.getPath(); } } - + /** * If [sourceName] is a relative path, and applying it to the location of * the program (executable) produces an absolute path that points to an * actual file, then we return a LocalFileStorage for that file. Otherwise * we return an empty array. We always return at most one element. - * + * * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String) */ @Override @@ -90,13 +90,13 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ if (sourceName == null) { return new Object[0]; } - + // check if source path is a relative path IPath sourcePath = new Path(sourceName); if (sourcePath.isAbsolute()) { return new Object[0]; } - + // get program (executable) absolute path IPath programPath = getProgramLocation(); if (programPath == Path.EMPTY) { @@ -104,7 +104,7 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ } // remove the name of the program from the program path - programPath = programPath.removeLastSegments(1); + programPath = programPath.removeLastSegments(1); // append the relative source path to the absolute location of the program sourcePath = programPath.append(sourcePath); @@ -145,25 +145,28 @@ public class ProgramRelativePathSourceContainer extends AbstractSourceContainer{ if (configuration == null) { return fProgramPath; // return empty path } - + // Get current project. Unlike CDI, DSF supports debugging // executables that are not in an Eclipse project, so this may be // null or empty for a DSF session. See bugzilla 304433 and 344408. ICProject project = null; - String projectName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null); + String projectName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, + (String) null); if (projectName != null && projectName.length() != 0) { project = CoreModel.getDefault().getCModel().getCProject(projectName); if (project == null || !project.exists()) { return fProgramPath; // return empty path } } - + // get program name - String programName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, (String)null); + String programName = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, + (String) null); if (programName == null) { return fProgramPath; // return empty path } - programName = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(programName); + programName = VariablesPlugin.getDefault().getStringVariableManager() + .performStringSubstitution(programName); // get executable file IFile exeFile = null; diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/SourceLookupFactory.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/SourceLookupFactory.java index 35023e4ccb1..d112f7d3ae7 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/SourceLookupFactory.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/sourcelookup/SourceLookupFactory.java @@ -23,28 +23,24 @@ import org.eclipse.core.runtime.IPath; /** * Enter type comment. - * + * * @since Jul 14, 2003 */ -public class SourceLookupFactory -{ - public static IProjectSourceLocation createProjectSourceLocation( IProject project ) - { - return new CProjectSourceLocation( project ); +public class SourceLookupFactory { + public static IProjectSourceLocation createProjectSourceLocation(IProject project) { + return new CProjectSourceLocation(project); } - public static IProjectSourceLocation createProjectSourceLocation( IProject project, boolean generated ) - { - return new CProjectSourceLocation( project, generated ); + public static IProjectSourceLocation createProjectSourceLocation(IProject project, boolean generated) { + return new CProjectSourceLocation(project, generated); } - public static IDirectorySourceLocation createDirectorySourceLocation( IPath directory, IPath association, boolean searchSubfolders ) - { - return new CDirectorySourceLocation( directory, association, searchSubfolders ); + public static IDirectorySourceLocation createDirectorySourceLocation(IPath directory, IPath association, + boolean searchSubfolders) { + return new CDirectorySourceLocation(directory, association, searchSubfolders); } - public static ICSourceLocator createSourceLocator( IProject project ) - { - return new CSourceManager( new CSourceLocator( project ) ); + public static ICSourceLocator createSourceLocator(IProject project) { + return new CSourceManager(new CSourceLocator(project)); } } |