* Note: Before a breakpoint created using this method can be used, the * client must first create a marker and register the breakpoint. The former @@ -371,9 +386,9 @@ public class CDIDebugModel { } /** - * Creates a breakpoint without associated marker. + * Creates a line tracepoint without associated marker. *
- * Note: Before a breakpoint created using this method can be used, the
+ * 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)}.
@@ -384,6 +399,31 @@ public class CDIDebugModel {
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
+ * 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.
*
@@ -562,7 +602,7 @@ public class CDIDebugModel {
}
/**
- * Creates a breakpoint without associated marker.
+ * Creates an address breakpoint without associated marker.
*
* Note: Before a breakpoint created using this method can be used, the
* client must first create a marker and register the breakpoint. The former
@@ -588,9 +628,9 @@ public class CDIDebugModel {
}
/**
- * Creates a breakpoint without associated marker.
+ * Creates an address tracepoint without associated marker.
*
- * Note: Before a breakpoint created using this method can be used, the
+ * 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)}.
@@ -601,6 +641,33 @@ public class CDIDebugModel {
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
+ * 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.
*
@@ -641,9 +708,9 @@ public class CDIDebugModel {
}
/**
- * Creates a breakpoint without associated marker.
+ * Creates a watchpoint without associated marker.
*
- * Note: Before a breakpoint created using this method can be used, the
+ * 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)}.
@@ -1041,7 +1108,7 @@ public class CDIDebugModel {
}
/**
- * Creates a breakpoint without associated marker.
+ * Creates a function breakpoint without associated marker.
*
* Note: Before a breakpoint created using this method can be used, the
* client must first create a marker and register the breakpoint. The former
@@ -1108,9 +1175,9 @@ public class CDIDebugModel {
}
/**
- * Creates a breakpoint without associated marker.
+ * Creates a function tracepoint without associated marker.
*
- * Note: Before a breakpoint created using this method can be used, the
+ * 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)}.
@@ -1121,6 +1188,33 @@ public class CDIDebugModel {
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
+ * 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.
*
@@ -1443,9 +1537,9 @@ public class CDIDebugModel {
}
/**
- * Creates a breakpoint without associated marker.
+ * Creates an event breakpoint without associated marker.
*
- * Note: Before a breakpoint created using this method can be used, the
+ * 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)}.
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 f88761ee33a..08100c0aa2e 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 QNX Software Systems and others.
+ * Copyright (c) 2000, 2014 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
* QNX Software Systems - Initial API and implementation
* Freescale Semiconductor - Address watchpoints, https://bugs.eclipse.org/bugs/show_bug.cgi?id=118299
* Patrick Chuong (Texas Instruments) - Update CDT ToggleBreakpointTargetFactory enablement (340177)
+ * Marc Khouzam (Ericsson) - Support for dynamic printf (400628)
*******************************************************************************/
package org.eclipse.cdt.debug.core;
@@ -35,6 +36,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointType;
+import org.eclipse.cdt.debug.core.model.ICDynamicPrintf;
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
import org.eclipse.cdt.debug.core.model.ICValue;
@@ -331,7 +333,7 @@ public class CDebugUtils {
if (breakpoint instanceof ICWatchpoint) {
return getWatchpointText((ICWatchpoint)breakpoint, qualified);
}
- // this allow to create new breakpoint without implemention one the interfaces above and still see a label
+ // 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);
if (message != null)
return message.toString();
@@ -342,6 +344,9 @@ public class CDebugUtils {
StringBuffer label = new StringBuffer();
appendSourceName(breakpoint, label, qualified);
appendLineNumber(breakpoint, label);
+ if (breakpoint instanceof ICDynamicPrintf) {
+ appendPrintfString((ICDynamicPrintf)breakpoint, label);
+ }
appendBreakpointType(breakpoint, label);
appendIgnoreCount(breakpoint, label);
appendCondition(breakpoint, label);
@@ -367,6 +372,9 @@ public class CDebugUtils {
StringBuffer label = new StringBuffer();
appendSourceName(breakpoint, label, qualified);
appendAddress(breakpoint, label);
+ if (breakpoint instanceof ICDynamicPrintf) {
+ appendPrintfString((ICDynamicPrintf)breakpoint, label);
+ }
appendBreakpointType(breakpoint, label);
appendIgnoreCount(breakpoint, label);
appendCondition(breakpoint, label);
@@ -377,6 +385,9 @@ public class CDebugUtils {
StringBuffer label = new StringBuffer();
appendSourceName(breakpoint, label, qualified);
appendFunction(breakpoint, label);
+ if (breakpoint instanceof ICDynamicPrintf) {
+ appendPrintfString((ICDynamicPrintf)breakpoint, label);
+ }
appendBreakpointType(breakpoint, label);
appendIgnoreCount(breakpoint, label);
appendCondition(breakpoint, label);
@@ -421,6 +432,17 @@ public class CDebugUtils {
return label;
}
+ /**
+ * @since 7.5
+ */
+ protected static void appendPrintfString(ICDynamicPrintf dprintf, StringBuffer buffer) throws CoreException {
+ 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$
+ }
+ }
+
protected static StringBuffer appendIgnoreCount(ICBreakpoint breakpoint, StringBuffer label) throws CoreException {
int ignoreCount = breakpoint.getIgnoreCount();
if (ignoreCount > 0) {
@@ -762,4 +784,4 @@ public class CDebugUtils {
String customModel = System.getProperty(ICDebugConstants.PREF_TOGGLE_BREAKPOINT_MODEL_IDENTIFIER, null);
return customModel != null && Boolean.valueOf(customModel);
}
-}
\ No newline at end of file
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
index 99fa5008e58..504e9b49e67 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/DebugCoreMessages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2003, 2010 QNX Software Systems and others.
+# Copyright (c) 2003, 2014 QNX Software Systems and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
# Contributors:
# QNX Software Systems - initial API and implementation
# Freescale Semiconductor - Address watchpoints, https://bugs.eclipse.org/bugs/show_bug.cgi?id=118299
+# Marc Khouzam (Ericsson) - Support for dynamic printf (400628)
###############################################################################
CDebugCorePlugin.0=No such debugger
CDebugUtils.0=[line: {0}]
@@ -19,6 +20,7 @@ CDebugUtils.5=[expression: ''{0}'']
CDebugUtils.6=[memory space: {0}]
CDebugUtils.7=[units: {0}]
CDebugUtils.8=[type: {0}]
+CDebugUtils.printfString=[{0}]
CDebugUtils.Regular=Regular
CDebugUtils.Hardware=Hardware
CDebugUtils.Temporary=Temporary
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
new file mode 100644
index 00000000000..6e6e9d4f1f7
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICDynamicPrintf.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Ericsson and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc Khouzam (Ericsson) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.debug.core.model;
+
+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_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_FUNCTION_DYNAMICPRINTF_MARKER = "org.eclipse.cdt.debug.core.cFunctionDynamicPrintfMarker"; //$NON-NLS-1$
+
+ /**
+ * Dynamic printf attribute storing the string to be printed (value
+ * "org.eclipse.cdt.debug.core.printf_string"). This attribute
+ * is a String.
+ */
+ 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
+ */
+ public String getPrintfString() throws CoreException;
+
+ /**
+ * 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
+ */
+ public void setPrintfString(String str) throws CoreException;
+}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
index a2304679022..1cf08dc458a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2010 QNX Software Systems and others.
+ * Copyright (c) 2004, 2014 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,6 +13,7 @@
* Freescale Semiconductor - Address watchpoints, https://bugs.eclipse.org/bugs/show_bug.cgi?id=118299
* QNX Software Systems - catchpoints - bug 226689
* James Blackburn (Broadcom) - bug 314865
+ * Marc Khouzam (Ericsson) - Support for dynamic printf (400628)
*******************************************************************************/
package org.eclipse.cdt.debug.internal.core;
@@ -68,6 +69,7 @@ import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointFilterExtension;
import org.eclipse.cdt.debug.core.model.ICBreakpointType;
import org.eclipse.cdt.debug.core.model.ICDebugTarget;
+import org.eclipse.cdt.debug.core.model.ICDynamicPrintf;
import org.eclipse.cdt.debug.core.model.ICEventBreakpoint;
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
@@ -877,8 +879,13 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
breakpointType = ((ICBreakpointType) icbreakpoint).getType();
}
if ( icbreakpoint instanceof ICTracepoint) {
- ICTracepoint breakpoint = (ICTracepoint)icbreakpoint;
- IMarker marker = BreakpointProblems.reportUnsupportedTracepoint(breakpoint, getDebugTarget().getName(), getDebugTarget().getInternalID());
+ ICTracepoint tracepoint = (ICTracepoint)icbreakpoint;
+ IMarker marker = BreakpointProblems.reportUnsupportedTracepoint(tracepoint, getDebugTarget().getName(), getDebugTarget().getInternalID());
+ if (marker != null)
+ fBreakpointProblems.add(marker);
+ } else if ( icbreakpoint instanceof ICDynamicPrintf) {
+ ICDynamicPrintf dprintf = (ICDynamicPrintf)icbreakpoint;
+ IMarker marker = BreakpointProblems.reportUnsupportedDynamicPrintf(dprintf, getDebugTarget().getName(), getDebugTarget().getInternalID());
if (marker != null)
fBreakpointProblems.add(marker);
}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractDynamicPrintf.java
new file mode 100644
index 00000000000..2123bf92698
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractDynamicPrintf.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Ericsson and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marc Khouzam (Ericsson) - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.debug.internal.core.breakpoints;
+
+import java.util.Map;
+
+import org.eclipse.cdt.debug.core.model.ICDynamicPrintf;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * Base class for different types of location DynamicPrintf.
+ *
+ * @since 7.5
+ */
+public abstract class AbstractDynamicPrintf extends AbstractLineBreakpoint implements ICDynamicPrintf {
+
+ public AbstractDynamicPrintf() {
+ super();
+ }
+
+ public AbstractDynamicPrintf( IResource resource, Map
IToggleBreakpointsTargetExtension2 adapter.
+ * + * Clients may instantiate this class. + *
+ * @since 7.4 + * @see org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate + */ +public class CAddDynamicPrintfInteractiveRulerAction extends Action implements IUpdate { + + private IWorkbenchPart fPart; + private IDocument fDocument; + private IVerticalRulerInfo fRulerInfo; + + private IToggleBreakpointsTargetCExtension fDynamicPrintfBreakpointsTarget; + + /** + * Constructs a new action to toggle a dynamic printf in the given + * part containing the given document and ruler. + * + * @param part the part in which to toggle the dynamic printf - provides + * anIToggleBreakpointsTarget adapter
+ * @param document the document breakpoints are being set in or
+ * null when the document should be derived from the given part
+ * @param rulerInfo specifies location the user has double-clicked
+ */
+ public CAddDynamicPrintfInteractiveRulerAction(IWorkbenchPart part, IDocument document, IVerticalRulerInfo rulerInfo) {
+ super(ActionMessages.getString("CAddDynamicPrintfInteractiveRulerAction_label")); //$NON-NLS-1$
+ fPart = part;
+ fDocument = document;
+ fRulerInfo = rulerInfo;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.action.IAction#run()
+ */
+ public void run() {
+ IDocument document= getDocument();
+ if (document == null) {
+ return;
+ }
+
+ int line = fRulerInfo.getLineOfLastMouseButtonActivity();
+
+ // Test if line is valid
+ if (line == -1)
+ return;
+
+ try {
+ if (fDynamicPrintfBreakpointsTarget != null) {
+ ITextSelection selection = getTextSelection(document, line);
+ if (fDynamicPrintfBreakpointsTarget.canCreateLineBreakpointsInteractive(fPart, selection)) {
+ fDynamicPrintfBreakpointsTarget.createLineBreakpointsInteractive(fPart, selection);
+ }
+ }
+ } catch (BadLocationException e) {
+ reportException(e);
+ } catch (CoreException e) {
+ reportException(e);
+ }
+ }
+
+ /**
+ * Report an error to the user.
+ *
+ * @param e underlying exception
+ */
+ private void reportException(Exception e) {
+ IStatus status= new Status(IStatus.ERROR, CDebugUIPlugin.PLUGIN_ID, "Error creating dynamic printf: ", e); //$NON-NLS-1$
+ ErrorDialog.openError(
+ fPart.getSite().getShell(),
+ ActionMessages.getString("CAddBreakpointInteractiveRulerAction_error_title"), //$NON-NLS-1$
+ ActionMessages.getString("CAddDynamicPrintfInteractiveRulerAction_error_message"), //$NON-NLS-1$
+ status);
+ CDebugUIPlugin.log(status);
+ }
+
+ /**
+ * Disposes this action. Clients must call this method when
+ * this action is no longer needed.
+ */
+ public void dispose() {
+ fDocument = null;
+ fPart = null;
+ fRulerInfo = null;
+ }
+
+ /**
+ * Returns the document on which this action operates.
+ *
+ * @return the document or null if none
+ */
+ private IDocument getDocument() {
+ if (fDocument != null)
+ return fDocument;
+
+ if (fPart instanceof ITextEditor) {
+ ITextEditor editor= (ITextEditor)fPart;
+ IDocumentProvider provider = editor.getDocumentProvider();
+ if (provider != null)
+ return provider.getDocument(editor.getEditorInput());
+ }
+
+ IDocument doc = (IDocument) fPart.getAdapter(IDocument.class);
+ if (doc != null) {
+ return doc;
+ }
+
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.texteditor.IUpdate#update()
+ */
+ public void update() {
+ IDocument document= getDocument();
+ if (document != null) {
+ int line = fRulerInfo.getLineOfLastMouseButtonActivity();
+ if (line > -1) {
+ try {
+ ITextSelection selection = getTextSelection(document, line);
+
+ if (fDynamicPrintfBreakpointsTarget == null) {
+ fDynamicPrintfBreakpointsTarget = fetchDynamicPrintfBreakpointsTarget(selection);
+ }
+
+ if (fDynamicPrintfBreakpointsTarget == null) {
+ setEnabled(false);
+ return;
+ }
+ if (fDynamicPrintfBreakpointsTarget.canCreateLineBreakpointsInteractive(fPart, selection)) {
+ setEnabled(true);
+ return;
+ }
+ } catch (BadLocationException e) {
+ reportException(e);
+ }
+ }
+ }
+ setEnabled(false);
+ }
+
+ /**
+ * Determines the text selection for the breakpoint action. If clicking on the ruler inside
+ * the highlighted text, return the text selection for the highlighted text. Otherwise,
+ * return a text selection representing the start of the line.
+ *
+ * @param document The IDocument backing the Editor.
+ * @param line The line clicked on in the ruler.
+ * @return An ITextSelection as described.
+ * @throws BadLocationException If underlying operations throw.
+ */
+ private ITextSelection getTextSelection(IDocument document, int line) throws BadLocationException {
+ IRegion region = document.getLineInformation(line);
+ ITextSelection textSelection = new TextSelection(document, region.getOffset(), 0);
+ ISelectionProvider provider = fPart.getSite().getSelectionProvider();
+ if (provider != null){
+ ISelection selection = provider.getSelection();
+ if (selection instanceof ITextSelection
+ && ((ITextSelection) selection).getStartLine() <= line
+ && ((ITextSelection) selection).getEndLine() >= line) {
+ textSelection = (ITextSelection) selection;
+ }
+ }
+ return textSelection;
+ }
+
+ private IToggleBreakpointsTargetCExtension fetchDynamicPrintfBreakpointsTarget(ITextSelection selection) {
+ if (fDynamicPrintfBreakpointsTarget == null){
+ IExtensionPoint ep = Platform.getExtensionRegistry().getExtensionPoint(IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.EXTENSION_POINT_TOGGLE_BREAKPOINTS_TARGET_FACTORIES);
+ IConfigurationElement[] elements = ep.getConfigurationElements();
+ for (int i= 0; i < elements.length; i++) {
+ String id = elements[i].getAttribute("id"); //$NON-NLS-1$
+ if (id != null && id.equals("org.eclipse.cdt.debug.ui.ToggleCDynamicPrintfTargetFactory")) { //$NON-NLS-1$
+ try{
+ Object obj = elements[i].createExecutableExtension("class"); //$NON-NLS-1$
+ if(obj instanceof IToggleBreakpointsTargetFactory) {
+ IToggleBreakpointsTarget target = ((IToggleBreakpointsTargetFactory)obj).createToggleTarget(ToggleCDynamicPrintfTargetFactory.TOGGLE_C_DYNAMICPRINTF_TARGET_ID);
+ if (target instanceof IToggleBreakpointsTargetCExtension) {
+ fDynamicPrintfBreakpointsTarget = (IToggleBreakpointsTargetCExtension)target;
+ }
+ }
+ } catch (CoreException e){
+ }
+ break;
+ }
+ }
+ }
+ return fDynamicPrintfBreakpointsTarget;
+ }
+}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerActionDelegate.java
new file mode 100644
index 00000000000..6efd0b00164
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerActionDelegate.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2014 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Marc Khouzam - Create class for dynamic printf (Bug 400628)
+ *******************************************************************************/
+package org.eclipse.cdt.debug.internal.ui.actions.breakpoints;
+
+import org.eclipse.cdt.debug.ui.breakpoints.IToggleBreakpointsTargetCExtension;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.text.source.IVerticalRulerInfo;
+import org.eclipse.ui.IActionDelegate2;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+/**
+ * Creates a Dynamic Printf interactively, that is with user input as well as context
+ * information gathered from editor location. This action delegate can be
+ * contributed to an editor with the editorActions extension point.
+ * This action is as a factory that creates another action that performs the
+ * actual breakpoint toggling. The created action acts on the editor's
+ * IToggleBreakpointsTargetCExtension to create the breakpoint.
+ *
+ * This action should be contributed to a vertical ruler context menu via the
+ * popupMenus extension point, by referencing the ruler's context
+ * menu identifier in the targetID attribute.
+ *
+ * <extension point="org.eclipse.ui.popupMenus"> + * <viewerContribution + * targetID="example.rulerContextMenuId" + * id="example.RulerPopupActions"> + * <action + * label="Add Dynamic Printf" + * class="org.eclipse.debug.ui.actions.CAddDynamicPrintfInteractiveRulerActionDelegate" + * menubarPath="additions" + * id="example.rulerContextMenu.createDynamicPrintfAction"> + * </action> + * </viewerContribution> + *+ * + *
+ * Clients may refer to this class as an action delegate in plug-in XML. + *
+ * @see IToggleBreakpointsTargetCExtension + * @since 7.4 + * @noextend This class is not intended to be sub-classed by clients. + * @noinstantiate This class is not intended to be instantiated by clients. + */ +public class CAddDynamicPrintfInteractiveRulerActionDelegate extends AbstractRulerActionDelegate implements IActionDelegate2 { + + private IEditorPart fEditor = null; + private CAddDynamicPrintfInteractiveRulerAction fDelegate = null; + + /* (non-Javadoc) + * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo) + */ + protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { + fDelegate = new CAddDynamicPrintfInteractiveRulerAction(editor, null, rulerInfo); + return fDelegate; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart) + */ + public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) { + if (fEditor != null) { + if (fDelegate != null) { + fDelegate.dispose(); + fDelegate = null; + } + } + fEditor = targetEditor; + super.setActiveEditor(callerAction, targetEditor); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction) + */ + public void init(IAction action) { + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IActionDelegate2#dispose() + */ + public void dispose() { + if (fDelegate != null) { + fDelegate.dispose(); + } + fDelegate = null; + fEditor = null; + } +} diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/Messages.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/Messages.java new file mode 100644 index 00000000000..432af8fa19c --- /dev/null +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/Messages.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Khouzam (Ericsson) - Initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.debug.internal.ui.actions.breakpoints; + + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + + public static String Default_LineDynamicPrintf_String; + public static String Default_FunctionDynamicPrintf_String; + + static { + NLS.initializeMessages(Messages.class.getName(), Messages.class); + } + + private Messages() { + } +} diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/Messages.properties b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/Messages.properties new file mode 100644 index 00000000000..6344323e204 --- /dev/null +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/Messages.properties @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright (c) 2014 Ericsson and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Marc Khouzam (Ericsson) - Initial API and implementation +####################################################################################### + +# We use %d in the below string on purpose to show the user that it is possible +# Don't use %s with an in-line string, as it crashes GDB 7.5 and 7.6 +# http://sourceware.org/bugzilla/show_bug.cgi?id=15433 +Default_LineDynamicPrintf_String="Hit line %d of {0}\\n",{1} +Default_FunctionDynamicPrintf_String="Entered function: {1} of {0}\\n" diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/ToggleCDynamicPrintfTargetFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/ToggleCDynamicPrintfTargetFactory.java new file mode 100644 index 00000000000..4453b778e9e --- /dev/null +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/ToggleCDynamicPrintfTargetFactory.java @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2014 Ericsson and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Marc Khouzam (Ericsson) - initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.debug.internal.ui.actions.breakpoints; + +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.cdt.debug.internal.ui.actions.ActionMessages; +import org.eclipse.cdt.debug.ui.CDebugUIPlugin; +import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget; +import org.eclipse.debug.ui.actions.IToggleBreakpointsTargetFactory; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IWorkbenchPart; + +/** + * Toggle Dynamic Printf target factory for the CEditor. + * + * @since 7.5 + */ +public class ToggleCDynamicPrintfTargetFactory implements IToggleBreakpointsTargetFactory { + + public static String TOGGLE_C_DYNAMICPRINTF_TARGET_ID = CDebugUIPlugin.getUniqueIdentifier() + ".toggleCDynamicPrintfTarget"; //$NON-NLS-1$ + + private static SetToggleCDynamicPrintfTargetFactory
+ * which is used for the editor. We need the id to be the same so that when
+ * the user goes from editor to DSF disassembly view, the choice of breakpoint
+ * targets looks the same and is remembered.
+ * To use the same id though, we must be careful not to have the two factories
+ * return the same id for the same part, or else it may confuse things.
+ * This is why this factory only returns this id for the DSF disassembly part,
+ * leaving ToggleCDynamicPrintfTargetFactory to return the same id
+ * for the editor.
+ */
+ public static final String TOGGLE_C_DYNAMICPRINTF_TARGET_ID = CDebugUIPlugin.PLUGIN_ID + ".toggleCDynamicPrintfTarget"; //$NON-NLS-1$
+
+ private static final Set