Author: dan.j.allen Date: 2008-10-12 01:26:44 -0400 (Sun, 12 Oct 2008) New Revision: 9264 Modified: trunk/seam-gen/util/TypeInfo.ftl trunk/seam-gen/view/action.xhtml trunk/seam-gen/view/conversation.xhtml trunk/seam-gen/view/edit.xhtml trunk/seam-gen/view/edit.xhtml.ftl trunk/seam-gen/view/error.xhtml trunk/seam-gen/view/form.xhtml trunk/seam-gen/view/home.xhtml trunk/seam-gen/view/list.xhtml trunk/seam-gen/view/list.xhtml.ftl trunk/seam-gen/view/login.xhtml trunk/seam-gen/view/page.xhtml trunk/seam-gen/view/query.xhtml trunk/seam-gen/view/view.xhtml.ftl trunk/seam-gen/view/viewproperty.xhtml.ftl Log: use proper converter whenever outputting a value some whitespace formatting Modified: trunk/seam-gen/util/TypeInfo.ftl =================================================================== (Binary files differ) Modified: trunk/seam-gen/view/action.xhtml =================================================================== --- trunk/seam-gen/view/action.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/action.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,13 +1,13 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:a="http://richfaces.org/a4j" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:a="http://richfaces.org/a4j" + template="layout/template.xhtml"> <ui:define name="body"> @@ -26,4 +26,3 @@ </ui:define> </ui:composition> - Modified: trunk/seam-gen/view/conversation.xhtml =================================================================== --- trunk/seam-gen/view/conversation.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/conversation.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,12 +1,12 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> <ui:define name="body"> @@ -38,4 +38,3 @@ </ui:define> </ui:composition> - Modified: trunk/seam-gen/view/edit.xhtml =================================================================== --- trunk/seam-gen/view/edit.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/edit.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,12 +1,12 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> <ui:define name="body"> @@ -50,4 +50,3 @@ </ui:define> </ui:composition> - Modified: trunk/seam-gen/view/edit.xhtml.ftl =================================================================== --- trunk/seam-gen/view/edit.xhtml.ftl 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/edit.xhtml.ftl 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,19 +1,18 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <#assign entityName = pojo.shortName> <#assign componentName = entityName?uncap_first> <#assign homeName = componentName + "Home"> <#assign masterPageName = entityName + "List"> <#assign pageName = entityName> - <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:a="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:a="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> <ui:define name="body"> @@ -91,7 +90,7 @@ <h:outputText value="There is no ${property.name} associated with this ${componentName}." rendered="${'#'}{${homeName}.instance.${property.name} == null}"/> - <rich:dataTable var="${parentName}" + <rich:dataTable var="_${parentName}" value="${'#'}{${homeName}.instance.${property.name}}" rendered="${'#'}{${homeName}.instance.${property.name} != null}" rowClasses="rvgRowOne,rvgRowTwo" @@ -102,13 +101,13 @@ <#foreach componentProperty in parentProperty.value.propertyIterator> <h:column> <f:facet name="header">${label(componentProperty.name)}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${componentProperty.name}} + <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${componentProperty.name}}" indent=16/> </h:column> </#foreach> <#else> <h:column> <f:facet name="header">${label(parentProperty.name)}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}} + <@outputValue property=parentProperty expression="${'#'}{_${parentName}.${parentProperty.name}}" indent=16/> </h:column> </#if> </#if> @@ -117,14 +116,14 @@ <#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)> <#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator> <h:column> - <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}} + <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet> + <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}" indent=16/> </h:column> </#foreach> <#else> <h:column> - <f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}} + <f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet> + <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/> </h:column> </#if> </#if> @@ -138,11 +137,11 @@ <#if parentPojo.isComponent(parentPojo.identifierProperty)> <#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator> <f:param name="${parentName}${componentProperty.name?cap_first}" - value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/> + value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/> </#foreach> <#else> <f:param name="${parentName}${parentPojo.identifierProperty.name?cap_first}" - value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/> + value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}}"/> </#if> </s:link> </h:column> @@ -163,7 +162,7 @@ <#if c2h.isOneToManyCollection(property)> <rich:tab label="${label(property.name)}"> - <div class="association" id="${property.name}Children"> + <h:form styleClass="association" id="${property.name}Children"> <#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)> <#assign childPageName = childPojo.shortName> @@ -173,7 +172,7 @@ rendered="${'#'}{empty ${homeName}.${property.name}}"/> <rich:dataTable value="${'#'}{${homeName}.${property.name}}" - var="${childName}" + var="_${childName}" rendered="${'#'}{not empty ${homeName}.${property.name}}" rowClasses="rvgRowOne,rvgRowTwo" id="${property.name}Table"> @@ -181,16 +180,16 @@ <#if !c2h.isCollection(childProperty) && !isToOne(childProperty) && childProperty != childPojo.versionProperty!> <#if childPojo.isComponent(childProperty)> <#foreach componentProperty in childProperty.value.propertyIterator> - <h:column> + <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}"> <f:facet name="header">${label(componentProperty.name)}</f:facet> - ${'#'}{${childName}.${childProperty.name}.${componentProperty.name}} - </h:column> + <@outputValue property=componentProperty expression="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}" indent=20/> + </rich:column> </#foreach> <#else> - <h:column> + <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}}"> <f:facet name="header">${label(childProperty.name)}</f:facet> - <h:outputText value="${'#'}{${childName}.${childProperty.name}}"/> - </h:column> + <@outputValue property=childProperty expression="${'#'}{_${childName}.${childProperty.name}}" indent=20/> + </rich:column> </#if> </#if> </#foreach> @@ -203,18 +202,18 @@ <#if childPojo.isComponent(childPojo.identifierProperty)> <#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator> <f:param name="${childName}${componentProperty.name?cap_first}" - value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/> + value="${'#'}{_${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/> </#foreach> <#else> <f:param name="${childName}${childPojo.identifierProperty.name?cap_first}" - value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/> + value="${'#'}{_${childName}.${childPojo.identifierProperty.name}}"/> </#if> <f:param name="${childName}From" value="${entityName}"/> </s:link> </h:column> </rich:dataTable> - </div> + </h:form> <f:subview rendered="${'#'}{${homeName}.managed}" id="${property.name}"> <div class="actionButtons"> Modified: trunk/seam-gen/view/error.xhtml =================================================================== --- trunk/seam-gen/view/error.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/error.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,19 +1,19 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + template="layout/template.xhtml"> -<ui:param name="showGlobalMessages" value="false"/> -<ui:define name="body"> + <ui:param name="showGlobalMessages" value="false"/> + <ui:define name="body"> - <h1>Error</h1> - <p>Something bad happened :-(</p> + <h1>Error</h1> + <p>Something bad happened :-(</p> - <h:messages id="errorMessage" styleClass="message"/> + <h:messages id="errorMessage" styleClass="message"/> -</ui:define> + </ui:define> </ui:composition> Modified: trunk/seam-gen/view/form.xhtml =================================================================== --- trunk/seam-gen/view/form.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/form.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,13 +1,13 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - xmlns:a="http://richfaces.org/a4j" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + xmlns:a="http://richfaces.org/a4j" + template="layout/template.xhtml"> <ui:define name="body"> Modified: trunk/seam-gen/view/home.xhtml =================================================================== --- trunk/seam-gen/view/home.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/home.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,32 +1,32 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> -<ui:define name="body"> + <ui:define name="body"> - <rich:panel> - <f:facet name="header">Welcome!</f:facet> - <p>This empty shell application includes:</p> - <ul> - <li>Ant build script</li> - <li>Deployment to JBoss AS (EAR or WAR)</li> - <li>Development and production profiles</li> - <li>Integration testing using TestNG and Embedded JBoss</li> - <li>JavaBean or EJB 3.0 Seam components</li> - <li>JPA entity classes</li> - <li>A configurable DataSource and JPA EntityManager</li> - <li>Templated Facelets views</li> - <li>RichFaces panels and tables</li> - <li>Default CSS stylesheet</li> - <li>Internationalization support</li> - </ul> - </rich:panel> + <rich:panel> + <f:facet name="header">Welcome!</f:facet> + <p>This empty shell application includes:</p> + <ul> + <li>Ant build script</li> + <li>Deployment to JBoss AS (EAR or WAR)</li> + <li>Development and production profiles</li> + <li>Integration testing using TestNG and Embedded JBoss</li> + <li>JavaBean or EJB 3.0 Seam components</li> + <li>JPA entity classes</li> + <li>A configurable DataSource and JPA EntityManager</li> + <li>Templated Facelets views</li> + <li>RichFaces panels and tables</li> + <li>Default CSS stylesheet</li> + <li>Internationalization support</li> + </ul> + </rich:panel> -</ui:define> + </ui:define> </ui:composition> Modified: trunk/seam-gen/view/list.xhtml =================================================================== --- trunk/seam-gen/view/list.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/list.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,12 +1,12 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> <ui:define name="body"> @@ -49,4 +49,3 @@ </ui:define> </ui:composition> - Modified: trunk/seam-gen/view/list.xhtml.ftl =================================================================== --- trunk/seam-gen/view/list.xhtml.ftl 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/list.xhtml.ftl 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,6 +1,5 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <#include "../util/TypeInfo.ftl"> <#assign entityName = pojo.shortName> <#assign componentName = entityName?uncap_first> @@ -8,14 +7,13 @@ <#assign pageName = entityName> <#assign editPageName = entityName + "Edit"> <#assign listPageName = entityName + "List"> - <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> <ui:define name="body"> @@ -63,7 +61,7 @@ rendered="${'#'}{empty ${listName}.resultList}"/> <rich:dataTable id="${listName}" - var="${componentName}" + var="_${componentName}" value="${'#'}{${listName}.resultList}" rendered="${'#'}{not empty ${listName}.resultList}"> <#foreach property in pojo.allPropertiesIterator> @@ -79,7 +77,7 @@ <ui:param name="propertyPath" value="${propertyPath}"/> </ui:include> </f:facet> - ${'#'}{${componentName}.${property.name}.${componentProperty.name}} + <@outputValue property=componentProperty expression="${'#'}{_${componentName}.${property.name}.${componentProperty.name}}" indent=12/> </h:column> </#foreach> <#else> @@ -91,7 +89,7 @@ <ui:param name="propertyPath" value="${property.name}"/> </ui:include> </f:facet> - ${'#'}{${componentName}.${property.name}} + <@outputValue property=property expression="${'#'}{_${componentName}.${property.name}}" indent=12/> </h:column> </#if> </#if> @@ -108,7 +106,7 @@ <ui:param name="propertyPath" value="${propertyPath}"/> </ui:include> </f:facet> - ${'#'}{${componentName}.${propertyPath}} + <@outputValue property=componentProperty expression="${'#'}{_${componentName}.${propertyPath}}" indent=12/> </h:column> </#foreach> <#else> @@ -121,7 +119,7 @@ <ui:param name="propertyPath" value="${propertyPath}"/> </ui:include> </f:facet> - ${'#'}{${componentName}.${propertyPath}} + <@outputValue property=parentPojo.identifierProperty expression="${'#'}{_${componentName}.${propertyPath}}" indent=12/> </h:column> </#if> </#if> @@ -134,11 +132,11 @@ <#if pojo.isComponent(pojo.identifierProperty)> <#foreach componentProperty in pojo.identifierProperty.value.propertyIterator> <f:param name="${componentName}${componentProperty.name?cap_first}" - value="${'#'}{${componentName}.${pojo.identifierProperty.name}.${componentProperty.name}}"/> + value="${'#'}{_${componentName}.${pojo.identifierProperty.name}.${componentProperty.name}}"/> </#foreach> <#else> <f:param name="${componentName}${pojo.identifierProperty.name?cap_first}" - value="${'#'}{${componentName}.${pojo.identifierProperty.name}}"/> + value="${'#'}{_${componentName}.${pojo.identifierProperty.name}}"/> </#if> </s:link> </h:column> @@ -201,4 +199,3 @@ </ui:define> </ui:composition> - Modified: trunk/seam-gen/view/login.xhtml =================================================================== --- trunk/seam-gen/view/login.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/login.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,12 +1,12 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> <ui:define name="body"> Modified: trunk/seam-gen/view/page.xhtml =================================================================== --- trunk/seam-gen/view/page.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/page.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,17 +1,16 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + template="layout/template.xhtml"> -<ui:define name="body"> + <ui:define name="body"> - <h1>${pageName}</h1> - <p>Generated page.</p> + <h1>${pageName}</h1> + <p>Generated page.</p> -</ui:define> - + </ui:define> </ui:composition> Modified: trunk/seam-gen/view/query.xhtml =================================================================== --- trunk/seam-gen/view/query.xhtml 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/query.xhtml 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,11 +1,11 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + template="layout/template.xhtml"> <ui:define name="body"> @@ -64,4 +64,3 @@ </ui:define> </ui:composition> - Modified: trunk/seam-gen/view/view.xhtml.ftl =================================================================== --- trunk/seam-gen/view/view.xhtml.ftl 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/view.xhtml.ftl 2008-10-12 05:26:44 UTC (rev 9264) @@ -1,19 +1,18 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <#include "../util/TypeInfo.ftl"> <#assign entityName = pojo.shortName> <#assign componentName = entityName?uncap_first> <#assign homeName = componentName + "Home"> <#assign masterPageName = entityName + "List"> <#assign editPageName = entityName + "Edit"> - <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:rich="http://richfaces.org/rich" - template="layout/template.xhtml"> + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:rich="http://richfaces.org/rich" + template="layout/template.xhtml"> <ui:define name="body"> @@ -62,7 +61,7 @@ <h:outputText value="There is no ${property.name} associated with this ${componentName}." rendered="${'#'}{${homeName}.instance.${property.name} == null}"/> - <rich:dataTable var="${parentName}" + <rich:dataTable var="_${parentName}" value="${'#'}{${homeName}.instance.${property.name}}" rendered="${'#'}{${homeName}.instance.${property.name} != null}" rowClasses="rvgRowOne,rvgRowTwo" @@ -73,13 +72,13 @@ <#foreach componentProperty in parentProperty.value.propertyIterator> <h:column> <f:facet name="header">${label(componentProperty.name)}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${componentProperty.name}} + <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${componentProperty.name}}" indent=16/> </h:column> </#foreach> <#else> <h:column> <f:facet name="header">${label(parentProperty.name)}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}} + <@outputValue property=parentProperty expression="${'#'}{_${parentName}.${parentProperty.name}}" indent=16/> </h:column> </#if> </#if> @@ -88,14 +87,14 @@ <#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)> <#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator> <h:column> - <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}} + <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet> + <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}" indent=16/> </h:column> </#foreach> <#else> <h:column> - <f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}} + <f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet> + <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/> </h:column> </#if> </#if> @@ -108,11 +107,11 @@ <#if parentPojo.isComponent(parentPojo.identifierProperty)> <#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator> <f:param name="${parentName}${componentProperty.name?cap_first}" - value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/> + value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/> </#foreach> <#else> <f:param name="${parentName}${parentPojo.identifierProperty.name?cap_first}" - value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/> + value="${'#'}{_${parentName}.${parentPojo.identifierProperty.name}}"/> </#if> </s:link> </h:column> @@ -124,7 +123,7 @@ <#if c2h.isOneToManyCollection(property)> <rich:tab label="${label(property.name)}"> - <div class="association" id="${property.name}Children"> + <h:form styleClass="association" id="${property.name}Children"> <#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)> <#assign childPageName = childPojo.shortName> @@ -135,7 +134,7 @@ rendered="${'#'}{empty ${homeName}.${property.name}}"/> <rich:dataTable value="${'#'}{${homeName}.${property.name}}" - var="${childName}" + var="_${childName}" rendered="${'#'}{not empty ${homeName}.${property.name}}" rowClasses="rvgRowOne,rvgRowTwo" id="${property.name}Table"> @@ -143,16 +142,16 @@ <#if !c2h.isCollection(childProperty) && !isToOne(childProperty) && childProperty != childPojo.versionProperty!> <#if childPojo.isComponent(childProperty)> <#foreach componentProperty in childProperty.value.propertyIterator> - <h:column> + <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}"> <f:facet name="header">${label(componentProperty.name)}</f:facet> - ${'#'}{${childName}.${childProperty.name}.${componentProperty.name}} - </h:column> + <@outputValue property=componentProperty expression="${'#'}{_${childName}.${childProperty.name}.${componentProperty.name}}" indent=16/> + </rich:column> </#foreach> <#else> - <h:column> + <rich:column sortBy="${'#'}{_${childName}.${childProperty.name}}"> <f:facet name="header">${label(childProperty.name)}</f:facet> - <h:outputText value="${'#'}{${childName}.${childProperty.name}}"/> - </h:column> + <@outputValue property=childProperty expression="${'#'}{_${childName}.${childProperty.name}}" indent=16/> + </rich:column> </#if> </#if> </#foreach> @@ -164,18 +163,18 @@ <#if childPojo.isComponent(childPojo.identifierProperty)> <#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator> <f:param name="${childName}${componentProperty.name?cap_first}" - value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/> + value="${'#'}{_${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/> </#foreach> <#else> <f:param name="${childName}${childPojo.identifierProperty.name?cap_first}" - value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/> + value="${'#'}{_${childName}.${childPojo.identifierProperty.name}}"/> </#if> <f:param name="${childName}From" value="${entityName}"/> </s:link> </h:column> </rich:dataTable> - </div> + </h:form> <div class="actionButtons"> <s:button Modified: trunk/seam-gen/view/viewproperty.xhtml.ftl =================================================================== --- trunk/seam-gen/view/viewproperty.xhtml.ftl 2008-10-12 02:50:02 UTC (rev 9263) +++ trunk/seam-gen/view/viewproperty.xhtml.ftl 2008-10-12 05:26:44 UTC (rev 9264) @@ -3,61 +3,15 @@ <#if !property.equals(pojo.identifierProperty) || property.value.identifierGeneratorStrategy == "assigned"> <#if c2j.isComponent(property)> <#foreach componentProperty in property.value.propertyIterator> - <s:decorate id="${componentProperty.name}" template="layout/display.xhtml"> <ui:define name="label">${label(componentProperty.name)}</ui:define> -<#if isDate(componentProperty)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - <s:convertDateTime type="date" dateStyle="short"/> - </h:outputText> -<#elseif isTime(componentProperty)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - <s:convertDateTime type="time"/> - </h:outputText> -<#elseif isTimestamp(componentProperty)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - <s:convertDateTime type="both" dateStyle="short"/> - </h:outputText> -<#elseif isBigDecimal(componentProperty)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - <f:convertNumber/> - </h:outputText> -<#elseif isBigInteger(componentProperty)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - <f:convertNumber integerOnly="true"/> - </h:outputText> -<#else> - ${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}} -</#if> + <@outputValue property=componentProperty expression="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" indent=12/> </s:decorate> </#foreach> <#else> - <s:decorate id="${property.name}" template="layout/display.xhtml"> <ui:define name="label">${label(property.name)}</ui:define> -<#if isDate(property)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}}"> - <s:convertDateTime type="date" dateStyle="short"/> - </h:outputText> -<#elseif isTime(property)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}}"> - <s:convertDateTime type="time"/> - </h:outputText> -<#elseif isTimestamp(property)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}}"> - <s:convertDateTime type="both" dateStyle="short"/> - </h:outputText> -<#elseif isBigDecimal(property)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}}"> - <f:convertNumber/> - </h:outputText> -<#elseif isBigInteger(property)> - <h:outputText value="${'#'}{${homeName}.instance.${property.name}}"> - <f:convertNumber integerOnly="true"/> - </h:outputText> -<#else> - ${'#'}{${homeName}.instance.${property.name}} -</#if> + <@outputValue property=property expression="${'#'}{${homeName}.instance.${property.name}}" indent=12/> </s:decorate> </#if> </#if>