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>

1 files changed, 266 insertions, 266 deletions

diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml
index 8c41ff1d8..6f1373140 100644
--- a/org.eclipse.debug.ui/plugin.xml
+++ b/org.eclipse.debug.ui/plugin.xml
@@ -993,6 +993,272 @@
    <extension
          point="org.eclipse.ui.popupMenus">
 
+      <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
+               class="org.eclipse.debug.internal.ui.views.memory.renderings.LittleEndianAction"
+               enablesFor="1"
+               helpContextId="LittleEndianAction_context"
+               id="org.eclipse.debug.ui.memory.rendering.LittleEndianAction"
+               label="%LittleEndianActionName"
+               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
+         </action>
+         <action
+               class="org.eclipse.debug.internal.ui.views.memory.renderings.BigEndianAction"
+               enablesFor="1"
+               helpContextId="BigEndianAction_context"
+               id="org.eclipse.debug.ui.memory.rendering.BigEndianAction"
+               label="%BigEndianActionName"
+               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
+         </action>
+         <action
+               class="org.eclipse.debug.internal.ui.views.memory.renderings.DefaultEndianessAction"
+               enablesFor="1"
+               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
+            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
+               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
+               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>
+      </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">
+         </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">
+         </action>
+      </viewerContribution>
+      <viewerContribution
+            id="org.eclipse.debug.ui.memory.memoryBlockTreeViewPane"
+            targetID="org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane">
+         <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">
+         </action>
+      </viewerContribution>
+      <objectContribution
+            id="org.eclipse.debug.ui.contextualLaunch.profile"
+            objectClass="java.lang.Object">
+         <action
+               class="org.eclipse.debug.internal.ui.actions.ProfileContextualLaunchAction"
+               enablesFor="+"
+               id="org.eclipse.debug.ui.contextualLaunch.profile.submenu"
+               label="%ProfileContextMenu.label"
+               menubarPath="additions"
+               style="pulldown">
+         </action>
+         <enablement>
+            <or>
+               <and>
+                  <not>
+                     <with
+                           variable="org.eclipse.core.runtime.Platform">
+                        <test
+                              args="org.eclipse.debug.core"
+                              property="org.eclipse.core.runtime.bundleState"
+                              value="ACTIVE">
+                        </test>
+                     </with>
+                  </not>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </and>
+               <and>
+                  <with
+                        variable="org.eclipse.core.runtime.Platform">
+                     <test
+                           args="org.eclipse.debug.core"
+                           property="org.eclipse.core.runtime.bundleState"
+                           value="ACTIVE">
+                     </test>
+                  </with>
+                  <test
+                        property="org.eclipse.debug.core.launchable"
+                        value="profile">
+                  </test>
+               </and>
+            </or>
+         </enablement>
+      </objectContribution>
+      <objectContribution
+            id="org.eclipse.debug.ui.contextualLaunch.debug"
+            objectClass="java.lang.Object">
+         <action
+               class="org.eclipse.debug.internal.ui.actions.DebugContextualLaunchAction"
+               enablesFor="+"
+               id="org.eclipse.debug.ui.contextualLaunch.debug.submenu"
+               label="%DebugContextMenu.label"
+               menubarPath="additions"
+               style="pulldown">
+         </action>
+         <enablement>
+            <or>
+               <and>
+                  <not>
+                     <with
+                           variable="org.eclipse.core.runtime.Platform">
+                        <test
+                              args="org.eclipse.debug.core"
+                              property="org.eclipse.core.runtime.bundleState"
+                              value="ACTIVE">
+                        </test>
+                     </with>
+                  </not>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </and>
+               <and>
+                  <with
+                        variable="org.eclipse.core.runtime.Platform">
+                     <test
+                           args="org.eclipse.debug.core"
+                           property="org.eclipse.core.runtime.bundleState"
+                           value="ACTIVE">
+                     </test>
+                  </with>
+                  <test
+                        property="org.eclipse.debug.core.launchable"
+                        value="debug">
+                  </test>
+               </and>
+            </or>
+         </enablement>
+      </objectContribution>
+      <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"
+               menubarPath="additions"
+               style="pulldown">
+         </action>
+         <enablement>
+            <or>
+               <and>
+                  <not>
+                     <with
+                           variable="org.eclipse.core.runtime.Platform">
+                        <test
+                              args="org.eclipse.debug.core"
+                              property="org.eclipse.core.runtime.bundleState"
+                              value="ACTIVE">
+                        </test>
+                     </with>
+                  </not>
+                  <adapt
+                        type="org.eclipse.core.resources.IResource">
+                  </adapt>
+               </and>
+               <and>
+                  <with
+                        variable="org.eclipse.core.runtime.Platform">
+                     <test
+                           args="org.eclipse.debug.core"
+                           property="org.eclipse.core.runtime.bundleState"
+                           value="ACTIVE">
+                     </test>
+                  </with>
+                  <test
+                        property="org.eclipse.debug.core.launchable"
+                        value="run">
+                  </test>
+               </and>
+            </or>
+         </enablement>
+      </objectContribution>
+      <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>
       <viewerContribution
             targetID="org.eclipse.debug.ui.ExpressionView"
             id="org.eclipse.debug.ui.ExpressionActions">
@@ -1326,272 +1592,6 @@
                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"
