Google Git
Sign in
eclipse/platform/eclipse.platform.common/refs/heads/R3_7_maintenance^!/.
commit
e5cb8220b7eca6076d62e7ea35fd9958dfe3988d
[log] [tgz]
author
Dani Megert <dmegert>
Thu Feb 16 13:51:46 2012 +0100
committer
Dani Megert <dmegert>
Thu Feb 16 13:51:46 2012 +0100
tree
dfc6249b787b92a9a0346c5af918641138cea51d
parent
807df24c0fe2e0424354aa8e3f78c26b68d509f4 [diff]
Fixed bug 251776: [Content Type] Need a better way to arbitrate content
types and/or editor associations
diff --git a/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF b/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
index 6fe0a97..90ec0e0 100644
--- a/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.platform.doc.isv; singleton:=true
-Bundle-Version: 3.7.2.qualifier
+Bundle-Version: 3.7.3.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"

diff --git a/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html b/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html
index 8a50cc3..c4a43ae 100644
--- a/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html
+++ b/bundles/org.eclipse.platform.doc.isv/reference/extension-points/index.html

@@ -3,7 +3,7 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <head>
     <meta name="copyright" content=
-    "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
+    "Copyright (c) IBM Corporation and others 2000, 2012. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>
       Platform Extension Points
@@ -280,6 +280,10 @@
       <li>
 
         <a href=
+        "org_eclipse_ui_ide_editorAssociationOverride.html">org.eclipse.ui.ide.editorAssociationOverride</a>
+      </li>
+      <li>
+        <a href=
         "org_eclipse_ui_ide_filesystemSupport.html">org.eclipse.ui.ide.filesystemSupport</a>
       </li>
       <li>

diff --git a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml
index 294ba27..b8ab731 100644
--- a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml
+++ b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml

@@ -437,6 +437,7 @@
        <topic label="org.eclipse.ui.fontDefinitions" href="reference/extension-points/org_eclipse_ui_fontDefinitions.html"/>
 	   <topic label="org.eclipse.ui.handlers" href="reference/extension-points/org_eclipse_ui_handlers.html"/>
        <topic label="org.eclipse.ui.helpSupport" href="reference/extension-points/org_eclipse_ui_helpSupport.html"/>
+       <topic label="org.eclipse.ui.ide.editorAssociationOverride" href="reference/extension-points/org_eclipse_ui_ide_editorAssociationOverride.html"/>
        <topic label="org.eclipse.ui.ide.filesystemSupport" href="reference/extension-points/org_eclipse_ui_ide_filesystemSupport.html"/>
        <topic label="org.eclipse.ui.ide.markerHelp" href="reference/extension-points/org_eclipse_ui_ide_markerHelp.html"/>
        <topic label="org.eclipse.ui.ide.markerImageProviders" href="reference/extension-points/org_eclipse_ui_ide_markerImageProviders.html"/>