Bug 200655 – [Help] Only 1 IHelpContentProducer contribution per plugin allowed. Request for more.

2 files changed, 15 insertions, 5 deletions

diff --git a/org.eclipse.help/schema/contentProducer.exsd b/org.eclipse.help/schema/contentProducer.exsd
index 7a6237f02..947626ecd 100644
--- a/org.eclipse.help/schema/contentProducer.exsd
+++ b/org.eclipse.help/schema/contentProducer.exsd
@@ -44,6 +44,11 @@
    </element>
 
    <element name="contentProducer">
+      <annotation>
+         <documentation>
+            A binding to a content producer class which will be used to produce content for all help documents in this plugin. A plugin may not contain more than one binding or contentProducer and may not contain both.
+         </documentation>
+      </annotation>
       <complexType>
          <sequence minOccurs="0" maxOccurs="1">
             <element ref="producer"/>
@@ -99,6 +104,11 @@
    </element>
 
    <element name="binding">
+      <annotation>
+         <documentation>
+            A binding to a content producer defined in another plugin which will be used to produce content for all help documents in this plugin. A plugin may not contain more than one binding or contentProducer and may not contain both.
+         </documentation>
+      </annotation>
       <complexType>
          <attribute name="producerId" type="string" use="required">
             <annotation>
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java b/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java
index 95c4ff0d1..6d5eb06ac 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java
@@ -191,18 +191,18 @@ public class ResourceLocator {
 		Set logged = new HashSet();
 		Set keys = new HashSet();
 		for (int i = 0; i < elements.length; i++) {
-			IConfigurationElement element = elements[i];			
-			String extensionName = element.getName();
+			IConfigurationElement element = elements[i];	
 			String pluginName = element.getContributor().getName();
-			String key = extensionName + '/' + pluginName;
+			String key = pluginName;
 			if (logged.contains(key)) {
 				continue;
 			}
 			if (keys.contains(key)) {
 				HelpPlugin.logWarning(
 						"Extension " + CONTENTPRODUCER_XP_FULLNAME + //$NON-NLS-1$
-						"in " + pluginName + " contains multiple <" //$NON-NLS-1$ //$NON-NLS-2$
-						+ extensionName + "> elements. All but the first have been ignored."); //$NON-NLS-1$
+						"in " + pluginName + " contains more than  <" //$NON-NLS-1$ //$NON-NLS-2$
+						+ CONTENTPRODUCER_XP_NAME + "> or <" //$NON-NLS-1$
+						+ BINDING + "> element. All but the first have been ignored."); //$NON-NLS-1$
 				logged.add(key);
 			} else {
 				keys.add(key);