mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 19:25:38 +02:00
Code Issues Wiki Activity

Bug 303968, apply Marc's patch to move the remainder of the UI from gdb to dsf plug-ins.

Browse source
This commit is contained in:
Ken Ryall 2010-05-25 18:48:54 +00:00
parent 7038788c04
commit d279184e5e
10 changed files with 46 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/watch_exp.gif
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 125 B

5
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
View file

@ -30,11 +30,6 @@ tracepoints.property.actions=Actions
tracepoints.action.page.label=Actions
tracepointActionsPrefPage.name=Tracepoint Actions
popup.addExpression.label=Add Watch Expression...
popup.resumeAtLine.label=Resume At Li&ne
popup.moveToLine.label=&Move To Line
popup.runToLine.label=Run To &Line
# Tracepoints
view.traceControl.name=Trace Control
toolbar.startTracing.name=Start Tracing

78
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
View file

@ -446,84 +446,6 @@
id="org.eclipse.cdt.dsf.gdb.ui.preferences.TracepointActionsPreferencePage"
name="%tracepointActionsPrefPage.name">
</page>
</extension>
<extension
point="org.eclipse.ui.popupMenus">
<viewerContribution
id="org.eclipse.cdt.debug.ui.editor.actions.popup"
targetID="#CEditorContext">
<visibility>
<and>
<systemProperty
name="org.eclipse.cdt.dsf.gdb.ui.debuggerActive"
value="true">
</systemProperty>
<objectClass
name="org.eclipse.jface.text.ITextSelection">
</objectClass>
</and>
</visibility>
<action
class="org.eclipse.cdt.debug.internal.ui.actions.AddExpressionEditorActionDelegate"
helpContextId="add_expression_action_context"
icon="icons/full/obj16/watch_exp.gif"
id="org.eclipse.cdt.dsf.gdb.ui.actions.popup.AddWathExpression"
label="%popup.addExpression.label"
menubarPath="additions">
</action>
<action
class="org.eclipse.cdt.debug.internal.ui.actions.ResumeAtLineActionDelegate"
helpContextId="resume_at_line_action_context"
icon="icons/full/obj16/resume_at_line.gif"
id="org.eclipse.cdt.dsf.gdb.ui.actions.popup.ResumeAtLine"
label="%popup.resumeAtLine.label"
menubarPath="additions">
</action>
<action
class="org.eclipse.cdt.debug.internal.ui.actions.MoveToLineActionDelegate"
helpContextId="move_to_line_action_context"
icon="icons/full/obj16/move_to_line.gif"
id="org.eclipse.cdt.dsf.gdb.ui.actions.popup.MoveToLine"
label="%popup.moveToLine.label"
menubarPath="additions">
</action>
<action
class="org.eclipse.debug.ui.actions.RunToLineActionDelegate"
definitionId="org.eclipse.debug.ui.commands.RunToLine"
helpContextId="run_to_line_action_context"
id="org.eclipse.cdt.dsf.gdb.ui.actions.popup.RunToLine"
label="%popup.runToLine.label"
menubarPath="additions">
</action>
</viewerContribution>
<viewerContribution
id="org.eclipse.cdt.debug.ui.disassembly.actions.popup"
targetID="#DisassemblyPartContext">
<action
class="org.eclipse.cdt.debug.internal.ui.actions.ResumeAtLineActionDelegate"
helpContextId="resume_at_line_action_context"
icon="icons/full/obj16/resume_at_line.gif"
id="org.eclipse.cdt.dsf.gdb.ui.actions.popup.ResumeAtLine"
label="%popup.resumeAtLine.label"
menubarPath="additions">
</action>
<action
class="org.eclipse.cdt.debug.internal.ui.actions.MoveToLineActionDelegate"
helpContextId="move_to_line_action_context"
icon="icons/full/obj16/move_to_line.gif"
id="org.eclipse.cdt.dsf.gdb.ui.actions.popup.MoveToLine"
label="%popup.moveToLine.label"
menubarPath="additions">
</action>
<action
class="org.eclipse.debug.ui.actions.RunToLineActionDelegate"
definitionId="org.eclipse.debug.ui.commands.RunToLine"
helpContextId="run_to_line_action_context"
id="org.eclipse.cdt.dsf.gdb.ui.actions.popup.RunToLine"
label="%popup.runToLine.label"
menubarPath="additions">
</action>
</viewerContribution>
</extension>
<extension
point="org.eclipse.ui.activities">

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java
View file

@ -55,8 +55,6 @@ public class GdbUIPlugin extends AbstractUIPlugin {
super.start(context);
plugin = this;
EvaluationContextManager.startup();
fTracingConsoleManager = new TracingConsoleManager();
fTracingConsoleManager.startup();
}

