[seam-commits] Seam SVN: r14866 - in branches/enterprise/WFK-2_0/jboss-seam-gen/dist: util and 1 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Thu Jun 7 06:58:51 EDT 2012


Author: manaRH
Date: 2012-06-07 06:58:51 -0400 (Thu, 07 Jun 2012)
New Revision: 14866

Modified:
   branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/editproperty.xhtml.ftl
   branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/viewproperty.xhtml.ftl
   branches/enterprise/WFK-2_0/jboss-seam-gen/dist/util/TypeInfo.ftl
   branches/enterprise/WFK-2_0/jboss-seam-gen/dist/view/editproperty.xhtml.ftl
Log:
JBSEAM-4974 replaces s:convertDateTime in seam-gen view templates

Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/editproperty.xhtml.ftl
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/editproperty.xhtml.ftl	2012-06-07 10:58:39 UTC (rev 14865)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/editproperty.xhtml.ftl	2012-06-07 10:58:51 UTC (rev 14866)
@@ -19,7 +19,7 @@
                        required="true"
 </#if>
                                 value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> 
-                               <s:convertDateTime type="date"/>                                                          
+                               <f:convertDateTime type="date"/>                                                          
                         </ice:selectInputDate>
 <#elseif isTime(componentProperty)>
                         <ice:selectInputDate id="${componentProperty.name}" 
@@ -27,7 +27,7 @@
                             required="true"
 </#if>
                             value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                           <s:convertDateTime type="time"/>
+                           <f:convertDateTime type="time"/>
                         </ice:selectInputDate>
 <#elseif isTimestamp(componentProperty)>
                         <ice:selectInputDate id="${componentProperty.name}" 
@@ -35,7 +35,7 @@
                             required="true"
 </#if>
                             value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                            <s:convertDateTime type="both" dateStyle="short"/>
+                            <f:convertDateTime type="both" dateStyle="short"/>
                         </ice:inputText>
 <#elseif isBigDecimal(componentProperty)>
                         <ice:inputText id="${componentProperty.name}" 
@@ -133,7 +133,7 @@
                              required="true"
 </#if>
                                   value="${'#'}{${homeName}.instance.${property.name}}">
-                                    <s:convertDateTime type="date"/> 
+                                    <f:convertDateTime type="date"/> 
                        </ice:selectInputDate>
 <#elseif isTime(property)>
                        <ice:selectInputDate id="${property.name}" 
@@ -142,7 +142,7 @@
                                required="true"
 </#if>
                                   value="${'#'}{${homeName}.instance.${property.name}}">
-                            <s:convertDateTime type="time"/>
+                            <f:convertDateTime type="time"/>
                         </ice:selectInputDate>
 <#elseif isTimestamp(property)>
                         <ice:selectInputDate id="${property.name}" 
@@ -152,7 +152,7 @@
                                  required="true"
 </#if>
                                    value="${'#'}{${homeName}.instance.${property.name}}">
-                            <s:convertDateTime type="both" dateStyle="short"/>
+                            <f:convertDateTime type="both" dateStyle="short"/>
                         </ice:selectInputDate>
 <#elseif isBigDecimal(property)>
                         <ice:inputText id="${property.name}" 

Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/viewproperty.xhtml.ftl
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/viewproperty.xhtml.ftl	2012-06-07 10:58:39 UTC (rev 14865)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/view/viewproperty.xhtml.ftl	2012-06-07 10:58:51 UTC (rev 14866)
@@ -9,17 +9,17 @@
 <#if isDate(componentProperty)>
             <ice:outputText id="view${componentProperty.name}TextId"
 	                 value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                <s:convertDateTime type="date" dateStyle="short"/>
+                <f:convertDateTime type="date" dateStyle="short"/>
             </ice:outputText>
 <#elseif isTime(componentProperty)>
              <ice:outputText id="view${componentProperty.name}TextId" 
 	                  value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                <s:convertDateTime type="time"/>
