Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis D'Entremont2006-10-23 16:03:47 +0000
committerCurtis D'Entremont2006-10-23 16:03:47 +0000
commit1ffee1b48595c477c75a8591ad7a68a229e46685 (patch)
tree888bfead110c68d621446267ade6c53908045d56
parentf882a3d003c01b6bace40c8bf661cd4b92ef9aff (diff)
downloadeclipse.platform.ua-1ffee1b48595c477c75a8591ad7a68a229e46685.tar.gz
eclipse.platform.ua-1ffee1b48595c477c75a8591ad7a68a229e46685.tar.xz
eclipse.platform.ua-1ffee1b48595c477c75a8591ad7a68a229e46685.zip
161427 Inaccurate extension point schemas with respect to min / max element occurrences
-rw-r--r--org.eclipse.help.base/schema/browser.exsd2
-rw-r--r--org.eclipse.help.base/schema/luceneSearchParticipants.exsd2
-rw-r--r--org.eclipse.help.base/schema/webapp.exsd2
-rw-r--r--org.eclipse.help.ui/schema/searchEngine.exsd22
-rw-r--r--org.eclipse.help/schema/contentProducer.exsd2
-rw-r--r--org.eclipse.help/schema/index.exsd10
-rw-r--r--org.eclipse.help/schema/toc.exsd10
-rw-r--r--org.eclipse.ui.cheatsheets/schema/cheatSheetContent.exsd2
-rw-r--r--org.eclipse.ui.intro/schema/config.exsd4
-rw-r--r--org.eclipse.ui.intro/schema/configExtension.exsd12
10 files changed, 33 insertions, 35 deletions
diff --git a/org.eclipse.help.base/schema/browser.exsd b/org.eclipse.help.base/schema/browser.exsd
index 689f85a12..68da3f85e 100644
--- a/org.eclipse.help.base/schema/browser.exsd
+++ b/org.eclipse.help.base/schema/browser.exsd
@@ -47,7 +47,7 @@
<element name="browser">
<complexType>
<sequence>
- <element ref="factoryclass"/>
+ <element ref="factoryclass" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="id" type="string" use="required">
<annotation>
diff --git a/org.eclipse.help.base/schema/luceneSearchParticipants.exsd b/org.eclipse.help.base/schema/luceneSearchParticipants.exsd
index a3393100a..26192ac35 100644
--- a/org.eclipse.help.base/schema/luceneSearchParticipants.exsd
+++ b/org.eclipse.help.base/schema/luceneSearchParticipants.exsd
@@ -23,7 +23,7 @@ Search participants are associated with the plug-in the extension appears in. In
<element name="extension">
<complexType>
- <choice>
+ <choice minOccurs="1" maxOccurs="unbounded">
<element ref="searchParticipant"/>
<element ref="binding"/>
</choice>
diff --git a/org.eclipse.help.base/schema/webapp.exsd b/org.eclipse.help.base/schema/webapp.exsd
index 3f180c87f..68f695787 100644
--- a/org.eclipse.help.base/schema/webapp.exsd
+++ b/org.eclipse.help.base/schema/webapp.exsd
@@ -13,7 +13,7 @@
<element name="extension">
<complexType>
- <sequence>
+ <sequence minOccurs="1" maxOccurs="unbounded">
<element ref="webapp"/>
</sequence>
<attribute name="point" type="string" use="required">
diff --git a/org.eclipse.help.ui/schema/searchEngine.exsd b/org.eclipse.help.ui/schema/searchEngine.exsd
index 1503612f3..0a6955f53 100644
--- a/org.eclipse.help.ui/schema/searchEngine.exsd
+++ b/org.eclipse.help.ui/schema/searchEngine.exsd
@@ -20,10 +20,10 @@ of a search engine that can be individually modified. Products can preconfigure
<element name="extension">
<complexType>
- <sequence>
- <element ref="engineType" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="engine" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element ref="engine"/>
+ <element ref="engineType"/>
+ </choice>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
@@ -303,13 +303,13 @@ of a search engine that can be individually modified. Products can preconfigure
engineTypeId=&quot;org.eclipse.help.ui.web&quot;
id=&quot;org.eclipse.sdk.Eclipse&quot;
label=&quot;%search.Eclipse.label&quot;&gt;
- &lt;description&gt;
- %search.Eclipse.desc
- &lt;/description&gt;
- &lt;param
- name=&quot;url&quot;
- value=&quot;http://eclipse.org/search/search.cgi?q={expression}&amp;amp;ul=&amp;amp;ps=20&amp;amp;m=all&quot;&gt;
- &lt;/param&gt;
+ &lt;description&gt;
+ %search.Eclipse.desc
+ &lt;/description&gt;
+ &lt;param
+ name=&quot;url&quot;
+ value=&quot;http://eclipse.org/search/search.cgi?q={expression}&amp;amp;ul=&amp;amp;ps=20&amp;amp;m=all&quot;&gt;
+ &lt;/param&gt;
&lt;/engine&gt;
&lt;/extension&gt;
&lt;/pre&gt;
diff --git a/org.eclipse.help/schema/contentProducer.exsd b/org.eclipse.help/schema/contentProducer.exsd
index b321b2301..23567ad54 100644
--- a/org.eclipse.help/schema/contentProducer.exsd
+++ b/org.eclipse.help/schema/contentProducer.exsd
@@ -12,7 +12,7 @@
<element name="extension">
<complexType>
- <choice>
+ <choice minOccurs="1" maxOccurs="unbounded">
<element ref="contentProducer"/>
<element ref="binding"/>
</choice>
diff --git a/org.eclipse.help/schema/index.exsd b/org.eclipse.help/schema/index.exsd
index da3055413..6a7f7c8bd 100644
--- a/org.eclipse.help/schema/index.exsd
+++ b/org.eclipse.help/schema/index.exsd
@@ -12,12 +12,10 @@
<element name="extension">
<complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <choice>
- <element ref="index"/>
- <element ref="indexProvider"/>
- </choice>
- </sequence>
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element ref="index"/>
+ <element ref="indexProvider"/>
+ </choice>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
diff --git a/org.eclipse.help/schema/toc.exsd b/org.eclipse.help/schema/toc.exsd
index c29aa2941..94660d3c5 100644
--- a/org.eclipse.help/schema/toc.exsd
+++ b/org.eclipse.help/schema/toc.exsd
@@ -26,11 +26,11 @@ point and specify TOC file(s).&lt;/li&gt;
<element name="extension">
<complexType>
- <sequence>
- <element ref="toc" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="tocProvider" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="index" minOccurs="0" maxOccurs="1"/>
- </sequence>
+ <choice minOccurs="1" maxOccurs="unbounded">
+ <element ref="toc"/>
+ <element ref="tocProvider"/>
+ <element ref="index"/>
+ </choice>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>
diff --git a/org.eclipse.ui.cheatsheets/schema/cheatSheetContent.exsd b/org.eclipse.ui.cheatsheets/schema/cheatSheetContent.exsd
index 61d9e9ba9..151e70305 100644
--- a/org.eclipse.ui.cheatsheets/schema/cheatSheetContent.exsd
+++ b/org.eclipse.ui.cheatsheets/schema/cheatSheetContent.exsd
@@ -16,7 +16,7 @@ Cheat sheets may optionally specify a description subelement whose body should c
<element name="extension">
<complexType>
- <choice>
+ <choice minOccurs="1" maxOccurs="unbounded">
<element ref="category"/>
<element ref="cheatsheet"/>
<element ref="taskEditor"/>
diff --git a/org.eclipse.ui.intro/schema/config.exsd b/org.eclipse.ui.intro/schema/config.exsd
index 3d9888925..a7de6e753 100644
--- a/org.eclipse.ui.intro/schema/config.exsd
+++ b/org.eclipse.ui.intro/schema/config.exsd
@@ -17,8 +17,8 @@ The intros are organized into pages which usually reflect a particular category
<element name="extension">
<complexType>
- <sequence>
- <element ref="config" minOccurs="1" maxOccurs="unbounded"/>
+ <sequence minOccurs="1" maxOccurs="unbounded">
+ <element ref="config"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
diff --git a/org.eclipse.ui.intro/schema/configExtension.exsd b/org.eclipse.ui.intro/schema/configExtension.exsd
index 5d6dc75b2..c7b4de96e 100644
--- a/org.eclipse.ui.intro/schema/configExtension.exsd
+++ b/org.eclipse.ui.intro/schema/configExtension.exsd
@@ -14,12 +14,12 @@
<element name="extension">
<complexType>
- <sequence>
- <element ref="configExtension" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="standbyContentPart" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="action" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="theme" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="configExtension"/>
+ <element ref="standbyContentPart"/>
+ <element ref="action"/>
+ <element ref="theme"/>
+ </choice>
<attribute name="point" type="string" use="required">
<annotation>
<documentation>

Back to the top