From: Christian Georgi <christian.georgi@sap.com>
Date: Sun, 29 Mar 2015 18:00:52 +0000 (+0200)
Subject: Bug 436062 - Restore order of Run/Debug popupMenus extensions
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a6e5872277f3ba6d89403cea2021548c0ef7b15;p=sdk%2Fide%2Feclipse-platform-debug.git

Bug 436062 - Restore order of Run/Debug popupMenus extensions

Commit 72950dab changed the order of popupMenus extensions for reasons
unknown [1].  This order, however, is the exact reverse order of the
corresponding menu items.  Most prominently the Run As, Debug As, and
Profile As items were mixed up in context menus since then.

This patch restores the original order of all popupMenus from the bad
commit's parent ebf98a16.

[1]
https://git.eclipse.org/c/platform/eclipse.platform.debug.git/commit/?id=72950dab366c048a5119c995ea591dbaba477803

Bug: 436062
Change-Id: I29b42a65a697d9d9c8b48d15af9dfe34a1ce6ba3
Signed-off-by: Christian Georgi <christian.georgi@sap.com>
---

diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml
index 8c41ff1..6f13731 100644
--- a/org.eclipse.debug.ui/plugin.xml
+++ b/org.eclipse.debug.ui/plugin.xml
@@ -993,377 +993,115 @@
    <extension
          point="org.eclipse.ui.popupMenus">
 
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.ExpressionView"
-            id="org.eclipse.debug.ui.ExpressionActions">
-         <visibility>
-            <and>
-               <objectClass name="org.eclipse.debug.core.model.IExpression"/>
-               <not>
-                  <objectClass name="org.eclipse.debug.core.model.IWatchExpression"/>
-               </not>
-            </and>
-         </visibility>
-         <action
-               label="%convertToWatchExpressionAction.label"
-               helpContextId="convert_to_watch_expression_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.ConvertToWatchExpressionAction"
-               tooltip="%convertToWatchExpressionAction.tooltip"
-               menubarPath="additions"
-               enablesFor="*"
-               id="org.eclipse.debug.ui.actions.ConvertToWatchExpression">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.ExpressionView"
-            id="org.eclipse.debug.ui.WatchExpressionActions">
-         <action
-               label="%editWatchExpressionAction.label"
-               helpContextId="edit_watch_expression_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.EditWatchExpressionAction"
-               tooltip="%editWatchExpressionAction.tooltip"
-               menubarPath="additions"
-               enablesFor="1"
-               id="org.eclipse.debug.ui.watchExpressionActions.EditWatchExpression">
-         </action>
-      </viewerContribution>      
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.ExpressionView"
-            id="org.eclipse.debug.ui.WatchExpressionActions">
+      <objectContribution
+            id="org.eclipse.debug.ui.memory"
+            objectClass="org.eclipse.debug.internal.ui.views.memory.renderings.AbstractIntegerRendering">
+         <menu
+               id="org.eclipse.debug.ui.memory.rendering.setendianess"
+               label="%Endianess"
+               path="additions">
+            <separator
+                  name="setEndianessGroup">
+            </separator>
+            <groupMarker
+                  name="defaultEndianessGroup">
+            </groupMarker>
+         </menu>
          <action
-               label="%enableWatchExpressionAction.label"
-               helpContextId="enable_watch_expression_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.EnableWatchExpressionAction"
-               tooltip="%enableWatchExpressionAction.tooltip"
-               menubarPath="additions"
+               class="org.eclipse.debug.internal.ui.views.memory.renderings.LittleEndianAction"
                enablesFor="1"
-               id="org.eclipse.debug.ui.watchExpressionActions.EnableWatchExpression">
+               helpContextId="LittleEndianAction_context"
+               id="org.eclipse.debug.ui.memory.rendering.LittleEndianAction"
+               label="%LittleEndianActionName"
+               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
          </action>
-      </viewerContribution>      
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.ExpressionView"
-            id="org.eclipse.debug.ui.WatchExpressionActions">
          <action
-               label="%disableWatchExpressionAction.label"
-               helpContextId="disable_watch_expression_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.DisableWatchExpressionAction"
-               tooltip="%disableWatchExpressionAction.tooltip"
-               menubarPath="additions"
+               class="org.eclipse.debug.internal.ui.views.memory.renderings.BigEndianAction"
                enablesFor="1"
-               id="org.eclipse.debug.ui.watchExpressionActions.DisableWatchExpression">
+               helpContextId="BigEndianAction_context"
+               id="org.eclipse.debug.ui.memory.rendering.BigEndianAction"
+               label="%BigEndianActionName"
+               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
          </action>
-      </viewerContribution>
-      <objectContribution
-            objectClass="org.eclipse.debug.core.model.IWatchExpression"
-            id="org.eclipse.debug.WatchExpressionActions">
          <action
-               label="%reevaluateWatchExpressionAction.label"
-               helpContextId="reevaluate_watch_expression_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.ReevaluateWatchExpressionAction"
-               tooltip="%reevaluateWatchExpressionAction.tooltip"
-               menubarPath="additions"
+               class="org.eclipse.debug.internal.ui.views.memory.renderings.DefaultEndianessAction"
                enablesFor="1"
-               id="org.eclipse.debug.ui.watchExpressionActions.ReevaluateWatchExpression">
+               helpContextId="RestoreDefEndianessAction_context"
+               id="org.eclipse.debug.ui.memory.rendering.DefaultEndianAction"
+               label="%RestoreDefEndianessActionName"
+               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/defaultEndianessGroup">
          </action>
       </objectContribution>
       <viewerContribution
