From 53ae9faa5d654f6449f91b244a9604d415cc6021 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mika=C3=ABl=20Barbero?= <mikael.barbero@obeo.fr>
Date: Wed, 13 Mar 2013 17:22:39 +0100
Subject: [PATCH] add content type binding for default emf compare content
 merge viewer

---
 plugins/org.eclipse.emf.compare.ide.ui/plugin.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
index 246b79d18..fa783a6e6 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
@@ -18,7 +18,7 @@
          point="org.eclipse.compare.structureMergeViewers">
       <viewer
             class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.EMFCompareStructureMergeViewerCreator"
-            extensions="xmi,NODE_TYPE__EMF_EOBJECT,NODE_TYPE__EMF_RESOURCE,NODE_TYPE__EMF_RESOURCESET"
+            extensions="NODE_TYPE__EMF_EOBJECT,NODE_TYPE__EMF_RESOURCE,NODE_TYPE__EMF_RESOURCESET"
             id="org.eclipse.emf.compare.ide.ui.internal.structureMergeViewer"
             label="EMFCompare Structure Merge Viewer">
       </viewer>
@@ -51,6 +51,14 @@
             id="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.text.EMFCompareTextContentMergeViewer"
             label="EMFCompare Text Merge Viewer">
       </viewer>
+      <contentTypeBinding
+            contentTypeId="org.eclipse.emf.ecore.xmi"
+            contentMergeViewerId="org.eclipse.emf.compare.ide.ui.internal.EObjectContentMergeViewer">
+      </contentTypeBinding>
+      <contentTypeBinding
+            contentTypeId="org.eclipse.emf.compare.content.type"
+            contentMergeViewerId="org.eclipse.emf.compare.ide.ui.internal.EObjectContentMergeViewer">
+      </contentTypeBinding>
    </extension>
    <extension
          point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-- 
2.11.4.GIT