From d279184e5e65583ed5748ece2f473d1bd6409835 Mon Sep 17 00:00:00 2001
From: Ken Ryall <ken.ryall@nokia.com>
Date: Tue, 25 May 2010 18:48:54 +0000
Subject: [PATCH] Bug 303968, apply Marc's patch to move the remainder of the
 UI from gdb to dsf plug-ins.

---
 .../icons/full/obj16/watch_exp.gif            | Bin 125 -> 0 bytes
 .../plugin.properties                         |   5 --
 dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml |  78 ------------------
 .../cdt/dsf/gdb/internal/ui/GdbUIPlugin.java  |   2 -
 .../icons}/move_to_line.gif                   | Bin
 .../icons}/resume_at_line.gif                 | Bin
 dsf/org.eclipse.cdt.dsf.ui/plugin.properties  |   6 ++
 dsf/org.eclipse.cdt.dsf.ui/plugin.xml         |  32 +++++++
 .../internal/ui/EvaluationContextManager.java |   8 +-
 .../cdt/dsf/internal/ui/DsfUIPlugin.java      |   3 +
 10 files changed, 46 insertions(+), 88 deletions(-)
 delete mode 100644 dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/watch_exp.gif
 rename {dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16 => dsf/org.eclipse.cdt.dsf.ui/icons}/move_to_line.gif (100%)
 rename {dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16 => dsf/org.eclipse.cdt.dsf.ui/icons}/resume_at_line.gif (100%)
 rename {dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb => dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug}/internal/ui/EvaluationContextManager.java (95%)

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/watch_exp.gif b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/watch_exp.gif
deleted file mode 100644
index d37495a839176e3c214cedc3ee5ed3d5c1c1f8a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmV-@0D}KVNk%w1VGsZi0HOc@Ic1e*lf`tM%8{|vtHj^P*y`2c@Bjb*A^8LW000L7
zEC2ui01yBW0009*c)HvQ;|$Q~I|O8+#EX-%EmjDL+93d}2U%NsSkgIzmZyYHZ#xB6
f;X-0P3c+53GxHf0g}_kB08FVQ19nUOF%kefcA7DH

diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
index 8a051dd3f79..5a4c78d4733 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
@@ -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
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
index ddbc6408fb7..4c6e9675bb7 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
@@ -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">
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java
index aeaf872aefb..6866babf972 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbUIPlugin.java
@@ -55,8 +55,6 @@ public class GdbUIPlugin extends AbstractUIPlugin {
 		super.start(context);
 		plugin = this;
 		
-		EvaluationContextManager.startup();
-
 		fTracingConsoleManager = new TracingConsoleManager();
 		fTracingConsoleManager.startup();
 	}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/move_to_line.gif b/dsf/org.eclipse.cdt.dsf.ui/icons/move_to_line.gif
similarity index 100%
rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/move_to_line.gif
rename to dsf/org.eclipse.cdt.dsf.ui/icons/move_to_line.gif
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/resume_at_line.gif b/dsf/org.eclipse.cdt.dsf.ui/icons/resume_at_line.gif
similarity index 100%
rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/icons/full/obj16/resume_at_line.gif
rename to dsf/org.eclipse.cdt.dsf.ui/icons/resume_at_line.gif
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
index 9fe899554b8..f37e87ec369 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
@@ -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
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
index 6183613adab..73d37bb1f19 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
@@ -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"
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/EvaluationContextManager.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java
similarity index 95%
rename from dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/EvaluationContextManager.java
rename to dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java
index 7281fa781da..8dff61644c4 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/EvaluationContextManager.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/EvaluationContextManager.java
@@ -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;
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/internal/ui/DsfUIPlugin.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/internal/ui/DsfUIPlugin.java
index 8716b0be978..81522fd21d0 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/internal/ui/DsfUIPlugin.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/internal/ui/DsfUIPlugin.java
@@ -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);