summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-04-12 11:47:15 (EDT)
committerpelder2007-04-12 11:47:15 (EDT)
commit1c9e5802c30a5da51a5cb114ea7aaa23ae2492be (patch)
tree2bb26c334753c29e3917860da7cd1e36adcca9e3
parent8c38c593e191974c53192db2011256fea881b95b (diff)
downloadorg.eclipse.jet-1c9e5802c30a5da51a5cb114ea7aaa23ae2492be.zip
org.eclipse.jet-1c9e5802c30a5da51a5cb114ea7aaa23ae2492be.tar.gz
org.eclipse.jet-1c9e5802c30a5da51a5cb114ea7aaa23ae2492be.tar.bz2
[178358] Correct cardinalities on extension point schema declarations. Eclipse 3.3 is more strict in detecting and enforcing these.
-rw-r--r--doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_modelLoaders.html4
-rw-r--r--doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_tagLibraries.html12
-rw-r--r--plugins/org.eclipse.jet/.cvsignore1
-rw-r--r--plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs4
-rw-r--r--plugins/org.eclipse.jet/plugin.xml6
-rw-r--r--plugins/org.eclipse.jet/schema/modelLoaders.exsd6
-rw-r--r--plugins/org.eclipse.jet/schema/tagLibraries.exsd12
8 files changed, 33 insertions, 24 deletions
diff --git a/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_modelLoaders.html b/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_modelLoaders.html
index 835d85c..e0ce113 100644
--- a/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_modelLoaders.html
+++ b/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_modelLoaders.html
@@ -15,13 +15,13 @@
<p>
<h6 class=CaptionFigColumn id=header>Description: </h6>Define how models consumed by JET transformations and the JET &lt;c:load&gt; tag are loaded from the file system.</p>
<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> ((<a href="#e.loader">loader</a> | <a href="#e.defaultTypeLoader">defaultTypeLoader</a> | <a href="#e.loadableType">loadableType</a>))&gt;</p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> ((<a href="#e.loader">loader</a> | <a href="#e.defaultTypeLoader">defaultTypeLoader</a> | <a href="#e.loadableType">loadableType</a>)+)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST extension</p>
<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
<p></p>
<ul class=ConfigMarkup id=attlistDesc>
</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.loader">loader</a> ((<a href="#e.type">type</a>*))&gt;</p>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.loader">loader</a> (<a href="#e.type">type</a>*)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST loader</p>
<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>dynamicTypes&nbsp;(true | false) "false"&gt;</p>
<p></p>
diff --git a/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_tagLibraries.html b/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_tagLibraries.html
index a7e408a..c1971c9 100644
--- a/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_tagLibraries.html
+++ b/doc/org.eclipse.jet.doc/references/extensionpoints/org_eclipse_jet_tagLibraries.html
@@ -21,7 +21,7 @@
<p></p>
<ul class=ConfigMarkup id=attlistDesc>
</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.tagLibrary">tagLibrary</a> ((<a href="#e.functionTag">functionTag</a> | <a href="#e.iteratingTag">iteratingTag</a> | <a href="#e.conditionalTag">conditionalTag</a> | <a href="#e.emptyTag">emptyTag</a> | <a href="#e.containerTag">containerTag</a>) , <a href="#e.description">description</a>?)&gt;</p>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.tagLibrary">tagLibrary</a> ((<a href="#e.functionTag">functionTag</a> | <a href="#e.iteratingTag">iteratingTag</a> | <a href="#e.conditionalTag">conditionalTag</a> | <a href="#e.emptyTag">emptyTag</a> | <a href="#e.containerTag">containerTag</a>)+ , <a href="#e.description">description</a>?)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST tagLibrary</p>
<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>standardPrefix&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>deprecated&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) &gt;</p>
<p></p>
@@ -34,7 +34,7 @@ Declares a tag library. That is, a collection of related JET2 tags.</p>
<li><b>standardPrefix</b> - The standard prefix used by tags in this library.</li>
<li><b>deprecated</b> - If set to 'true', indicates that use of the tag library is discourage.</li>
</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.functionTag">functionTag</a> (<a href="#e.attribute">attribute</a>+ , <a href="#e.description">description</a>?)&gt;</p>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.functionTag">functionTag</a> (<a href="#e.attribute">attribute</a>* , <a href="#e.description">description</a>?)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST functionTag</p>
<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>deprecated&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>whenContainingLineIsEmpty&nbsp;(preserve|remove) "preserve"&gt;</p>
<p></p>
@@ -50,7 +50,7 @@ Define a tag that writes a value to the template output which is calculated from
The default for function tags is 'preserve'.
</p></li>
</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.iteratingTag">iteratingTag</a> (<a href="#e.attribute">attribute</a>+ , <a href="#e.description">description</a>?)&gt;</p>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.iteratingTag">iteratingTag</a> (<a href="#e.attribute">attribute</a>* , <a href="#e.description">description</a>?)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST iteratingTag</p>
<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>deprecated&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>processContents&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(custom|standard) "standard"<p class=code id=dtdAttlist>whenContainingLineIsEmpty&nbsp;(preserve|remove) "remove"&gt;</p>
<p></p>
@@ -65,7 +65,7 @@ Define a tag that causes repeated evaluation of its contents based on its attrib
<li><b>whenContainingLineIsEmpty</b> - Defines the compiler behavior when the tag occurs on an otherwise empty line. If 'remove' is selected, the whitespace and trailing new line are not included in the templates output. In general, if a tag writes content, then this attribute should be set to 'preserve'.
<p>The default for iterating tags is 'remove'.</p></li>
</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.conditionalTag">conditionalTag</a> (<a href="#e.attribute">attribute</a>+ , <a href="#e.description">description</a>?)&gt;</p>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.conditionalTag">conditionalTag</a> (<a href="#e.attribute">attribute</a>* , <a href="#e.description">description</a>?)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST conditionalTag</p>
<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>deprecated&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>processContents&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(custom|standard) "standard"<p class=code id=dtdAttlist>whenContainingLineIsEmpty&nbsp;(preserve|remove) "remove"&gt;</p>
<p></p>
@@ -80,7 +80,7 @@ Define a tag that conditionally writes its contents to the output depending on s
<li><b>whenContainingLineIsEmpty</b> - Defines the compiler behavior when the tag occurs on an otherwise empty line. If 'remove' is selected, the whitespace and trailing new line are not included in the templates output. In general, if a tag writes content, then this attribute should be set to 'preserve'.
<p>The default for conditional tags is 'remove'.</p></li>
</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.emptyTag">emptyTag</a> (<a href="#e.attribute">attribute</a>+ , <a href="#e.description">description</a>?)&gt;</p>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.emptyTag">emptyTag</a> (<a href="#e.attribute">attribute</a>* , <a href="#e.description">description</a>?)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST emptyTag</p>
<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>deprecated&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>whenContainingLineIsEmpty&nbsp;(preserve|remove) "preserve"&gt;</p>
<p></p>
@@ -106,7 +106,7 @@ The default for empty tags is 'preserve'.
<li><b>deprecated</b> - If set to 'true', indicates that use of the attribute is discourage.</li>
<li><b>type</b> - The type of the attribute.</li>
</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.containerTag">containerTag</a> (<a href="#e.attribute">attribute</a>+ , <a href="#e.description">description</a>?)&gt;</p>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.containerTag">containerTag</a> (<a href="#e.attribute">attribute</a>* , <a href="#e.description">description</a>?)&gt;</p>
<p class=code id=dtd>&lt;!ATTLIST containerTag</p>
<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>deprecated&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>processContents&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(standard|custom) "standard"<p class=code id=dtdAttlist>allowAsEmpty&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>whenContainingLineIsEmpty&nbsp;(remove|preserve) "remove"&gt;</p>
<p></p>
diff --git a/plugins/org.eclipse.jet/.cvsignore b/plugins/org.eclipse.jet/.cvsignore
index dfcaac4..1570bc4 100644
--- a/plugins/org.eclipse.jet/.cvsignore
+++ b/plugins/org.eclipse.jet/.cvsignore
@@ -8,3 +8,4 @@ jetant.jar
temp.folder
jetant.jar
org
+doc
diff --git a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs
index acdefad..b52b2b0 100644
--- a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Apr 03 15:34:23 EDT 2007
+#Thu Apr 12 11:25:50 EDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
@@ -40,6 +40,7 @@ org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line_shifted
@@ -53,9 +54,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=false
org.eclipse.jdt.core.formatter.comment.format_comments=false
org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=false
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
org.eclipse.jdt.core.formatter.comment.format_source_code=false
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
@@ -230,6 +236,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=inser
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
@@ -250,9 +257,12 @@ org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
org.eclipse.jdt.core.formatter.lineSplit=140
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=2
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
diff --git a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs
index 7009eef..8aa3e10 100644
--- a/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.jet/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
-#Tue Apr 03 14:51:48 EDT 2007
+#Thu Apr 12 11:25:46 EDT 2007
eclipse.preferences.version=1
formatter_profile=_EMFCodeFormatter.profile
-formatter_settings_version=10
+formatter_settings_version=11
internal.default.compliance=user
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/**\r\n * &lt;copyright&gt;\r\n *\r\n * Copyright (c) ${year} IBM Corporation and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\: \r\n * IBM - Initial API and implementation\r\n *\r\n * &lt;/copyright&gt;\r\n *\r\n * $$Id$$\r\n */\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.jet/plugin.xml b/plugins/org.eclipse.jet/plugin.xml
index c9f020f..1cd64ab 100644
--- a/plugins/org.eclipse.jet/plugin.xml
+++ b/plugins/org.eclipse.jet/plugin.xml
@@ -853,9 +853,6 @@ This tag may occur only once in a template.
type="string"
use="required">
<description>
- <description>
- A project-relative path of a JET template to execute. The template provides the resource file's contents.
- </description>
A project-relative path of a JET template to execute. The template provides the resource file's contents.
</description>
</attribute>
@@ -1180,6 +1177,9 @@ if 'length' is specified, convert only the specified number of characters, other
<importLibrary id="org.eclipse.jet.formatTags" usePrefix="f" autoImport="true"/>
<importLibrary id="org.eclipse.jet.workspaceTags" usePrefix="ws" autoImport="false"/>
</tagLibraries>
+ <description>
+ description body text
+ </description>
</transform>
</extension>
diff --git a/plugins/org.eclipse.jet/schema/modelLoaders.exsd b/plugins/org.eclipse.jet/schema/modelLoaders.exsd
index 7249fce..6aaec34 100644
--- a/plugins/org.eclipse.jet/schema/modelLoaders.exsd
+++ b/plugins/org.eclipse.jet/schema/modelLoaders.exsd
@@ -13,7 +13,7 @@
<element name="extension">
<complexType>
<sequence>
- <choice>
+ <choice minOccurs="1" maxOccurs="unbounded">
<element ref="loader"/>
<element ref="defaultTypeLoader"/>
<element ref="loadableType"/>
@@ -54,9 +54,7 @@
</annotation>
<complexType>
<sequence>
- <choice>
- <element ref="type" minOccurs="0" maxOccurs="unbounded"/>
- </choice>
+ <element ref="type" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="id" type="string" use="required">
<annotation>
diff --git a/plugins/org.eclipse.jet/schema/tagLibraries.exsd b/plugins/org.eclipse.jet/schema/tagLibraries.exsd
index 072eab5..284cdac 100644
--- a/plugins/org.eclipse.jet/schema/tagLibraries.exsd
+++ b/plugins/org.eclipse.jet/schema/tagLibraries.exsd
@@ -50,7 +50,7 @@
</annotation>
<complexType>
<sequence>
- <choice>
+ <choice minOccurs="1" maxOccurs="unbounded">
<element ref="functionTag"/>
<element ref="iteratingTag"/>
<element ref="conditionalTag"/>
@@ -98,7 +98,7 @@
</annotation>
<complexType>
<sequence>
- <element ref="attribute" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="attribute" minOccurs="0" maxOccurs="unbounded"/>
<element ref="description" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="name" type="string" use="required">
@@ -154,7 +154,7 @@ The default for function tags is &apos;preserve&apos;.
</annotation>
<complexType>
<sequence>
- <element ref="attribute" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="attribute" minOccurs="0" maxOccurs="unbounded"/>
<element ref="description" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="name" type="string" use="required">
@@ -223,7 +223,7 @@ The default for function tags is &apos;preserve&apos;.
</annotation>
<complexType>
<sequence>
- <element ref="attribute" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="attribute" minOccurs="0" maxOccurs="unbounded"/>
<element ref="description" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="name" type="string" use="required">
@@ -292,7 +292,7 @@ The default for function tags is &apos;preserve&apos;.
</annotation>
<complexType>
<sequence>
- <element ref="attribute" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="attribute" minOccurs="0" maxOccurs="unbounded"/>
<element ref="description" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="name" type="string" use="required">
@@ -397,7 +397,7 @@ The default for empty tags is &apos;preserve&apos;.
<element name="containerTag">
<complexType>
<sequence>
- <element ref="attribute" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="attribute" minOccurs="0" maxOccurs="unbounded"/>
<element ref="description" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="name" type="string" use="required">