[jboss-cvs] jboss-seam/seam-gen/view ...
Peter Muir
peter at bleepbleep.org.uk
Wed Nov 21 09:24:02 EST 2007
User: pmuir
Date: 07/11/21 09:24:02
Modified: seam-gen/view viewproperty.xhtml.ftl list.page.xml.ftl
editproperty.xhtml.ftl list.xhtml.ftl
Log:
JBSEAM-2282
Revision Changes Path
1.7 +12 -12 jboss-seam/seam-gen/view/viewproperty.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: viewproperty.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/viewproperty.xhtml.ftl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- viewproperty.xhtml.ftl 21 Mar 2007 01:37:44 -0000 1.6
+++ viewproperty.xhtml.ftl 21 Nov 2007 14:24:02 -0000 1.7
@@ -1,27 +1,28 @@
+<#include "../util/TypeInfo.ftl">
+
<#if !property.equals(pojo.identifierProperty) || property.value.identifierGeneratorStrategy == "assigned">
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
-<#assign propertyType = componentProperty.value.typeName>
<s:decorate id="${componentProperty.name}" template="layout/display.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
-<#if propertyType == "date">
+<#if isDate(componentProperty)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="date" dateStyle="short"/>
</h:outputText>
-<#elseif propertyType == "time">
+<#elseif isTime(componentProperty)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="time"/>
</h:outputText>
-<#elseif propertyType == "timestamp">
+<#elseif isTimestamp(componentProperty)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<s:convertDateTime type="both" dateStyle="short"/>
</h:outputText>
-<#elseif propertyType == "big_decimal">
+<#elseif isBigDecimal(componentProperty)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<f:convertNumber/>
</h:outputText>
-<#elseif propertyType == "big_integer">
+<#elseif isBigInteger(componentProperty)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
<f:convertNumber integerOnly="true"/>
</h:outputText>
@@ -31,27 +32,26 @@
</s:decorate>
</#foreach>
<#else>
-<#assign propertyType = property.value.typeName>
<s:decorate id="${property.name}" template="layout/display.xhtml">
<ui:define name="label">${property.name}</ui:define>
-<#if propertyType == "date">
+<#if isDate(property)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="date" dateStyle="short"/>
</h:outputText>
-<#elseif propertyType == "time">
+<#elseif isTime(property)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="time"/>
</h:outputText>
-<#elseif propertyType == "timestamp">
+<#elseif isTimestamp(property)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
<s:convertDateTime type="both" dateStyle="short"/>
</h:outputText>
-<#elseif propertyType == "big_decimal">
+<#elseif isBigDecimal(property)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
<f:convertNumber/>
</h:outputText>
-<#elseif propertyType == "big_integer">
+<#elseif isBigInteger(property)>
<h:outputText value="${'#'}{${homeName}.instance.${property.name}}">
<f:convertNumber integerOnly="true"/>
</h:outputText>
1.10 +3 -2 jboss-seam/seam-gen/view/list.page.xml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: list.page.xml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/list.page.xml.ftl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- list.page.xml.ftl 26 Jun 2007 23:12:51 -0000 1.9
+++ list.page.xml.ftl 21 Nov 2007 14:24:02 -0000 1.10
@@ -3,6 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign listName = componentName + "List">
@@ -13,12 +14,12 @@
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
-<#if componentProperty.value.typeName == "string">
+<#if isString(componentProperty)>
<param name="${componentProperty.name}" value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"/>
</#if>
</#foreach>
<#else>
-<#if property.value.typeName == "string">
+<#if isString(property)>
<param name="${property.name}" value="${'#'}{${listName}.${componentName}.${property.name}}"/>
</#if>
</#if>
1.19 +17 -16 jboss-seam/seam-gen/view/editproperty.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: editproperty.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/editproperty.xhtml.ftl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- editproperty.xhtml.ftl 5 Oct 2007 15:00:27 -0000 1.18
+++ editproperty.xhtml.ftl 21 Nov 2007 14:24:02 -0000 1.19
@@ -1,14 +1,15 @@
+<#include "../util/TypeInfo.ftl">
+
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
<#assign propertyIsId = property.equals(pojo.identifierProperty)>
<#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
<#if pojo.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
<#assign column = componentProperty.columnIterator.next()>
-<#assign propertyType = componentProperty.value.typeName>
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
-<#if propertyType == "date">
+<#if isDate(componentProperty)>
<rich:calendar id=${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -17,7 +18,7 @@
required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy" />
-<#elseif propertyType == "time">
+<#elseif isTime(componentProperty)>
<h:inputText id="${componentProperty.name}"
size="5"
<#if !column.nullable>
@@ -27,7 +28,7 @@
<s:convertDateTime type="time"/>
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "timestamp">
+<#elseif isTimestamp(componentProperty)>
<h:inputText id="${componentProperty.name}"
size="16"
<#if !column.nullable>
@@ -37,7 +38,7 @@
<s:convertDateTime type="both" dateStyle="short"/>
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "big_decimal">
+<#elseif isBigDecimal(componentProperty)>
<h:inputText id="${componentProperty.name}"
<#if !column.nullable>
required="true"
@@ -46,7 +47,7 @@
size="${column.precision+7}">
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "big_integer">
+<#elseif isBigInteger(componentProperty)>
<h:inputText id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -58,7 +59,7 @@
size="${column.precision+6}">
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "boolean" || propertyType == "yes_no" || propertyType == "true_false">
+<#elseif isBoolean(componentProperty)>
<h:selectBooleanCheckbox id="${componentProperty.name}"
<#if !column.nullable>
required="true"
@@ -67,7 +68,7 @@
disabled="${'#'}{${homeName}.managed}"
</#if>
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/>
-<#elseif propertyType == "string">
+<#elseif isString(componentProperty)>
<#if column.length gt 160>
<#if column.length gt 800>
<#assign rows = 10>
@@ -119,11 +120,11 @@
</#foreach>
<#else>
<#assign column = property.columnIterator.next()>
-<#assign propertyType = property.value.typeName>
+<#assign property = property.value.typeName>
<s:decorate id="${property.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${property.name}</ui:define>
-<#if propertyType == "date">
+<#if isDate(property)>
<rich:calendar id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -132,7 +133,7 @@
required="true"
</#if>
value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy" />
-<#elseif propertyType == "time">
+<#elseif isTime(property)>
<h:inputText id="${property.name}"
size="5"
<#if !column.nullable>
@@ -142,7 +143,7 @@
<s:convertDateTime type="time"/>
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "timestamp">
+<#elseif isTimestamp(property)>
<h:inputText id="${property.name}"
size="16"
<#if !column.nullable>
@@ -152,7 +153,7 @@
<s:convertDateTime type="both" dateStyle="short"/>
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "big_decimal">
+<#elseif isBigDecimal(property)>
<h:inputText id="${property.name}"
<#if !column.nullable>
required="true"
@@ -161,7 +162,7 @@
size="${column.precision+7}">
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "big_integer">
+<#elseif isBigInteger(property)>
<h:inputText id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
@@ -173,7 +174,7 @@
size="${column.precision+6}">
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true"/>
</h:inputText>
-<#elseif propertyType == "boolean" || propertyType == "yes_no" || propertyType == "true_false">
+<#elseif isBoolean(property)>
<h:selectBooleanCheckbox id="${property.name}"
<#if !column.nullable>
required="true"
@@ -182,7 +183,7 @@
disabled="${'#'}{${homeName}.managed}"
</#if>
value="${'#'}{${homeName}.instance.${property.name}}"/>
-<#elseif propertyType == "string">
+<#elseif isString(property)>
<#if column.length gt 160>
<#if column.length gt 800>
<#assign rows = 10>
1.23 +4 -2 jboss-seam/seam-gen/view/list.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: list.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/list.xhtml.ftl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- list.xhtml.ftl 14 Sep 2007 11:43:43 -0000 1.22
+++ list.xhtml.ftl 21 Nov 2007 14:24:02 -0000 1.23
@@ -1,5 +1,7 @@
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign listName = componentName + "List">
@@ -27,7 +29,7 @@
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
<#if c2j.isComponent(property)>
<#foreach componentProperty in property.value.propertyIterator>
-<#if componentProperty.value.typeName == "string">
+<#if isString(componentProperty)>
<s:decorate template="layout/display.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
<h:inputText id="${componentProperty.name}" value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}"/>
@@ -36,7 +38,7 @@
</#if>
</#foreach>
<#else>
-<#if property.value.typeName == "string">
+<#if isString(property)>
<s:decorate template="layout/display.xhtml">
<ui:define name="label">${property.name}</ui:define>
<h:inputText id="${property.name}" value="${'#'}{${listName}.${componentName}.${property.name}}"/>
More information about the jboss-cvs-commits
mailing list