+                <f:convertDateTime type="time"/>
              </ice:outputText>
 <#elseif isTimestamp(componentProperty)>
             <ice:outputText id="view${componentProperty.name}TextId"
 	                 value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                <s:convertDateTime type="both" dateStyle="short"/>
+                <f:convertDateTime type="both" dateStyle="short"/>
             </ice:outputText>
 <#elseif isBigDecimal(componentProperty)>
             <ice:outputText id="view${componentProperty.name}TextId"
@@ -43,17 +43,17 @@
 <#if isDate(property)>
             <ice:outputText id="view${property.name}TextId"
 	                 value="${'#'}{${homeName}.instance.${property.name}}">
-                <s:convertDateTime type="date" dateStyle="short"/>
+                <f:convertDateTime type="date" dateStyle="short"/>
             </ice:outputText>
 <#elseif isTime(property)>
             <ice:outputText id="view${property.name}TextId"
 	                 value="${'#'}{${homeName}.instance.${property.name}}">
-                <s:convertDateTime type="time"/>
+                <f:convertDateTime type="time"/>
             </ice:outputText>
 <#elseif isTimestamp(property)>
             <ice:outputText id="view${property.name}TextId"
 	                 value="${'#'}{${homeName}.instance.${property.name}}">
-                <s:convertDateTime type="both" dateStyle="short"/>
+                <f:convertDateTime type="both" dateStyle="short"/>
             </ice:outputText>
 <#elseif isBigDecimal(property)>
             <ice:outputText id="view${property.name}TextId"

Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/util/TypeInfo.ftl
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/util/TypeInfo.ftl	2012-06-07 10:58:39 UTC (rev 14865)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/util/TypeInfo.ftl	2012-06-07 10:58:51 UTC (rev 14866)
@@ -39,15 +39,15 @@
     <#assign padding = ""?left_pad(indent)/>
     <#if isDate(property)>
 ${padding}<h:outputText value="${expression}">
-${padding}    <s:convertDateTime type="date" dateStyle="short"/>
+${padding}    <f:convertDateTime type="date" dateStyle="short"/>
 ${padding}</h:outputText>
     <#elseif isTime(property)>
 ${padding}<h:outputText value="${expression}">
-${padding}    <s:convertDateTime type="time"/>
+${padding}    <f:convertDateTime type="time"/>
 ${padding}</h:outputText>
     <#elseif isTimestamp(property)>
 ${padding}<h:outputText value="${expression}">
-${padding}    <s:convertDateTime type="both" dateStyle="short"/>
+${padding}    <f:convertDateTime type="both" dateStyle="short"/>
 ${padding}</h:outputText>
     <#elseif isBigDecimal(property)>
 ${padding}<h:outputText value="${expression}">

Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/view/editproperty.xhtml.ftl
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/view/editproperty.xhtml.ftl	2012-06-07 10:58:39 UTC (rev 14865)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/view/editproperty.xhtml.ftl	2012-06-07 10:58:51 UTC (rev 14866)
@@ -25,7 +25,7 @@
                        required="true"
 </#if>
                           value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
-                    <s:convertDateTime type="time"/>
+                    <f:convertDateTime type="time"/>
                     <a:support event="onblur" reRender="${componentProperty.name}Field" bypassUpdates="true" ajaxSingle="true"/>
                 </h:inputText>
 <#elseif isTimestamp(componentProperty)>
@@ -136,7 +136,7 @@
                        required="true"
 </#if>
                           value="${'#'}{${homeName}.instance.${property.name}}">
-                    <s:convertDateTime type="time"/>
+                    <f:convertDateTime type="time"/>
                     <a:support event="onblur" reRender="${property.name}Field" bypassUpdates="true" ajaxSingle="true"/>
                 </h:inputText>
 <#elseif isTimestamp(property)>



More information about the seam-commits mailing list