-               menubarPath="additions"
-               style="pulldown">
-         </action>
-         <enablement>
-            <or>
-               <and>
-                  <not>
-                     <with
-                           variable="org.eclipse.core.runtime.Platform">
-                        <test
-                              args="org.eclipse.debug.core"
-                              property="org.eclipse.core.runtime.bundleState"
-                              value="ACTIVE">
-                        </test>
-                     </with>
-                  </not>
-                  <adapt
-                        type="org.eclipse.core.resources.IResource">
-                  </adapt>
-               </and>
-               <and>
-                  <with
-                        variable="org.eclipse.core.runtime.Platform">
-                     <test
-                           args="org.eclipse.debug.core"
-                           property="org.eclipse.core.runtime.bundleState"
-                           value="ACTIVE">
-                     </test>
-                  </with>
-                  <test
-                        property="org.eclipse.debug.core.launchable"
-                        value="run">
-                  </test>
-               </and>
-            </or>
-         </enablement>
-      </objectContribution>
-      <objectContribution
-            id="org.eclipse.debug.ui.contextualLaunch.debug"
-            objectClass="java.lang.Object">
-         <action
-               class="org.eclipse.debug.internal.ui.actions.DebugContextualLaunchAction"
-               enablesFor="+"
-               id="org.eclipse.debug.ui.contextualLaunch.debug.submenu"
-               label="%DebugContextMenu.label"
-               menubarPath="additions"
-               style="pulldown">
-         </action>
-         <enablement>
-            <or>
-               <and>
-                  <not>
-                     <with
-                           variable="org.eclipse.core.runtime.Platform">
-                        <test
-                              args="org.eclipse.debug.core"
-                              property="org.eclipse.core.runtime.bundleState"
-                              value="ACTIVE">
-                        </test>
-                     </with>
-                  </not>
-                  <adapt
-                        type="org.eclipse.core.resources.IResource">
-                  </adapt>
-               </and>
-               <and>
-                  <with
-                        variable="org.eclipse.core.runtime.Platform">
-                     <test
-                           args="org.eclipse.debug.core"
-                           property="org.eclipse.core.runtime.bundleState"
-                           value="ACTIVE">
-                     </test>
-                  </with>
-                  <test
-                        property="org.eclipse.debug.core.launchable"
-                        value="debug">
-                  </test>
-               </and>
-            </or>
-         </enablement>
-      </objectContribution>
-      <objectContribution
-            id="org.eclipse.debug.ui.contextualLaunch.profile"
-            objectClass="java.lang.Object">
-         <action
-               class="org.eclipse.debug.internal.ui.actions.ProfileContextualLaunchAction"
-               enablesFor="+"
-               id="org.eclipse.debug.ui.contextualLaunch.profile.submenu"
-               label="%ProfileContextMenu.label"
-               menubarPath="additions"
-               style="pulldown">
-         </action>
-         <enablement>
-            <or>
-               <and>
-                  <not>
-                     <with
-                           variable="org.eclipse.core.runtime.Platform">
-                        <test
-                              args="org.eclipse.debug.core"
-                              property="org.eclipse.core.runtime.bundleState"
-                              value="ACTIVE">
-                        </test>
-                     </with>
-                  </not>
-                  <adapt
-                        type="org.eclipse.core.resources.IResource">
-                  </adapt>
-               </and>
-               <and>
-                  <with
-                        variable="org.eclipse.core.runtime.Platform">
-                     <test
-                           args="org.eclipse.debug.core"
-                           property="org.eclipse.core.runtime.bundleState"
-                           value="ACTIVE">
-                     </test>
-                  </with>
-                  <test
-                        property="org.eclipse.debug.core.launchable"
-                        value="profile">
-                  </test>
-               </and>
-            </or>
-         </enablement>
-      </objectContribution>
-      <viewerContribution
-            id="org.eclipse.debug.ui.memory.memoryBlockTreeViewPane"
-            targetID="org.eclipse.debug.ui.MemoryView.MemoryBlocksTreeViewPane">
-         <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">
-         </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">
-         </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">
-         </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>
-         <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">
-         </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.1.add"
-               label="%AddRenderingAction.name"
-               menubarPath="org.eclipse.debug.ui.memory.renderingviewpane.1.addremove">
-         </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>
-         <action
-               class="org.eclipse.debug.internal.ui.views.memory.renderings.LittleEndianAction"
-               enablesFor="1"
-               helpContextId="LittleEndianAction_context"
-               id="org.eclipse.debug.ui.memory.rendering.LittleEndianAction"
-               label="%LittleEndianActionName"
-               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
-         </action>
-         <action
-               class="org.eclipse.debug.internal.ui.views.memory.renderings.BigEndianAction"
-               enablesFor="1"
-               helpContextId="BigEndianAction_context"
-               id="org.eclipse.debug.ui.memory.rendering.BigEndianAction"
-               label="%BigEndianActionName"
-               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/setEndianessGroup">
-         </action>
-         <action
-               class="org.eclipse.debug.internal.ui.views.memory.renderings.DefaultEndianessAction"
-               enablesFor="1"
-               helpContextId="RestoreDefEndianessAction_context"
-               id="org.eclipse.debug.ui.memory.rendering.DefaultEndianAction"
-               label="%RestoreDefEndianessActionName"
-               menubarPath="org.eclipse.debug.ui.memory.rendering.setendianess/defaultEndianessGroup">
-         </action>
-      </objectContribution>
    </extension>  
    <extension
          point="org.eclipse.ui.elementFactories">