-            targetID="org.eclipse.debug.ui.ExpressionView"
-            id="org.eclipse.debug.ui.ExpressionViewPopupActions">
-         <action
-               label="%addWatchExpressionAction.label"
-               icon="$nl$/icons/full/elcl16/monitorexpression_tsk.png"
-               helpContextId="add_watch_expression_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.AddWatchExpressionAction"
-               tooltip="%addWatchExpressionAction.tooltip"
-               menubarPath="additions"
-               id="org.eclipse.debug.ui.expressionViewActions.AddWatchExpression">
-         </action>
-      </viewerContribution>
-<!-- Watchpoint actions -->      
-      <objectContribution
-            objectClass="org.eclipse.debug.core.model.IWatchpoint"
-            id="org.eclipse.debug.ui.WatchpointToggleActions">
+            id="org.eclipse.debug.ui.memory.renderingviewpane.1"
+            targetID="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1">
+         <menu
+               id="org.eclipse.debug.ui.memory.renderingviewpane.1.addremove"
+               label="%AddRemoveRenderingMenu.name"
+               path="popUpBegin">
+         </menu>
          <action
-               label="%accessAction.label"
-               helpContextId="access_toggle_action_context"
-               state="false"
-               class="org.eclipse.debug.internal.ui.actions.breakpoints.AccessWatchpointToggleAction"
-               menubarPath="emptyBreakpointGroup"
-               enablesFor="+"
-               id="org.eclipse.debug.ui.actions.AccessToggle">
+               class="org.eclipse.debug.internal.ui.views.memory.RemoveRenderingContextAction"
+               helpContextId="RemoveRenderingContextAction_context"
+               icon="$nl$/icons/full/elcl16/removememory_tsk.png"
+               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1.remove"
+               label="%RemoveRenderingAction.name"
+               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.1.addremove">
          </action>
          <action
-               label="%modificationAction.label"
-               helpContextId="modification_toggle_action_context"
-               state="false"
-               class="org.eclipse.debug.internal.ui.actions.breakpoints.ModificationWatchpointToggleAction"
-               menubarPath="emptyBreakpointGroup"
-               enablesFor="+"
-               id="org.eclipse.debug.ui.actions.ModificationToggle">
+               class="org.eclipse.debug.internal.ui.views.memory.AddMemoryRenderingContextAction"
+               helpContextId="AddRenderingContextAction_context"
+               icon="$nl$/icons/full/elcl16/monitorexpression_tsk.png"
+               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1.add"
+               label="%AddRenderingAction.name"
+               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.1.addremove">
          </action>
-      </objectContribution>
-<!-- Contributions to Debug View Popup Menu -->
+      </viewerContribution>
       <viewerContribution
-            targetID="org.eclipse.debug.ui.DebugView"
-            id="org.eclipse.debug.ui.debugview.popupMenu">
-
-         <action
-               label="%CopyToClipboardAction.label"
-               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
-               definitionId="org.eclipse.ui.edit.copy"
-               helpContextId="copy_to_clipboard_action_context"
-               class="org.eclipse.debug.internal.ui.views.launch.LaunchViewCopyToClipboardActionDelegate"
-               menubarPath="editGroup"
-               id="org.eclipse.debug.ui.debugview.popupMenu.copyToClipboard">
-         </action>
-
-
+            id="org.eclipse.debug.ui.memory.renderingviewpane.2"
+            targetID="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2">
+         <menu
+               id="org.eclipse.debug.ui.memory.renderingviewpane.2.addremove"
+               label="%AddRemoveRenderingMenu.name"
+               path="popUpBegin">
+         </menu>
          <action
-               label="%RelaunchAction.label"
-               icon="$nl$/icons/full/elcl16/runlast_co.png"
-               helpContextId="relaunch_action_context"
-               class="org.eclipse.debug.internal.ui.actions.RelaunchActionDelegate"
-               menubarPath="launchGroup"
-               id="org.eclipse.debug.ui.debugview.popupMenu.relaunch">
+               class="org.eclipse.debug.internal.ui.views.memory.RemoveRenderingContextAction"
+               helpContextId="RemoveRenderingContextAction_context"
+               icon="$nl$/icons/full/elcl16/removememory_tsk.png"
+               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2.remove"
+               label="%RemoveRenderingAction.name"
+               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.2.addremove">
          </action>
          <action
-               label="%RemoveAllTerminatedAction.label"
-               icon="$nl$/icons/full/elcl16/rem_all_co.png"
-               helpContextId="remove_all_terminated_action_context"
-               class="org.eclipse.debug.internal.ui.actions.RemoveAllTerminatedAction"
-               menubarPath="launchGroup"
-               id="org.eclipse.debug.ui.debugview.popupMenu.removeAllTerminated">
+               class="org.eclipse.debug.internal.ui.views.memory.AddMemoryRenderingContextAction"
+               helpContextId="AddRenderingContextAction_context"
+               icon="$nl$/icons/full/elcl16/monitorexpression_tsk.png"
+               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2.add"
+               label="%AddRenderingAction.name"
+               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.2.addremove">
          </action>
       </viewerContribution>
-<!-- Contributions to Breakpoints View Popup Menu -->
       <viewerContribution
-            targetID="org.eclipse.debug.ui.BreakpointView"
-            id="org.eclipse.debug.ui.breakpointview.breakpointGroupActions">
-         <visibility>
-            <objectClass
-               name="org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointContainer">
-            </objectClass>
-         </visibility>
+            id="org.eclipse.debug.ui.memory.memoryBlockTreeViewPane"
+            targetID="org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane">
          <action
