Author: dsakovich Date: 2008-10-21 12:01:18 -0400 (Tue, 21 Oct 2008) New Revision: 11056 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 Log: correct h:commandButton and a4j:commandButton 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 2008-10-21 15:11:46 UTC (rev 11055) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-10-21 16:01:18 UTC (rev 11056) @@ -1,234 +1,235 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <vpe:template-taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" /> - <vpe:template-taglib uri="http://richfaces.org/a4j" prefix="a4j" /> - - <vpe:tag name="a4j:page" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <vpe:copy attrs="id,style,dir"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:region" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <vpe:copy attrs="id"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:ajaxListener" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:keepAlive" case-sensitive="yes"> - <vpe:template children="no" modify="no"> - <nobr><vpe:value expr="{@beanName}"/></nobr> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:support" case-sensitive="yes"> - <vpe:template children="no" modify="no" /> - </vpe:tag> - - <vpe:tag name="a4j:poll" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:commandLink" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <span class="{@styleClass}" style="color:blue;text-decoration:underline;{@style}" title="{tagstring()}"> - <vpe:value expr="{jsfvalue(@value)}"/> - </span> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - <vpe:drop container="yes"> - <vpe:container-child tag-name="outputText"/> - </vpe:drop> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - <vpe:format type="UnderlineFormat" setDefault="true"> - <vpe:formatAttribute type="style"/> - </vpe:format> - </vpe:textFormatting> - <vpe:pseudoContent/> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:commandButton" case-sensitive="yes"> - <vpe:if test="not(attrpresent('image'))"> - <vpe:if test="(@type='')"> - <vpe:template children="no" modify="no"> - <input type="button" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> - - <vpe:if test="not(@type='') "> - <vpe:template children="no" modify="no"> - <input type="{@type}" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> - </vpe:if> - <vpe:if test="attrpresent('image')"> - <vpe:template children="no" modify="no"> - <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> - </vpe:tag> - - <vpe:tag name="a4j:outputPanel" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div id="{@id}" style="{@style}" dir="{@dir}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:actionparam" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:status" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <span class="{@styleClass};{@stopStyleClass}" style="{@style};{@stopStyle}" title="{tagstring()}"> - <vpe:value expr=" {jsfvalue(@stopText)}"/> - </span> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:loadBundle" case-sensitive="yes"> - <vpe:template children="no" modify="no"> - <vpe:load-bundle/> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:loadStyle" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - <vpe:link rel="stylesheet" href="{href(@src)}" /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:loadScript" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:jsFunction" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:mediaOutput" case-sensitive="yes"> - <vpe:template children="no" modify="no" - class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFMediaOutput"> - - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:log" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:form" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <vpe:copy attrs="id"/> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:htmlCommandLink" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <span class="{@styleClass}" style="color:blue;text-decoration:underline;{@style}" title="{tagstring()}"> - <vpe:value expr="{jsfvalue(@value)}"/> - </span> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - <vpe:drop container="yes"> - <vpe:container-child tag-name="outputText"/> - </vpe:drop> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - <vpe:format type="BlockFormat" - handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" /> - <vpe:format type="UnderlineFormat" setDefault="true"> - <vpe:formatAttribute type="style"/> - </vpe:format> - </vpe:textFormatting> - <vpe:pseudoContent/> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:include" case-sensitive="yes"> +<?xml version="1.0" encoding="UTF-8"?> +<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <vpe:template-taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" /> + <vpe:template-taglib uri="http://richfaces.org/a4j" prefix="a4j" /> + + <vpe:tag name="a4j:page" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:copy attrs="id,style,dir"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:region" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:copy attrs="id"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:ajaxListener" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:keepAlive" case-sensitive="yes"> + <vpe:template children="no" modify="no"> + <nobr><vpe:value expr="{@beanName}"/></nobr> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:support" case-sensitive="yes"> + <vpe:template children="no" modify="no" /> + </vpe:tag> + + <vpe:tag name="a4j:poll" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:commandLink" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:a class="{@styleClass}" value="{jsfvalue(@value)}" + style="{@style}" dir="{@dir}" title="{tagstring()}"/> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + <vpe:drop container="yes"> + <vpe:container-child tag-name="outputText"/> + </vpe:drop> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + <vpe:format type="UnderlineFormat" setDefault="true"> + <vpe:formatAttribute type="style"/> + </vpe:format> + </vpe:textFormatting> + <vpe:pseudoContent/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:commandButton" case-sensitive="yes"> + <vpe:if test="not(attrpresent('image'))"> + <vpe:if test="(@type='')"> + <vpe:template children="no" modify="no"> + <input type="button" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + <vpe:if test="not(@type='')"> + <vpe:template children="no" modify="no"> + <input type="{@type}" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + </vpe:if> + <vpe:if test="attrpresent('image')"> + <vpe:template children="no" modify="no"> + <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + </vpe:tag> + + <vpe:tag name="a4j:outputPanel" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div id="{@id}" style="{@style}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:actionparam" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:status" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <span class="{@styleClass};{@stopStyleClass}" style="{@style};{@stopStyle}" title="{tagstring()}"> + <vpe:value expr=" {jsfvalue(@stopText)}"/> + </span> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:loadBundle" case-sensitive="yes"> + <vpe:template children="no" modify="no"> + <vpe:load-bundle/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:loadStyle" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + <vpe:link rel="stylesheet" href="{href(@src)}" /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:loadScript" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:jsFunction" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:mediaOutput" case-sensitive="yes"> + <vpe:template children="no" modify="no" + class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFMediaOutput"> + + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:log" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:form" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:copy attrs="id"/> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:htmlCommandLink" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:a class="{@styleClass}" value="{jsfvalue(@value)}" + style="{@style}" title="{tagstring()}" dir="{@dir}"/> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + <vpe:drop container="yes"> + <vpe:container-child tag-name="outputText"/> + </vpe:drop> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + <vpe:format type="BlockFormat" + handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" /> + <vpe:format type="UnderlineFormat" setDefault="true"> + <vpe:formatAttribute type="style"/> + </vpe:format> + </vpe:textFormatting> + <vpe:pseudoContent/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:include" case-sensitive="yes"> <vpe:template children="yes" file="{@viewId}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/> - </vpe:tag> - - <vpe:tag name="a4j:repeat" case-sensitive="yes" haveVisualPreview="no"> + </vpe:tag> + + <vpe:tag name="a4j:repeat" case-sensitive="yes" haveVisualPreview="no"> <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFReapeatTemplate"> - </vpe:template> + </vpe:template> </vpe:tag> - - <vpe:tag name="a4j:portlet" case-sensitive="yes"> - <vpe:template children="yes" modify="no"> - <span> - </span> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:push" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - + + <vpe:tag name="a4j:portlet" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + <span> + </span> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:push" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + </vpe:templates> \ No newline at end of file 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 2008-10-21 15:11:46 UTC (rev 11055) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-21 16:01:18 UTC (rev 11056) @@ -181,9 +181,11 @@ <!-- Проблема с адресацией от приложения (30 of 4) --> <vpe:tag name="h:commandButton" case-sensitive="yes"> <vpe:if test="not(attrpresent('image'))"> + <vpe:if test="(@type='')"> <vpe:template children="no" modify="no"> <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}" - class="{@styleClass}" style="{@style}" title="{tagstring()}" /> + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> @@ -194,6 +196,23 @@ <vpe:textFormatting use-default-formats="yes"> </vpe:textFormatting> </vpe:template> + </vpe:if> + <vpe:if test="not(@type='')"> + <vpe:template children="no" modify="no"> + <input type="{@type}" value="{iif(@value='',' ',jsfvalue(@value))}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> </vpe:if> <vpe:if test="attrpresent('image')"> <vpe:template children="no" modify="no"> @@ -460,19 +479,19 @@ </vpe:template> </vpe:if> <vpe:if - test="hasinparents('t:selectManyMenu')| - hasinparents('x:selectOneRadio')| - hasinparents('x:selectOneMenu')"> - <!-- Gavr --><!-- added x: 8.02.05 --> - <vpe:template children="no" modify="yes"> - <option value="{@itemValue}" title="{tagstring()}"> - <vpe:value expr="{jsfvalue(@itemLabel)}" /> - </option> - </vpe:template> - </vpe:if> - </vpe:tag> - - <vpe:tag name="f:selectItems" case-sensitive="yes"> + test="hasinparents('t:selectManyMenu')| + hasinparents('x:selectOneRadio')| + hasinparents('x:selectOneMenu')"> + <!-- Gavr --><!-- added x: 8.02.05 --> + <vpe:template children="no" modify="yes"> + <option value="{@itemValue}" title="{tagstring()}"> + <vpe:value expr="{jsfvalue(@itemLabel)}" /> + </option> + </vpe:template> + </vpe:if> + </vpe:tag> + + <vpe:tag name="f:selectItems" case-sensitive="yes"> <vpe:if test="hasinparents('h:selectManyCheckbox')|hasinparents('x:selectManyCheckbox')"> <!-- added x: 8.02.05 --><!-- Gavr --> @@ -498,34 +517,34 @@ </vpe:template> </vpe:if> <vpe:if - test="hasinparents('h:selectOneListbox')| - hasinparents('h:selectManyListbox')| - hasinparents('h:selectOneMenu')| - hasinparents('h:selectManyMenu')| + test="hasinparents('h:selectOneListbox')| + hasinparents('h:selectManyListbox')| + hasinparents('h:selectOneMenu')| + hasinparents('h:selectManyMenu')| hasinparents('x:selectOneMenu')| - hasinparents('rich:pickList')"> -<!-- Gavr --> - <vpe:template children="no" modify="yes"> - <option value="{@itemValue}" title="{tagstring()}"> - <vpe:value expr="{jsfvalue(@value)}" /> - </option> - </vpe:template> - </vpe:if> - </vpe:tag> - - <vpe:tag name="h:selectOneMenu" case-sensitive="yes"> - <vpe:template children="yes" modify="no"> - <select></select> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="h:panelGroup" case-sensitive="yes"> - - <vpe:if test="@layout='block'"> - <vpe:template children="yes" modify="yes"> + hasinparents('rich:pickList')"> +<!-- Gavr --> + <vpe:template children="no" modify="yes"> + <option value="{@itemValue}" title="{tagstring()}"> + <vpe:value expr="{jsfvalue(@value)}" /> + </option> + </vpe:template> + </vpe:if> + </vpe:tag> + + <vpe:tag name="h:selectOneMenu" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + <select></select> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="h:panelGroup" case-sensitive="yes"> + + <vpe:if test="@layout='block'"> + <vpe:template children="yes" modify="yes"> <div style="{@style}" class="{@styleClass}" title="{tagstring()}" /> <vpe:breaker type="ignore" />