Bug 560011 - Opening patch file does not use the generic editor

Bind patch and diff files to generic editor.

Change-Id: I7236fafd158d6b8cd6181f1a0b7c7d8cc3776c76
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.team.genericeditor.diff.extension/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.genericeditor.diff.extension/META-INF/MANIFEST.MF
index 89e3b10..1c1d71e 100644
--- a/bundles/org.eclipse.team.genericeditor.diff.extension/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.team.genericeditor.diff.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.genericeditor.diff.extension;singleton:=true
-Bundle-Version: 1.0.500.qualifier
+Bundle-Version: 1.0.600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -11,7 +11,8 @@
  org.eclipse.core.filebuffers,
  org.eclipse.jface.text;bundle-version="[3.11.100,4.0.0)",
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
- org.eclipse.core.contenttype
+ org.eclipse.core.contenttype,
+ org.eclipse.ui.genericeditor
 Export-Package: org.eclipse.team.internal.genericeditor.diff.extension.partitioner;x-internal:=true,
  org.eclipse.team.internal.genericeditor.diff.extension.presentation;x-internal:=true,
  org.eclipse.team.internal.genericeditor.diff.extension.rules;x-internal:=true
diff --git a/bundles/org.eclipse.team.genericeditor.diff.extension/plugin.xml b/bundles/org.eclipse.team.genericeditor.diff.extension/plugin.xml
index 12013bc..ddb35fe 100644
--- a/bundles/org.eclipse.team.genericeditor.diff.extension/plugin.xml
+++ b/bundles/org.eclipse.team.genericeditor.diff.extension/plugin.xml
@@ -19,6 +19,12 @@
             contentType="org.eclipse.team.genericeditor.diff.extension.patch">
       </presentationReconciler>
    </extension>
+   <extension point="org.eclipse.ui.editors">
+		<editorContentTypeBinding
+    		contentTypeId="org.eclipse.team.genericeditor.diff.extension.patch"
+    		editorId="org.eclipse.ui.genericeditor.GenericEditor">
+  		</editorContentTypeBinding>
+	</extension>
    <extension
          point="org.eclipse.core.filebuffers.documentSetup">
       <participant
@@ -31,7 +37,7 @@
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
             base-type="org.eclipse.core.runtime.text"
-            file-extensions="diff,patch"
+            file-extensions="patch,diff"
             id="org.eclipse.team.genericeditor.diff.extension.patch"
             name="%patch_ContentTypeName"
             priority="normal">
diff --git a/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml b/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml
index 45e399a..3a1fe5f 100644
--- a/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml
+++ b/bundles/org.eclipse.team.genericeditor.diff.extension/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.genericeditor.diff.extension</artifactId>
-  <version>1.0.500-SNAPSHOT</version>
+  <version>1.0.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>