-               class="org.eclipse.debug.internal.ui.actions.breakpointGroups.EditBreakpointGroupAction"
-               enablesFor="1"
-               helpContextId="edit_breakpoint_working_set_action_context"
-               id="org.eclipse.debug.ui.actions.editBreakpointGroup"
-               label="%editGroup.label"
-               menubarPath="breakpointGroupGroup">
+               class="org.eclipse.debug.internal.ui.views.memory.ResetMemoryBlockAction"
+               helpContextId="resetMemoryMonitor_context"
+               icon="$nl$/icons/full/elcl16/memoryreset_tsk.png"
+               id="org.eclipse.debug.ui.resetMemoryBlock"
+               label="%resetMemoryMonitorAction.label"
+               menubarPath="additions">
          </action>
-         <action
-               class="org.eclipse.debug.internal.ui.actions.breakpointGroups.ToggleDefaultGroupAction"
-               helpContextId="set_as_default_breakpoint_working_set_action_context"
-               id="org.eclipse.debug.ui.actions.toggleDefaultGroup"
-               label="%ToggleDefault.label"
-               menubarPath="breakpointGroupGroup"/>
       </viewerContribution>
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.BreakpointView"
-            id="org.eclipse.debug.ui.breakpointview.popupMenu">
-         <action
-               label="%Copy.label"
-               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
-               definitionId="org.eclipse.ui.edit.copy"
-               helpContextId="copy_breakpoints_action_context"
-               class="org.eclipse.debug.internal.ui.actions.breakpointGroups.CopyBreakpointsActionDelegate"
-               menubarPath="breakpointGroup"
-               id="org.eclipse.debug.ui.breakpointsView.toolbar.copy"/>
-         <action
-               label="%SelectAll.label"
-               helpContextId="select_all_breakpoints_action_context"
-               definitionId="org.eclipse.ui.edit.selectAll"
-               class="org.eclipse.debug.internal.ui.actions.breakpoints.SelectAllBreakpointsAction"
-               menubarPath="breakpointGroup"
-               id="org.eclipse.debug.ui.actions.SelectAllBreakpointsAction">
-         </action>
+      <objectContribution
+            id="org.eclipse.debug.ui.contextualLaunch.profile"
+            objectClass="java.lang.Object">
          <action
-               label="%RemoveAllAction.label"
-               icon="$nl$/icons/full/elcl16/rem_all_co.png"
-               helpContextId="remove_all_breakpoints_action_context"
-               class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveAllBreakpointsAction"
-               menubarPath="breakpointGroup"
-               id="org.eclipse.debug.ui.actions.RemoveAllBreakpoints">
-         </action>
-        <action
-               label="%RemoveAction.label"
-               icon="$nl$/icons/full/elcl16/rem_co.png"
-               helpContextId="remove_breakpoint_action_context"
-               class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveBreakpointAction"
-               menubarPath="breakpointGroup"
+               class="org.eclipse.debug.internal.ui.actions.ProfileContextualLaunchAction"
                enablesFor="+"
