Revert "Improve order of menu entries in "Replace With" menu"

This reverts commit 17f9b50fc7b1d351cd615cb87f33dfc52a4bd6dc.

Using the org.eclipse.ui.menus extension point instead of
org.eclipse.ui.popupMenus triggers bug 422909 in Platform UI. The effect
is that the editor context menu does not have the menu EGit entries.

Bug: 422907
Change-Id: I380b547167d4fee2586c8037a9ee02016104c4c1
Signed-off-by: Robin Stocker <robin@nibor.org>

1 files changed, 41 insertions, 93 deletions

diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index d075f8827e..5e835a11de 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -77,6 +77,33 @@
                label="%AddToIndexAction_label"
                menubarPath="team.main/group8"/>
          <action
+               class="org.eclipse.egit.ui.internal.actions.DiscardChangesAction"
+               id="org.eclipse.egit.ui.internal.actions.DiscardChangesAction"
+               label="%DiscardChangesAction_label"
+               menubarPath="replaceWithMenu/gitReplaceWithGroup"/>
+         <action
+               class="org.eclipse.egit.ui.internal.actions.ReplaceWithRefAction"
+               id="org.eclipse.egit.ui.internal.actions.ReplaceWithRefAction"
+               label="%ReplaceWithRefAction_label"
+               menubarPath="replaceWithMenu/gitReplaceWithGroup"/>
+         <action
+               class="org.eclipse.egit.ui.internal.actions.ReplaceWithPreviousAction"
+               enablesFor="1"
+               id="org.eclipse.egit.ui.internal.actions.ReplaceWithPreviousAction"
+               label="%replaceWithPreviousVersionAction.label"
+               menubarPath="replaceWithMenu/gitReplaceWithGroup">
+         </action>
+         <action
+               class="org.eclipse.egit.ui.internal.actions.ReplaceWithHeadAction"
+               id="org.eclipse.egit.ui.internal.actions.ReplaceWithHeadAction"
+               label="%ReplaceWithHeadAction_label"
+               menubarPath="replaceWithMenu/gitReplaceWithGroup"/>
+         <action
+               class="org.eclipse.egit.ui.internal.actions.ReplaceWithCommitAction"
+               id="org.eclipse.egit.ui.internal.actions.ReplaceWithCommitAction"
+               label="%ReplaceWithCommitAction_label"
+               menubarPath="replaceWithMenu/gitReplaceWithGroup"/>
+         <action
                class="org.eclipse.egit.ui.internal.actions.ApplyPatchAction"
                definitionId="org.eclipse.egit.ui.team.ApplyPatch"
                enablesFor="*"
@@ -301,22 +328,6 @@
          </and>
       </definition>
       <definition
-            id="org.eclipse.egit.ui.gitResource">
-         <and>
-            <count
-                  value="1">
-            </count>
-            <iterate>
-               <adapt
-                     type="org.eclipse.core.resources.IResource">
-                  <test
-                        property="GitResource.isShared">
-                  </test>
-               </adapt>
-            </iterate>
-         </and>
-      </definition>
-      <definition
             id="org.eclipse.egit.ui.gitResources">
          <and>
             <count
@@ -4291,9 +4302,19 @@
                   style="push">
                <visibleWhen
                      checkEnabled="false">
-                  <reference
-                        definitionId="org.eclipse.egit.ui.gitResource">
-                  </reference>
+                  <and>
+                     <count
+                           value="1">
+                     </count>
+                     <iterate>
+                        <adapt
+                              type="org.eclipse.core.resources.IResource">
+                           <test
+                                 property="GitResource.isShared">
+                           </test>
+                        </adapt>
+                     </iterate>
+                  </and>
                </visibleWhen>
             </command>
             <separator
@@ -4323,73 +4344,6 @@
                </visibleWhen>
             </command>
          </menu>
-         <menu
-               id="replaceWithMenu"
-               label="%ReplaceWithMenu.label">
-            <separator
-                  name="gitReplaceWithGroup"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.egit.ui.team.ReplaceWithHead"
-                  label="%ReplaceWithHeadAction_label"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="org.eclipse.egit.ui.gitResources">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="org.eclipse.egit.ui.team.Discard"
-                  label="%DiscardChangesAction_label"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="org.eclipse.egit.ui.gitResources">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="org.eclipse.egit.ui.team.ReplaceWithPrevious"
-                  label="%replaceWithPreviousVersionAction.label"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="org.eclipse.egit.ui.gitResource">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <separator
-                  name="gitReplaceWithGroup2"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.egit.ui.team.ReplaceWithRef"
-                  label="%ReplaceWithRefAction_label"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="org.eclipse.egit.ui.gitResources">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="org.eclipse.egit.ui.team.ReplaceWithCommit"
-                  label="%ReplaceWithCommitAction_label"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="false">
-                  <reference
-                        definitionId="org.eclipse.egit.ui.gitResources">
-                  </reference>
-               </visibleWhen>
-            </command>
-         </menu>
       </menuContribution>
       <menuContribution
          locationURI="popup:#AbstractTextEditorRulerContext?after=QuickDiff.Toggle">
@@ -5119,13 +5073,7 @@
             id="org.eclipse.egit.ui.team.ReplaceWithRef"
             name="%ReplaceWithRefCommand.name">
       </command>
-      <command
-            categoryId="org.eclipse.egit.ui.commandCategory"
-            defaultHandler="org.eclipse.egit.ui.internal.actions.ReplaceWithPreviousActionHandler"
-            id="org.eclipse.egit.ui.team.ReplaceWithPrevious"
-            name="%ReplaceWithPreviousCommand.name">
-      </command>
-      <command
+            <command
             categoryId="org.eclipse.egit.ui.commandCategory"
             defaultHandler="org.eclipse.egit.ui.internal.actions.IgnoreActionHandler"
             id="org.eclipse.egit.ui.team.Ignore"