0
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/move_to_line.gif → dsf/org.eclipse.cdt.dsf.ui/icons/move_to_line.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 140 B

After

Width:  |  Height:  |  Size: 140 B

0
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/resume_at_line.gif → dsf/org.eclipse.cdt.dsf.ui/icons/resume_at_line.gif
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 145 B

After

Width:  |  Height:  |  Size: 145 B

6
dsf/org.eclipse.cdt.dsf.ui/plugin.properties
View file

@ -47,6 +47,12 @@ action.refreshAll.name=Refresh Debug Views
action.refresh.label=Refresh
popup.addExpression.label=Add Watch Expression...
popup.resumeAtLine.label=Resume At Li&ne
popup.moveToLine.label=&Move To Line
popup.runToLine.label=Run To &Line
# Preferences
debugCallStack = Debug Call Stack

32
dsf/org.eclipse.cdt.dsf.ui/plugin.xml
View file

@ -729,6 +729,38 @@
</factory>
</extension>
<extension
point="org.eclipse.ui.popupMenus">
<viewerContribution
id="org.eclipse.cdt.debug.ui.disassembly.actions.popup"
targetID="#DisassemblyPartContext">
<action
class="org.eclipse.cdt.debug.internal.ui.actions.ResumeAtLineActionDelegate"
helpContextId="resume_at_line_action_context"
icon="icons/resume_at_line.gif"
id="org.eclipse.cdt.dsf.ui.actions.popup.ResumeAtLine"
label="%popup.resumeAtLine.label"
menubarPath="additions">
</action>
<action
class="org.eclipse.cdt.debug.internal.ui.actions.MoveToLineActionDelegate"
helpContextId="move_to_line_action_context"
icon="icons/move_to_line.gif"
id="org.eclipse.cdt.dsf.ui.actions.popup.MoveToLine"
label="%popup.moveToLine.label"
menubarPath="additions">
</action>
<action
class="org.eclipse.debug.ui.actions.RunToLineActionDelegate"
definitionId="org.eclipse.debug.ui.commands.RunToLine"
helpContextId="run_to_line_action_context"
id="org.eclipse.cdt.dsf.ui.actions.popup.RunToLine"
label="%popup.runToLine.label"
menubarPath="additions">
</action>
</viewerContribution>
</extension>
<extension point="org.eclipse.debug.ui.toggleBreakpointsTargetFactories">
<toggleTargetFactory
id="org.eclipse.cdt.dsf.ui.ToggleBreakpointsTargetFactory"

8
dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/EvaluationContextManager.java → dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java
View file

@ -8,12 +8,14 @@
* Contributors:
* QNX Software Systems - Initial API and implementation
* Ericsson - DSF-GDB version
* Nokia - Made generic to DSF
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.internal.ui;
package org.eclipse.cdt.dsf.debug.internal.ui;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.cdt.dsf.ui.viewmodel.datamodel.IDMVMContext;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.jface.viewers.ISelection;
@ -40,8 +42,8 @@ import org.eclipse.ui.PlatformUI;
*/
public class EvaluationContextManager implements IWindowListener, IPageListener, ISelectionListener, IPartListener2 {
// Must use a different ID than for CDI
private final static String DEBUGGER_ACTIVE = GdbUIPlugin.getUniqueIdentifier() + ".debuggerActive"; //$NON-NLS-1$
// Must use the same ID than the base CDT uses since we want to enable actions that are registered by base CDT.
private final static String DEBUGGER_ACTIVE = CDebugUIPlugin.getUniqueIdentifier() + ".debuggerActive"; //$NON-NLS-1$
protected static EvaluationContextManager fgManager;

3
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/internal/ui/DsfUIPlugin.java
View file

@ -12,6 +12,7 @@ package org.eclipse.cdt.dsf.internal.ui;
import org.eclipse.cdt.dsf.concurrent.IDsfStatusConstants;
import org.eclipse.cdt.dsf.debug.internal.ui.CSourceNotFoundDescriptionFactory;
import org.eclipse.cdt.dsf.debug.internal.ui.EvaluationContextManager;
import org.eclipse.cdt.dsf.debug.internal.ui.disassembly.DisassemblyBackendDsfFactory;
import org.eclipse.cdt.dsf.debug.internal.ui.disassembly.model.SourceDocumentProvider;
import org.eclipse.cdt.dsf.debug.service.IStack.IFrameDMContext;
@ -61,6 +62,8 @@ public class DsfUIPlugin extends AbstractUIPlugin {
fSourceDocumentProvider = new SourceDocumentProvider();
EvaluationContextManager.startup();
// Register the DSF backend for our disassembly view (the CDT debug UI
// plugin registers the CDI one)
Platform.getAdapterManager().registerAdapters(new DisassemblyBackendDsfFactory(), IDMVMContext.class);