Author: scabanovich Date: 2009-03-30 11:19:40 -0400 (Mon, 30 Mar 2009) New Revision: 14371 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java Log: JBIDE-4101 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta 2009-03-30 15:18:54 UTC (rev 14370) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/strutstld12.meta 2009-03-30 15:19:40 UTC (rev 14371) @@ -88,7 +88,7 @@ <XModelAttribute name="display-name" xmlname="display-name.#text"/> <XModelAttribute name="small-icon" xmlname="small-icon.#text"/> <XModelAttribute name="large-icon" xmlname="large-icon.#text"/> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute name="id" xmlname="id"/> @@ -355,7 +355,7 @@ <XModelAttribute name="type" xmlname="type.#text"> <Editor name="AccessibleJava"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> @@ -497,7 +497,7 @@ <XModelAttribute name="display-name" xmlname="display-name.#text"/> <XModelAttribute name="small-icon" xmlname="small-icon.#text"/> <XModelAttribute name="large-icon" xmlname="large-icon.#text"/> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute name="example" xmlname="example.#text"> @@ -610,7 +610,7 @@ <XModelAttribute name="validator-class" xmlname="validator-class.#text"> <Editor name="AccessibleJava"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute name="id" visibility="false" xmlname="id"/> @@ -688,7 +688,7 @@ </Constraint> <Editor name="List"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta 2009-03-30 15:18:54 UTC (rev 14370) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/meta/tld20.meta 2009-03-30 15:19:40 UTC (rev 14371) @@ -68,12 +68,12 @@ name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> <XModelAttribute PROPERTIES="save=always" default="2.0" name="version" visibility="false" xmlname="version"/> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute name="display-name" xmlname="display-name.#text"/> - <XModelAttribute name="small-icon" xmlname="small-icon.#text"/> - <XModelAttribute name="large-icon" xmlname="large-icon.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> <XModelAttribute PROPERTIES="save=always" default="1.1" name="tlibversion" xmlname="tlib-version.#text"/> <XModelAttribute PROPERTIES="save=always" name="shortname" xmlname="short-name.#text"/> @@ -301,12 +301,12 @@ name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/> <XModelAttribute PROPERTIES="save=always" default="2.1" name="version" visibility="false" xmlname="version"/> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute name="display-name" xmlname="display-name.#text"/> - <XModelAttribute name="small-icon" xmlname="small-icon.#text"/> - <XModelAttribute name="large-icon" xmlname="large-icon.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> <XModelAttribute PROPERTIES="save=always" default="1.1" name="tlibversion" xmlname="tlib-version.#text"/> <XModelAttribute PROPERTIES="save=always" name="shortname" xmlname="short-name.#text"/> @@ -491,7 +491,7 @@ <XModelAttribute default="attribute" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true" name="name" xmlname="name.#text"/> @@ -555,7 +555,7 @@ <XModelAttribute default="attribute" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true" name="name" xmlname="name.#text"/> @@ -622,7 +622,7 @@ <XModelAttribute default="attribute" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true" name="name" xmlname="name.#text"/> @@ -679,7 +679,7 @@ <XModelAttribute default="function" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute name="display-name" xmlname="display-name.#text"/> @@ -779,6 +779,12 @@ <XModelAttribute default="tag" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="display-name" xmlname="display-name.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> <XModelAttribute PROPERTIES="save=always;id=true" name="name" xmlname="name.#text"/> <XModelAttribute PROPERTIES="save=always" name="tagclass" xmlname="tag-class.#text"> <Constraint loader="QClassName"/> @@ -797,12 +803,6 @@ </Constraint> <Editor name="List"/> </XModelAttribute> - <XModelAttribute name="display-name" xmlname="display-name.#text"/> - <XModelAttribute name="small-icon" xmlname="small-icon.#text"/> - <XModelAttribute name="large-icon" xmlname="large-icon.#text"/> - <XModelAttribute name="description" xmlname="description.#text"> - <Editor name="Note"/> - </XModelAttribute> <XModelAttribute name="example" xmlname="example.#text"> <Editor name="Note"/> </XModelAttribute> @@ -885,6 +885,12 @@ <XModelAttribute default="tag" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> + <Editor name="Note"/> + </XModelAttribute> + <XModelAttribute name="display-name" xmlname="display-name.#text"/> + <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/> + <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/> <XModelAttribute PROPERTIES="save=always;id=true" name="name" xmlname="name.#text"/> <XModelAttribute PROPERTIES="save=always" name="tagclass" xmlname="tag-class.#text"> <Constraint loader="QClassName"/> @@ -903,12 +909,6 @@ </Constraint> <Editor name="List"/> </XModelAttribute> - <XModelAttribute name="display-name" xmlname="display-name.#text"/> - <XModelAttribute name="small-icon" xmlname="small-icon.#text"/> - <XModelAttribute name="large-icon" xmlname="large-icon.#text"/> - <XModelAttribute name="description" xmlname="description.#text"> - <Editor name="Note"/> - </XModelAttribute> <XModelAttribute name="example" xmlname="example.#text"> <Editor name="Note"/> </XModelAttribute> @@ -985,7 +985,7 @@ <XModelAttribute default="tag-file" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute name="description" xmlname="description.#text"> + <XModelAttribute TRIM="no" name="description" xmlname="description.#text"> <Editor name="Note"/> </XModelAttribute> <XModelAttribute name="display-name" xmlname="display-name.#text"/> Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java 2009-03-30 15:18:54 UTC (rev 14370) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/webapp/model/FileWebAppLoader.java 2009-03-30 15:19:40 UTC (rev 14371) @@ -61,7 +61,7 @@ return super.isSaveable(entity, n, v, dv); } - public String getAttribute(Element element, String xmlname) { + public String getAttribute(Element element, String xmlname, XAttribute attr) { if("distributable".equals(xmlname)) return (XMLUtil.getUniqueChild(element, "distributable") != null) ? "yes" : "no"; if("role-names".equals(xmlname)) @@ -76,7 +76,7 @@ return loadArray(element, "port-component-ref"); if("dispatchers".equals(xmlname)) return loadArray(element, "dispatcher"); - return super.getAttribute(element, xmlname); + return super.getAttribute(element, xmlname, attr); } public void saveAttributes(Element element, XModelObject o) {