From b5b679b3f5d73e896e306f3ca81aa569a8f2fc1b Mon Sep 17 00:00:00 2001
From: Thomas Wolf <thomas.wolf@paranor.ch>
Date: Sun, 11 Dec 2016 21:39:12 +0100
Subject: [PATCH] Enable the text editor toolbar items for DiffEditorPage

A TextEditor provides a couple of items in an action set in the global
Eclipse toolbar: buttons for block selection, word wrap, showing
whitespace, and navigation between annotations. As the DiffEditorPage
is a real TextEditor now, enable those.

* Add an "action set part association" in plugin.xml to get those
  buttons at all when the CommitEditor is active.
* Propagate the global action contributions from the nested editor's
  SubActionBars to those of the CommitEditor.

Change-Id: I516b5609906aefb6840bc9f4f4e95d92fafc1590
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
---
 org.eclipse.egit.ui/plugin.xml                           |  9 +++++++++
 .../eclipse/egit/ui/internal/commit/CommitEditor.java    |  9 ++++-----
 .../commit/CommitEditorActionBarContributor.java         | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 63ff44dcb..96f7286c8 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -5989,6 +5989,15 @@
       </editor>
    </extension>
    <extension
+         point="org.eclipse.ui.actionSetPartAssociations">
+      <actionSetPartAssociation
+            targetID="org.eclipse.ui.edit.text.actionSet.presentation">
+         <part
+               id="org.eclipse.egit.ui.commitEditor">
+         </part>
+      </actionSetPartAssociation>
+   </extension>
+   <extension
          point="org.eclipse.ui.editors.templates">
       <resolver
             class="org.eclipse.egit.ui.internal.variables.GitTemplateVariableResolver"
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java
index 540dfabba..a307ef7eb 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java
@@ -337,13 +337,12 @@ public class CommitEditor extends SharedHeaderFormEditor implements
 		return index;
 	}
 
-	/**
-	 * @see org.eclipse.ui.forms.editor.SharedHeaderFormEditor#setFocus()
-	 * @since 2.0
-	 */
 	@Override
 	public void setFocus() {
-		commitPage.getPartControl().setFocus();
+		IFormPage currentPage = getActivePageInstance();
+		if (currentPage != null) {
+			currentPage.setFocus();
+		}
 	}
 
 	private void addContributions(IToolBarManager toolBarManager) {
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorActionBarContributor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorActionBarContributor.java
index 1a8ea575d..a5bc0f1aa 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorActionBarContributor.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditorActionBarContributor.java
@@ -8,6 +8,9 @@
  *******************************************************************************/
 package org.eclipse.egit.ui.internal.commit;
 
+import java.util.Map;
+
+import org.eclipse.jface.action.IAction;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IEditorActionBarContributor;
 import org.eclipse.ui.IEditorPart;
@@ -69,8 +72,21 @@ public class CommitEditorActionBarContributor
 	}
 
 	private void updateTextEditorContributions(boolean activate) {
+		IActionBars rootBars = getActionBars();
+		rootBars.clearGlobalActionHandlers();
 		if (activate) {
 			textEditorBars.activate();
+			Map<?, ?> handlers = textEditorBars.getGlobalActionHandlers();
+			if (handlers != null) {
+				for (Map.Entry<?, ?> entry : handlers.entrySet()) {
+					Object key = entry.getKey();
+					Object value = entry.getValue();
+					if (key instanceof String && value instanceof IAction) {
+						rootBars.setGlobalActionHandler((String) key,
+								(IAction) value);
+					}
+				}
+			}
 		} else {
 			textEditorBars.deactivate();
 		}
-- 
2.11.4.GIT