-               id="org.eclipse.debug.ui.breakpointsView.toolbar.remove">
-        </action>
-        <action
-               label="%DisableBreakpointsAction.label"
-               icon="$nl$/icons/full/elcl16/disabled_co.png"
-               helpContextId="disable_breakpoint_action_context"
-               class="org.eclipse.debug.internal.ui.actions.breakpoints.DisableBreakpointsAction"
-               menubarPath="breakpointGroup"
-               enablesFor="+"
-               id="org.eclipse.debug.ui.actions.DisableBreakpoint">
-        </action>
-        <action
-               label="%EnableBreakpointsAction.label"
-               icon="$nl$/icons/full/elcl16/enabled_co.png"
-               helpContextId="enable_breakpoint_action_context"
-               class="org.eclipse.debug.internal.ui.actions.breakpoints.EnableBreakpointsAction"
-               menubarPath="breakpointGroup"
-               enablesFor="+"
-               id="org.eclipse.debug.ui.actions.EnableBreakpoint">
-        </action>
-        <action
-              class="org.eclipse.debug.internal.ui.importexport.breakpoints.ExportBreakpoints"
-              enablesFor="+"
-              helpContextId="export_breakpoints_action_context"
-              icon="$nl$/icons/full/elcl16/export_brkpts.png"
-              id="org.eclipse.debug.internal.ui.importexport.breakpoints.exportBreakpointsContext"
-              label="%exportBreakpoints.label"
-              menubarPath="additions"/>
-        <action
-              class="org.eclipse.debug.internal.ui.importexport.breakpoints.ImportBreakpoints"
-              helpContextId="import_breakpoints_action_context"
-              icon="$nl$/icons/full/elcl16/import_brkpts.png"
-              id="org.eclipse.debug.internal.ui.importexport.breakpoints.importBreakpointsContext"
-              label="%importBreakpoints.label"
-              menubarPath="additions"/>
-      </viewerContribution>
-      <!-- Breakpoint actions -->
-<!-- Contributions to Variables View Popup Menu -->
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.VariableView"
-            id="org.eclipse.debug.ui.variablesView.popupMenu">
-      <!-- Variable Group -->
-         <action
-               label="%CopyVariablesToClipboardAction.label"
-               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
-               definitionId="org.eclipse.ui.edit.copy"
-               helpContextId="copy_variables_to_clipboard_action_context"
-               class="org.eclipse.debug.internal.ui.viewers.model.VirtualCopyToClipboardActionDelegate"
-               menubarPath="variableGroup"
-               id="org.eclipse.debug.ui.debugview.popupMenu.copyVariablesToClipboard">
-         </action>
-         <action
-               label="%SelectAll.label"
-               helpContextId="select_all_variables_action_context"
-               definitionId="org.eclipse.ui.edit.selectAll"
-               class="org.eclipse.debug.internal.ui.actions.variables.SelectAllVariablesAction"
-               menubarPath="variableGroup"
-               id="org.eclipse.debug.ui.actions.SelectAllVariablesAction">
-         </action>
-      </viewerContribution>
-<!-- Contributions to Expression View Popup Menu -->
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.ExpressionView"
-            id="org.eclipse.debug.ui.expressionView.popupMenu">
-      <!-- Expression Group -->
-         <action
-               label="%RemoveAllAction.label"
-               icon="$nl$/icons/full/elcl16/rem_all_co.png"
-               helpContextId="remove_all_expressions_action_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.RemoveAllExpressionsAction"
-               menubarPath="expressionGroup"
-               id="org.eclipse.debug.ui.debugview.popupMenu.removeAllExpressionsAction">
-         </action>
-         <action
-               label="%RemoveAction.label"
-               icon="$nl$/icons/full/elcl16/rem_co.png"
-               helpContextId="remove_expression_action_context"
-               class="org.eclipse.debug.internal.ui.actions.expressions.RemoveExpressionAction"
-               menubarPath="expressionGroup"
-               id="org.eclipse.debug.ui.debugview.popupMenu.removeExpressionAction">
-            <selection
-                  class="org.eclipse.debug.core.model.IExpression">
-            </selection>
-            <selection
-                  class="org.eclipse.debug.core.model.IVariable">
-            </selection>
-         </action>
-         <action
-               label="%CopyExpressionsToClipboardAction.label"
-               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
-               definitionId="org.eclipse.ui.edit.copy"
-               helpContextId="copy_variables_to_clipboard_action_context"
-               class="org.eclipse.debug.internal.ui.viewers.model.VirtualCopyToClipboardActionDelegate"
-               menubarPath="expressionGroup"
-               id="org.eclipse.debug.ui.debugview.popupMenu.copyVariablesToClipboard">
-            <selection
-                  class="org.eclipse.debug.core.model.IDebugElement">
-            </selection>
-         </action>
-         <action
-               label="%SelectAll.label"
-               helpContextId="select_all_expressions_action_context"
-               definitionId="org.eclipse.ui.edit.selectAll"
-               class="org.eclipse.debug.internal.ui.actions.expressions.SelectAllExpressionsAction"
-               menubarPath="expressionGroup"
-               id="org.eclipse.debug.ui.actions.SelectAllExpressionsAction">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            targetID="org.eclipse.debug.ui.RegisterView"
-            id="org.eclipse.debug.ui.registersView.popupMenu">
-      <!-- Variable Group -->
-         <action
-               menubarPath="variableGroup"
-               class="org.eclipse.debug.internal.ui.viewers.model.VirtualCopyToClipboardActionDelegate"
-               definitionId="org.eclipse.ui.edit.copy"
-               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
-               label="%CopyRegistersToClipboardAction.label"
-               id="org.eclipse.debug.ui.debugview.popupMenu.copyVariablesToClipboard"
-               helpContextId="copy_to_clipboard_action_context">
-            <selection
-                  class="org.eclipse.debug.core.model.IDebugElement">
-            </selection>
-         </action>
-         <action
-               class="org.eclipse.debug.internal.ui.actions.variables.SelectAllVariablesAction"
-               label="%SelectAll.label"
-               menubarPath="variableGroup"
-               definitionId="org.eclipse.ui.edit.selectAll"
-               helpContextId="select_all_variables_action_context"
-               id="org.eclipse.debug.ui.actions.SelectAllVariablesAction">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            id="org.eclipse.debug.ui.processConsoleContextMenu"
-            targetID="org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu">
-         <action
-               class="org.eclipse.debug.internal.ui.commands.actions.TerminateAllActionDelegate"
-               helpContextId="terminate_all_action_context"
-               icon="$nl$/icons/full/elcl16/terminate_all_co.png"
-               id="org.eclipse.debug.ui.consoleTerminateAllAction"
-               label="%TerminateAllAction.label"
-               menubarPath="additions"
-               tooltip="%TerminateAllAction.tooltip">
-         </action>
-         <action
-               class="org.eclipse.debug.internal.ui.actions.RemoveAllTerminatedAction"
-               helpContextId="console_remove_all_terminated_context"
-               icon="$nl$/icons/full/elcl16/rem_all_co.png"
-               id="org.eclipse.debug.ui.consoleRemoveAllTerminatedAction"
-               label="%RemoveAllTerminatedAction.label"
-               menubarPath="additions"
-               tooltip="%RemoveAllTerminatedAction.tooltip">
-         </action>
-         <action
-               class="org.eclipse.debug.internal.ui.views.console.ConsoleShowPreferencesAction"
-               helpContextId="console_show_preferences_action_context"
-               id="org.eclipse.debug.ui.consolePreferencesAction"
-               label="%ConsolePreferencesAction.label"
-               menubarPath="preferences"
-               tooltip="%ConsolePreferencesAction.tooltip">
-         </action>
-      </viewerContribution>
-      <objectContribution
-            id="org.eclipse.debug.ui.contextualLaunch.run"
-            objectClass="java.lang.Object">
-         <action
-               class="org.eclipse.debug.internal.ui.actions.RunContextualLaunchAction"
-               enablesFor="+"
-               id="org.eclipse.debug.ui.contextualLaunch.run.submenu"
-               label="%RunContextMenu.label"
+               id="org.eclipse.debug.ui.contextualLaunch.profile.submenu"
+               label="%ProfileContextMenu.label"
                menubarPath="additions"
                style="pulldown">
          </action>
