Bug 520205 - Associating content type with external editorI20170727-0610

The external editors are not pre-existing in the editor registry and
must be added to the registry when loading or the association.

Change-Id: Ia93b06cf3fbdf1cc39592ebc02ac8832985f3dce
Signed-off-by: Mickael Istria <mistria@redhat.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
index 9cba663725d..4187b87d316 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/EditorRegistry.java
@@ -747,6 +747,11 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, IEx
 
 		for (IMemento childMemento : memento.getChildren(IWorkbenchConstants.TAG_INFO)) {
             List<IEditorDescriptor> editors = getEditorDescriptors(childMemento.getChildren(IWorkbenchConstants.TAG_EDITOR), editorTable);
+			editors.forEach(editor -> {
+				if (!mapIDtoEditor.containsKey(editor.getId())) {
+					mapIDtoEditor.put(editor.getId(), editor);
+				}
+			});
 			String contentTypeId = childMemento.getString(IWorkbenchConstants.TAG_CONTENT_TYPE);
 			if (contentTypeId != null) {
 				IContentType contentType = Platform.getContentTypeManager().getContentType(contentTypeId);
@@ -1629,6 +1634,9 @@ public class EditorRegistry extends EventManager implements IEditorRegistry, IEx
 		if (!this.contentTypeToEditorMappingsFromUser.containsKey(contentType)) {
 			this.contentTypeToEditorMappingsFromUser.put(contentType, new LinkedHashSet<>());
 		}
+		if (!mapIDtoEditor.containsKey(selectedEditor.getId())) {
+			mapIDtoEditor.put(selectedEditor.getId(), selectedEditor);
+		}
 		this.contentTypeToEditorMappingsFromUser.get(contentType).add(selectedEditor);
 		saveAssociations();
 	}