[jbosstools-commits] JBoss Tools SVN: r13485 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates and 2 other directories.

Author: mareshkau Date: 2009-02-05 08:57:19 -0500 (Thu, 05 Feb 2009) New Revision: 13485 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd Log: https://jira.jboss.org/jira/browse/JBIDE-883, schema for VPE templates was adjusted, some errors in templates was fixed Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2009-02-05 12:09:25 UTC (rev 13484) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2009-02-05 13:57:19 UTC (rev 13485) @@ -54,7 +54,7 @@ <vpe:tag name="a4j:commandLink" case-sensitive="yes"> <vpe:template children="yes" modify="yes"> - <vpe:a class="{@styleClass}" value="{jsfvalue(@value)}" + <vpe:a class="{@styleClass}" style="{@style}" dir="{@dir}" title="{tagstring()}"/> <vpe:dnd> <vpe:drag start-enable="yes"/> @@ -247,7 +247,7 @@ <vpe:tag name="a4j:htmlCommandLink" case-sensitive="yes"> <vpe:template children="yes" modify="yes"> - <vpe:a class="{@styleClass}" value="{jsfvalue(@value)}" + <vpe:a class="{@styleClass}" style="{@style}" title="{tagstring()}" dir="{@dir}"/> <vpe:dnd> <vpe:drag start-enable="yes"/> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-02-05 12:09:25 UTC (rev 13484) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-02-05 13:57:19 UTC (rev 13485) @@ -237,7 +237,7 @@ <!--else--> <vpe:if test="not(attrpresent('image'))"> <vpe:if test="(@type='')"> - <vpe:template children="no" modify="no">z + <vpe:template children="no" modify="no"> <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}" class="{@styleClass}" style="{@style}" title="{tagstring()}" dir="{@dir}"/> Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2009-02-05 12:09:25 UTC (rev 13484) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2009-02-05 13:57:19 UTC (rev 13485) @@ -809,7 +809,8 @@ <vpe:tag name="frame" case-sensitive="no"> <vpe:template children="no" modify="no"> - <frame src="{src(@src)}" bordercolor="{@bordercolor}" + <frame src="{src(@src)}" longdesc="{@longdesc}" marginheight="{@marginheight}" + marginwidth="{@marginwidth}" frameborder="{@frameborder}" name="{@name}" noresize="{@noresize}" scrolling="{@scrolling}" /> </vpe:template> @@ -1085,8 +1086,9 @@ <vpe:tag name="iframe" case-sensitive="no"> <vpe:template children="yes" modify="no"> <iframe src="{src(@src)}" align="{@align}" frameborder="{@frameborder}" - height="{@height}" hspace="{@hspace}" name="{@name}" scrolling="{@scrolling}" - vspace="{@vspace}" width="{@width}" /> + height="{@height}" name="{@name}" scrolling="{@scrolling}" + width="{@width}" longdesc="{@longdesc}" marginheight="{@marginheight}" + marginwidth="{@marginwidth}"/> <vpe:dnd> <vpe:drag start-enable="yes" /> </vpe:dnd> @@ -1183,7 +1185,7 @@ <vpe:template children="no" modify="no"> <!-- <img src="{@src}" width="20" height="20" />--> <input type="image" value="{@value}" class="{@class}" style="{@style}" - size="{@size}" disabled="{@disabled}" width="{@width}" height="{@height}" border="{@border}" dir="{@dir}" src="{src(@src)}" /> + size="{@size}" disabled="{@disabled}" border="{@border}" dir="{@dir}" src="{src(@src)}" /> </vpe:template> </vpe:if> <vpe:template children="no" modify="no"> @@ -1421,11 +1423,13 @@ <vpe:template children="yes" modify="no"> <vpe:copy attrs="align,classid,code,codebase,codetype,data,height,hspace,type,vspace,width,class,id,dir" /> - <vpe:drop container="yes"> - <vpe:container-child tag-name="param" /> - <vpe:container-child tag-name="object" /> - <vpe:container-child tag-name="embed" /> - </vpe:drop> + <vpe:dnd> + <vpe:drop container="yes"> + <vpe:container-child tag-name="param" /> + <vpe:container-child tag-name="object" /> + <vpe:container-child tag-name="embed" /> + </vpe:drop> + </vpe:dnd> </vpe:template> </vpe:tag> Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2009-02-05 12:09:25 UTC (rev 13484) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2009-02-05 13:57:19 UTC (rev 13485) @@ -72,7 +72,11 @@ <xsd:element minOccurs="0" name="em" type="vpe:HTML_EM" form="unqualified" maxOccurs="unbounded"/> <xsd:element minOccurs="0" name="i" type="vpe:HTML_I" form="unqualified" maxOccurs="unbounded"/> <xsd:element minOccurs="0" name="ol" type="vpe:HTML_OL" form="unqualified" maxOccurs="unbounded"/> - + <xsd:element minOccurs="0" name="form" type="vpe:HTML_FORM" form="unqualified" maxOccurs="unbounded"/> + <xsd:element minOccurs="0" name="frame" type="vpe:HTML_FRAME" form="unqualified" maxOccurs="unbounded"/> + <xsd:element minOccurs="0" name="iframe" type="vpe:HTML_IFRAME" form="unqualified" maxOccurs="unbounded"/> + + <!-- VPE tags --> <xsd:element minOccurs="0" name="panellayout" type="vpe:PANELLAYOT"/> <xsd:element minOccurs="0" name="list" type="vpe:LIST"/> @@ -519,7 +523,31 @@ <xsd:attribute name="width" use="optional" type="xsd:string"/> <xsd:attribute name="title" use="optional" type="xsd:string"/> </xsd:complexType> -<!-- --> +<!-- --> + <xsd:complexType name="HTML_FRAME"> + <xsd:attribute name="frameborder" use="optional" type="xsd:string"/> + <xsd:attribute name="longdesc" use="optional" type="xsd:string"/> + <xsd:attribute name="marginheight" use="optional" type="xsd:string"/> + <xsd:attribute name="marginwidth" use="optional" type="xsd:string"/> + <xsd:attribute name="name" use="optional" type="xsd:string"/> + <xsd:attribute name="noresize" use="optional" type="xsd:string"/> + <xsd:attribute name="scrolling" use="optional" type="xsd:string"/> + <xsd:attribute name="src" use="optional" type="xsd:string" /> + </xsd:complexType> + <!-- --> + <xsd:complexType name="HTML_IFRAME"> + <xsd:attribute name="align" use="optional" type="xsd:string"/> + <xsd:attribute name="frameborder" use="optional" type="xsd:string"/> + <xsd:attribute name="height" use="optional" type="xsd:string"/> + <xsd:attribute name="longdesc" use="optional" type="xsd:string"/> + <xsd:attribute name="marginheight" use="optional" type="xsd:string"/> + <xsd:attribute name="marginwidth" use="optional" type="xsd:string"/> + <xsd:attribute name="name" use="optional" type="xsd:string"/> + <xsd:attribute name="scrolling" use="optional" type="xsd:string"/> + <xsd:attribute name="src" use="optional" type="xsd:string" /> + <xsd:attribute name="width" use="optional" type="xsd:string"/> + </xsd:complexType> +<!-- --> <xsd:complexType name="HTML_OL"/> <!-- --> <xsd:complexType name="HTML_I"/> @@ -533,6 +561,8 @@ <xsd:complexType name="HTML_UL"/> <!-- --> <xsd:complexType name="HTML_P"/> + <!-- --> + <xsd:complexType name="HTML_FORM"/> <!-- --> <xsd:complexType name="DEFAULT_TEMPLATE"> <xsd:sequence>