@@ -1395,7 +1133,7 @@
                   </with>
                   <test
                         property="org.eclipse.debug.core.launchable"
-                        value="run">
+                        value="profile">
                   </test>
                </and>
             </or>
@@ -1447,13 +1185,13 @@
          </enablement>
       </objectContribution>
       <objectContribution
-            id="org.eclipse.debug.ui.contextualLaunch.profile"
+            id="org.eclipse.debug.ui.contextualLaunch.run"
             objectClass="java.lang.Object">
          <action
-               class="org.eclipse.debug.internal.ui.actions.ProfileContextualLaunchAction"
+               class="org.eclipse.debug.internal.ui.actions.RunContextualLaunchAction"
                enablesFor="+"
-               id="org.eclipse.debug.ui.contextualLaunch.profile.submenu"
-               label="%ProfileContextMenu.label"
+               id="org.eclipse.debug.ui.contextualLaunch.run.submenu"
+               label="%RunContextMenu.label"
                menubarPath="additions"
                style="pulldown">
          </action>
@@ -1485,113 +1223,375 @@
                   </with>
                   <test
                         property="org.eclipse.debug.core.launchable"
-                        value="profile">
+                        value="run">
                   </test>
                </and>
             </or>
          </enablement>
       </objectContribution>
       <viewerContribution
-            id="org.eclipse.debug.ui.memory.memoryBlockTreeViewPane"
-            targetID="org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane">
+            id="org.eclipse.debug.ui.processConsoleContextMenu"
+            targetID="org.eclipse.debug.ui.ProcessConsoleType.#ContextMenu">
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.ResetMemoryBlockAction"
-               helpContextId="resetMemoryMonitor_context"
-               icon="$nl$/icons/full/elcl16/memoryreset_tsk.png"
-               id="org.eclipse.debug.ui.resetMemoryBlock"
-               label="%resetMemoryMonitorAction.label"
-               menubarPath="additions">
+               class="org.eclipse.debug.internal.ui.commands.actions.TerminateAllActionDelegate"
+               helpContextId="terminate_all_action_context"
+               icon="$nl$/icons/full/elcl16/terminate_all_co.png"
+               id="org.eclipse.debug.ui.consoleTerminateAllAction"
+               label="%TerminateAllAction.label"
+               menubarPath="additions"
+               tooltip="%TerminateAllAction.tooltip">
          </action>
-      </viewerContribution>
-      <viewerContribution
-            id="org.eclipse.debug.ui.memory.renderingviewpane.2"
-            targetID="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2">
-         <menu
-               id="org.eclipse.debug.ui.memory.renderingviewpane.2.addremove"
-               label="%AddRemoveRenderingMenu.name"
-               path="popUpBegin">
-         </menu>
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.RemoveRenderingContextAction"
-               helpContextId="RemoveRenderingContextAction_context"
-               icon="$nl$/icons/full/elcl16/removememory_tsk.png"
-               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2.remove"
-               label="%RemoveRenderingAction.name"
-               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.2.addremove">
+               class="org.eclipse.debug.internal.ui.actions.RemoveAllTerminatedAction"
+               helpContextId="console_remove_all_terminated_context"
+               icon="$nl$/icons/full/elcl16/rem_all_co.png"
+               id="org.eclipse.debug.ui.consoleRemoveAllTerminatedAction"
+               label="%RemoveAllTerminatedAction.label"
+               menubarPath="additions"
+               tooltip="%RemoveAllTerminatedAction.tooltip">
          </action>
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.AddMemoryRenderingContextAction"
-               helpContextId="AddRenderingContextAction_context"
-               icon="$nl$/icons/full/elcl16/monitorexpression_tsk.png"
-               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.2.add"
-               label="%AddRenderingAction.name"
-               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.2.addremove">
+               class="org.eclipse.debug.internal.ui.views.console.ConsoleShowPreferencesAction"
+               helpContextId="console_show_preferences_action_context"
+               id="org.eclipse.debug.ui.consolePreferencesAction"
+               label="%ConsolePreferencesAction.label"
+               menubarPath="preferences"
+               tooltip="%ConsolePreferencesAction.tooltip">
          </action>
       </viewerContribution>
       <viewerContribution
-            id="org.eclipse.debug.ui.memory.renderingviewpane.1"
-            targetID="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1">
-         <menu
-               id="org.eclipse.debug.ui.memory.renderingviewpane.1.addremove"
-               label="%AddRemoveRenderingMenu.name"
-               path="popUpBegin">
-         </menu>
+            targetID="org.eclipse.debug.ui.ExpressionView"
+            id="org.eclipse.debug.ui.ExpressionActions">
+         <visibility>
+            <and>
+               <objectClass name="org.eclipse.debug.core.model.IExpression"/>
+               <not>
+                  <objectClass name="org.eclipse.debug.core.model.IWatchExpression"/>
+               </not>
+            </and>
+         </visibility>
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.RemoveRenderingContextAction"
-               helpContextId="RemoveRenderingContextAction_context"
-               icon="$nl$/icons/full/elcl16/removememory_tsk.png"
-               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1.remove"
-               label="%RemoveRenderingAction.name"
-               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.1.addremove">
+               label="%convertToWatchExpressionAction.label"
+               helpContextId="convert_to_watch_expression_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.ConvertToWatchExpressionAction"
+               tooltip="%convertToWatchExpressionAction.tooltip"
+               menubarPath="additions"
+               enablesFor="*"
+               id="org.eclipse.debug.ui.actions.ConvertToWatchExpression">
          </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.ExpressionView"
