From 4396561a4715694bfecab01e476acdd927305663 Mon Sep 17 00:00:00 2001
From: Lars Vogel <Lars.Vogel@vogella.com>
Date: Fri, 12 Jun 2026 20:51:56 +0200
Subject: [PATCH] Update stale references to removed runtime contentTypes point

The org.eclipse.core.runtime.contentTypes extension point was removed, but
these references still pointed at it. Point the content describer Javadocs
at the replacement org.eclipse.core.contenttype.contentTypes point and drop
the stale reference topic from the unused help test fixtures.
---
 .../org/eclipse/core/internal/content/XMLContentDescriber.java  | 2 +-
 .../eclipse/core/runtime/content/BinarySignatureDescriber.java  | 2 +-
 .../org/eclipse/core/runtime/content/XMLContentDescriber.java   | 2 +-
 .../core/runtime/content/XMLRootElementContentDescriber.java    | 2 +-
 .../core/runtime/content/XMLRootElementContentDescriber2.java   | 2 +-
 ua/org.eclipse.ua.tests/data/help/dynamic/toc.xml               | 1 -
 ua/org.eclipse.ua.tests/data/help/dynamic/toc_expected.txt      | 1 -
 .../org.eclipse.platform.doc.isv/topics_Reference.xml           | 1 -
 8 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java
index 34763a9c2b7..c500771da09 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java
+++ b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/internal/content/XMLContentDescriber.java
@@ -36,7 +36,7 @@
  *                Clients should use it to provide their own XML-based
  *                describers that can be referenced by the "describer"
  *                configuration element in extensions to the
- *                <code>org.eclipse.core.runtime.contentTypes</code> extension
+ *                <code>org.eclipse.core.contenttype.contentTypes</code> extension
  *                point.
  *
  * @see org.eclipse.core.runtime.content.IContentDescriber
diff --git a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java
index ebd9ee3da74..7c2095d1f95 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java
+++ b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/BinarySignatureDescriber.java
@@ -47,7 +47,7 @@
  * <p>
  * This class is not intended to be subclassed or instantiated by clients,
  * only to be referenced by the "describer" configuration element in
- * extensions to the <code>org.eclipse.core.runtime.contentTypes</code>
+ * extensions to the <code>org.eclipse.core.contenttype.contentTypes</code>
  * extension point.
  * </p>
  *
diff --git a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java
index 2890663479f..da079cee6fa 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java
+++ b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLContentDescriber.java
@@ -41,7 +41,7 @@
  *                Clients should use it to provide their own XML-based
  *                describers that can be referenced by the "describer"
  *                configuration element in extensions to the
- *                <code>org.eclipse.core.runtime.contentTypes</code> extension
+ *                <code>org.eclipse.core.contenttype.contentTypes</code> extension
  *                point.
  * @see org.eclipse.core.runtime.content.IContentDescriber
  * @see org.eclipse.core.runtime.content.XMLRootElementContentDescriber2
diff --git a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java
index d86a3319fde..9d925dfab32 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java
+++ b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber.java
@@ -33,7 +33,7 @@
  * <p>
  * This class is not intended to be subclassed or instantiated by clients,
  * only to be referenced by the "describer" configuration element in
- * extensions to the <code>org.eclipse.core.runtime.contentTypes</code>
+ * extensions to the <code>org.eclipse.core.contenttype.contentTypes</code>
  * extension point.
  * </p>
  *
diff --git a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java
index 94b658aac2c..6e348acd905 100644
--- a/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java
+++ b/runtime/bundles/org.eclipse.core.contenttype/src/org/eclipse/core/runtime/content/XMLRootElementContentDescriber2.java
@@ -61,7 +61,7 @@
  * <p>
  * This class is not intended to be subclassed or instantiated by clients,
  * only to be referenced by the "describer" configuration element in
- * extensions to the <code>org.eclipse.core.runtime.contentTypes</code>
+ * extensions to the <code>org.eclipse.core.contenttype.contentTypes</code>
  * extension point.
  * </p>
  *