+            id="org.eclipse.debug.ui.WatchExpressionActions">
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.AddMemoryRenderingContextAction"
-               helpContextId="AddRenderingContextAction_context"
-               icon="$nl$/icons/full/elcl16/monitorexpression_tsk.png"
-               id="org.eclipse.debug.ui.MemoryView.RenderingViewPane.1.add"
-               label="%AddRenderingAction.name"
-               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.1.addremove">
+               label="%editWatchExpressionAction.label"
+               helpContextId="edit_watch_expression_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.EditWatchExpressionAction"
+               tooltip="%editWatchExpressionAction.tooltip"
+               menubarPath="additions"
+               enablesFor="1"
+               id="org.eclipse.debug.ui.watchExpressionActions.EditWatchExpression">
          </action>
-      </viewerContribution>
-      <objectContribution
-            id="org.eclipse.debug.ui.memory"
-            objectClass="org.eclipse.debug.internal.ui.views.memory.renderings.AbstractIntegerRendering">
-         <menu
-               id="org.eclipse.debug.ui.memory.rendering.setendianess"
-               label="%Endianess"
-               path="additions">
-            <separator
-                  name="setEndianessGroup">
-            </separator>
-            <groupMarker
-                  name="defaultEndianessGroup">
-            </groupMarker>
-         </menu>
+      </viewerContribution>      
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.ExpressionView"
+            id="org.eclipse.debug.ui.WatchExpressionActions">
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.renderings.LittleEndianAction"
+               label="%enableWatchExpressionAction.label"
+               helpContextId="enable_watch_expression_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.EnableWatchExpressionAction"
+               tooltip="%enableWatchExpressionAction.tooltip"
+               menubarPath="additions"
                enablesFor="1"
-               helpContextId="LittleEndianAction_context"
-               id="org.eclipse.debug.ui.memory.rendering.LittleEndianAction"
-               label="%LittleEndianActionName"
-               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
+               id="org.eclipse.debug.ui.watchExpressionActions.EnableWatchExpression">
          </action>
+      </viewerContribution>      
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.ExpressionView"
+            id="org.eclipse.debug.ui.WatchExpressionActions">
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.renderings.BigEndianAction"
+               label="%disableWatchExpressionAction.label"
+               helpContextId="disable_watch_expression_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.DisableWatchExpressionAction"
+               tooltip="%disableWatchExpressionAction.tooltip"
+               menubarPath="additions"
                enablesFor="1"
-               helpContextId="BigEndianAction_context"
-               id="org.eclipse.debug.ui.memory.rendering.BigEndianAction"
-               label="%BigEndianActionName"
-               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
+               id="org.eclipse.debug.ui.watchExpressionActions.DisableWatchExpression">
          </action>
+      </viewerContribution>
+      <objectContribution
+            objectClass="org.eclipse.debug.core.model.IWatchExpression"
+            id="org.eclipse.debug.WatchExpressionActions">
          <action
-               class="org.eclipse.debug.internal.ui.views.memory.renderings.DefaultEndianessAction"
+               label="%reevaluateWatchExpressionAction.label"
+               helpContextId="reevaluate_watch_expression_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.ReevaluateWatchExpressionAction"
+               tooltip="%reevaluateWatchExpressionAction.tooltip"
+               menubarPath="additions"
                enablesFor="1"
-               helpContextId="RestoreDefEndianessAction_context"
-               id="org.eclipse.debug.ui.memory.rendering.DefaultEndianAction"
-               label="%RestoreDefEndianessActionName"
-               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/defaultEndianessGroup">
+               id="org.eclipse.debug.ui.watchExpressionActions.ReevaluateWatchExpression">
+         </action>
+      </objectContribution>
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.ExpressionView"
+            id="org.eclipse.debug.ui.ExpressionViewPopupActions">
+         <action
+               label="%addWatchExpressionAction.label"
+               icon="$nl$/icons/full/elcl16/monitorexpression_tsk.png"
+               helpContextId="add_watch_expression_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.AddWatchExpressionAction"
+               tooltip="%addWatchExpressionAction.tooltip"
+               menubarPath="additions"
+               id="org.eclipse.debug.ui.expressionViewActions.AddWatchExpression">
+         </action>
+      </viewerContribution>
+<!-- Watchpoint actions -->      
+      <objectContribution
+            objectClass="org.eclipse.debug.core.model.IWatchpoint"
+            id="org.eclipse.debug.ui.WatchpointToggleActions">
+         <action
+               label="%accessAction.label"
+               helpContextId="access_toggle_action_context"
+               state="false"
+               class="org.eclipse.debug.internal.ui.actions.breakpoints.AccessWatchpointToggleAction"
+               menubarPath="emptyBreakpointGroup"
+               enablesFor="+"
+               id="org.eclipse.debug.ui.actions.AccessToggle">
+         </action>
+         <action
+               label="%modificationAction.label"
+               helpContextId="modification_toggle_action_context"
+               state="false"
+               class="org.eclipse.debug.internal.ui.actions.breakpoints.ModificationWatchpointToggleAction"
+               menubarPath="emptyBreakpointGroup"
+               enablesFor="+"
+               id="org.eclipse.debug.ui.actions.ModificationToggle">
          </action>
       </objectContribution>