diff --git a/ua/org.eclipse.ua.tests/data/help/dynamic/toc.xml b/ua/org.eclipse.ua.tests/data/help/dynamic/toc.xml
index 52f8e9ceb87..9bca95e56bd 100644
--- a/ua/org.eclipse.ua.tests/data/help/dynamic/toc.xml
+++ b/ua/org.eclipse.ua.tests/data/help/dynamic/toc.xml
@@ -437,7 +437,6 @@
        <topic label="org.eclipse.core.resources.teamHook" href="reference/extension-points/org_eclipse_core_resources_teamHook.html"/>
        <topic label="org.eclipse.core.runtime.adapters" href="reference/extension-points/org_eclipse_core_runtime_adapters.html"/>
        <topic label="org.eclipse.core.runtime.applications" href="reference/extension-points/org_eclipse_core_runtime_applications.html"/>
-       <topic label="org.eclipse.core.runtime.contentTypes" href="reference/extension-points/org_eclipse_core_runtime_contentTypes.html"/>
        <topic label="org.eclipse.core.runtime.preferences" href="reference/extension-points/org_eclipse_core_runtime_preferences.html"/>
        <topic label="org.eclipse.core.runtime.products" href="reference/extension-points/org_eclipse_core_runtime_products.html"/>
        <topic label="org.eclipse.core.variables.dynamicVariables" href="reference/extension-points/org_eclipse_core_variables_dynamicVariables.html"/>
diff --git a/ua/org.eclipse.ua.tests/data/help/dynamic/toc_expected.txt b/ua/org.eclipse.ua.tests/data/help/dynamic/toc_expected.txt
index 5989d566ad1..e9b75ec250f 100644
--- a/ua/org.eclipse.ua.tests/data/help/dynamic/toc_expected.txt
+++ b/ua/org.eclipse.ua.tests/data/help/dynamic/toc_expected.txt
@@ -424,7 +424,6 @@
        <topic href="reference/extension-points/org_eclipse_core_resources_teamHook.html" label="org.eclipse.core.resources.teamHook"/>
        <topic href="reference/extension-points/org_eclipse_core_runtime_adapters.html" label="org.eclipse.core.runtime.adapters"/>
        <topic href="reference/extension-points/org_eclipse_core_runtime_applications.html" label="org.eclipse.core.runtime.applications"/>
-       <topic href="reference/extension-points/org_eclipse_core_runtime_contentTypes.html" label="org.eclipse.core.runtime.contentTypes"/>
        <topic href="reference/extension-points/org_eclipse_core_runtime_preferences.html" label="org.eclipse.core.runtime.preferences"/>
        <topic href="reference/extension-points/org_eclipse_core_runtime_products.html" label="org.eclipse.core.runtime.products"/>
        <topic href="reference/extension-points/org_eclipse_core_variables_dynamicVariables.html" label="org.eclipse.core.variables.dynamicVariables"/>
diff --git a/ua/org.eclipse.ua.tests/data/help/performance/org.eclipse.platform.doc.isv/topics_Reference.xml b/ua/org.eclipse.ua.tests/data/help/performance/org.eclipse.platform.doc.isv/topics_Reference.xml
index a3e25754d7e..5665191e382 100644
--- a/ua/org.eclipse.ua.tests/data/help/performance/org.eclipse.platform.doc.isv/topics_Reference.xml
+++ b/ua/org.eclipse.ua.tests/data/help/performance/org.eclipse.platform.doc.isv/topics_Reference.xml
@@ -213,7 +213,6 @@
        <topic label="org.eclipse.core.resources.teamHook" href="reference/extension-points/org_eclipse_core_resources_teamHook.html"/>
        <topic label="org.eclipse.core.runtime.adapters" href="reference/extension-points/org_eclipse_core_runtime_adapters.html"/>
        <topic label="org.eclipse.core.runtime.applications" href="reference/extension-points/org_eclipse_core_runtime_applications.html"/>
-       <topic label="org.eclipse.core.runtime.contentTypes" href="reference/extension-points/org_eclipse_core_runtime_contentTypes.html"/>
        <topic label="org.eclipse.core.runtime.preferences" href="reference/extension-points/org_eclipse_core_runtime_preferences.html"/>
        <topic label="org.eclipse.core.runtime.products" href="reference/extension-points/org_eclipse_core_runtime_products.html"/>
        <topic label="org.eclipse.core.variables.dynamicVariables" href="reference/extension-points/org_eclipse_core_variables_dynamicVariables.html"/>