+<!-- Contributions to Debug View Popup Menu -->
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.DebugView"
+            id="org.eclipse.debug.ui.debugview.popupMenu">
+
+         <action
+               label="%CopyToClipboardAction.label"
+               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
+               definitionId="org.eclipse.ui.edit.copy"
+               helpContextId="copy_to_clipboard_action_context"
+               class="org.eclipse.debug.internal.ui.views.launch.LaunchViewCopyToClipboardActionDelegate"
+               menubarPath="editGroup"
+               id="org.eclipse.debug.ui.debugview.popupMenu.copyToClipboard">
+         </action>
+
+
+         <action
+               label="%RelaunchAction.label"
+               icon="$nl$/icons/full/elcl16/runlast_co.png"
+               helpContextId="relaunch_action_context"
+               class="org.eclipse.debug.internal.ui.actions.RelaunchActionDelegate"
+               menubarPath="launchGroup"
+               id="org.eclipse.debug.ui.debugview.popupMenu.relaunch">
+         </action>
+         <action
+               label="%RemoveAllTerminatedAction.label"
+               icon="$nl$/icons/full/elcl16/rem_all_co.png"
+               helpContextId="remove_all_terminated_action_context"
+               class="org.eclipse.debug.internal.ui.actions.RemoveAllTerminatedAction"
+               menubarPath="launchGroup"
+               id="org.eclipse.debug.ui.debugview.popupMenu.removeAllTerminated">
+         </action>
+      </viewerContribution>
+<!-- Contributions to Breakpoints View Popup Menu -->
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.BreakpointView"
+            id="org.eclipse.debug.ui.breakpointview.breakpointGroupActions">
+         <visibility>
+            <objectClass
+               name="org.eclipse.debug.internal.ui.breakpoints.provisional.IBreakpointContainer">
+            </objectClass>
+         </visibility>
+         <action
+               class="org.eclipse.debug.internal.ui.actions.breakpointGroups.EditBreakpointGroupAction"
+               enablesFor="1"
+               helpContextId="edit_breakpoint_working_set_action_context"
+               id="org.eclipse.debug.ui.actions.editBreakpointGroup"
+               label="%editGroup.label"
+               menubarPath="breakpointGroupGroup">
+         </action>
+         <action
+               class="org.eclipse.debug.internal.ui.actions.breakpointGroups.ToggleDefaultGroupAction"
+               helpContextId="set_as_default_breakpoint_working_set_action_context"
+               id="org.eclipse.debug.ui.actions.toggleDefaultGroup"
+               label="%ToggleDefault.label"
+               menubarPath="breakpointGroupGroup"/>
+      </viewerContribution>
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.BreakpointView"
+            id="org.eclipse.debug.ui.breakpointview.popupMenu">
+         <action
+               label="%Copy.label"
+               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
+               definitionId="org.eclipse.ui.edit.copy"
+               helpContextId="copy_breakpoints_action_context"
+               class="org.eclipse.debug.internal.ui.actions.breakpointGroups.CopyBreakpointsActionDelegate"
+               menubarPath="breakpointGroup"
+               id="org.eclipse.debug.ui.breakpointsView.toolbar.copy"/>
+         <action
+               label="%SelectAll.label"
+               helpContextId="select_all_breakpoints_action_context"
+               definitionId="org.eclipse.ui.edit.selectAll"
+               class="org.eclipse.debug.internal.ui.actions.breakpoints.SelectAllBreakpointsAction"
+               menubarPath="breakpointGroup"
+               id="org.eclipse.debug.ui.actions.SelectAllBreakpointsAction">
+         </action>
+         <action
+               label="%RemoveAllAction.label"
+               icon="$nl$/icons/full/elcl16/rem_all_co.png"
+               helpContextId="remove_all_breakpoints_action_context"
+               class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveAllBreakpointsAction"
+               menubarPath="breakpointGroup"
+               id="org.eclipse.debug.ui.actions.RemoveAllBreakpoints">
+         </action>
+        <action
+               label="%RemoveAction.label"
+               icon="$nl$/icons/full/elcl16/rem_co.png"
+               helpContextId="remove_breakpoint_action_context"
+               class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveBreakpointAction"
+               menubarPath="breakpointGroup"
+               enablesFor="+"
+               id="org.eclipse.debug.ui.breakpointsView.toolbar.remove">
+        </action>
+        <action
+               label="%DisableBreakpointsAction.label"
+               icon="$nl$/icons/full/elcl16/disabled_co.png"
+               helpContextId="disable_breakpoint_action_context"
+               class="org.eclipse.debug.internal.ui.actions.breakpoints.DisableBreakpointsAction"
+               menubarPath="breakpointGroup"
+               enablesFor="+"
+               id="org.eclipse.debug.ui.actions.DisableBreakpoint">
+        </action>
+        <action
+               label="%EnableBreakpointsAction.label"
+               icon="$nl$/icons/full/elcl16/enabled_co.png"
+               helpContextId="enable_breakpoint_action_context"
+               class="org.eclipse.debug.internal.ui.actions.breakpoints.EnableBreakpointsAction"
+               menubarPath="breakpointGroup"
+               enablesFor="+"
+               id="org.eclipse.debug.ui.actions.EnableBreakpoint">
+        </action>
+        <action
+              class="org.eclipse.debug.internal.ui.importexport.breakpoints.ExportBreakpoints"
+              enablesFor="+"
+              helpContextId="export_breakpoints_action_context"
+              icon="$nl$/icons/full/elcl16/export_brkpts.png"
+              id="org.eclipse.debug.internal.ui.importexport.breakpoints.exportBreakpointsContext"
+              label="%exportBreakpoints.label"
+              menubarPath="additions"/>
+        <action
+              class="org.eclipse.debug.internal.ui.importexport.breakpoints.ImportBreakpoints"
+              helpContextId="import_breakpoints_action_context"
+              icon="$nl$/icons/full/elcl16/import_brkpts.png"
+              id="org.eclipse.debug.internal.ui.importexport.breakpoints.importBreakpointsContext"
+              label="%importBreakpoints.label"
+              menubarPath="additions"/>
+      </viewerContribution>
+      <!-- Breakpoint actions -->
+<!-- Contributions to Variables View Popup Menu -->
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.VariableView"
+            id="org.eclipse.debug.ui.variablesView.popupMenu">
+      <!-- Variable Group -->
+         <action
+               label="%CopyVariablesToClipboardAction.label"
+               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
+               definitionId="org.eclipse.ui.edit.copy"
+               helpContextId="copy_variables_to_clipboard_action_context"
+               class="org.eclipse.debug.internal.ui.viewers.model.VirtualCopyToClipboardActionDelegate"
+               menubarPath="variableGroup"
+               id="org.eclipse.debug.ui.debugview.popupMenu.copyVariablesToClipboard">
+         </action>
+         <action
+               label="%SelectAll.label"
+               helpContextId="select_all_variables_action_context"
+               definitionId="org.eclipse.ui.edit.selectAll"
+               class="org.eclipse.debug.internal.ui.actions.variables.SelectAllVariablesAction"
+               menubarPath="variableGroup"
+               id="org.eclipse.debug.ui.actions.SelectAllVariablesAction">
+         </action>
+      </viewerContribution>
+<!-- Contributions to Expression View Popup Menu -->
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.ExpressionView"
+            id="org.eclipse.debug.ui.expressionView.popupMenu">
+      <!-- Expression Group -->
+         <action
+               label="%RemoveAllAction.label"
+               icon="$nl$/icons/full/elcl16/rem_all_co.png"
+               helpContextId="remove_all_expressions_action_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.RemoveAllExpressionsAction"
+               menubarPath="expressionGroup"
+               id="org.eclipse.debug.ui.debugview.popupMenu.removeAllExpressionsAction">
+         </action>
+         <action
+               label="%RemoveAction.label"
+               icon="$nl$/icons/full/elcl16/rem_co.png"
+               helpContextId="remove_expression_action_context"
+               class="org.eclipse.debug.internal.ui.actions.expressions.RemoveExpressionAction"
+               menubarPath="expressionGroup"
+               id="org.eclipse.debug.ui.debugview.popupMenu.removeExpressionAction">
+            <selection
+                  class="org.eclipse.debug.core.model.IExpression">
+            </selection>
+            <selection
+                  class="org.eclipse.debug.core.model.IVariable">
+            </selection>
+         </action>
+         <action
+               label="%CopyExpressionsToClipboardAction.label"
+               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
+               definitionId="org.eclipse.ui.edit.copy"
+               helpContextId="copy_variables_to_clipboard_action_context"
+               class="org.eclipse.debug.internal.ui.viewers.model.VirtualCopyToClipboardActionDelegate"
+               menubarPath="expressionGroup"
+               id="org.eclipse.debug.ui.debugview.popupMenu.copyVariablesToClipboard">
+            <selection
+                  class="org.eclipse.debug.core.model.IDebugElement">
+            </selection>
+         </action>
+         <action
+               label="%SelectAll.label"
+               helpContextId="select_all_expressions_action_context"
+               definitionId="org.eclipse.ui.edit.selectAll"
+               class="org.eclipse.debug.internal.ui.actions.expressions.SelectAllExpressionsAction"
+               menubarPath="expressionGroup"
+               id="org.eclipse.debug.ui.actions.SelectAllExpressionsAction">
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            targetID="org.eclipse.debug.ui.RegisterView"
+            id="org.eclipse.debug.ui.registersView.popupMenu">
+      <!-- Variable Group -->
+         <action
+               menubarPath="variableGroup"
+               class="org.eclipse.debug.internal.ui.viewers.model.VirtualCopyToClipboardActionDelegate"
+               definitionId="org.eclipse.ui.edit.copy"
+               icon="$nl$/icons/full/elcl16/copy_edit_co.png"
+               label="%CopyRegistersToClipboardAction.label"
+               id="org.eclipse.debug.ui.debugview.popupMenu.copyVariablesToClipboard"
+               helpContextId="copy_to_clipboard_action_context">
+            <selection
+                  class="org.eclipse.debug.core.model.IDebugElement">
+            </selection>
+         </action>
+         <action
+               class="org.eclipse.debug.internal.ui.actions.variables.SelectAllVariablesAction"
+               label="%SelectAll.label"
+               menubarPath="variableGroup"
+               definitionId="org.eclipse.ui.edit.selectAll"
+               helpContextId="select_all_variables_action_context"
+               id="org.eclipse.debug.ui.actions.SelectAllVariablesAction">
+         </action>
+      </viewerContribution>
    </extension>  
    <extension
          point="org.eclipse.ui.elementFactories">