Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r10028 - trunk/HibernateExt/tools/src/templates/seam
|
From: <hib...@li...> - 2006-06-20 10:27:47
|
Author: max...@jb...
Date: 2006-06-20 06:27:37 -0400 (Tue, 20 Jun 2006)
New Revision: 10028
Modified:
trunk/HibernateExt/tools/src/templates/seam/edit.jsp.ftl
trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl
trunk/HibernateExt/tools/src/templates/seam/faces-config.xml.ftl
trunk/HibernateExt/tools/src/templates/seam/find.jsp.ftl
trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl
trunk/HibernateExt/tools/src/templates/seam/messages.properties.ftl
trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl
Log:
pure code layout update to seam templates - no functional or visual changes
Modified: trunk/HibernateExt/tools/src/templates/seam/edit.jsp.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/edit.jsp.ftl 2006-06-20 10:27:20 UTC (rev 10027)
+++ trunk/HibernateExt/tools/src/templates/seam/edit.jsp.ftl 2006-06-20 10:27:37 UTC (rev 10028)
@@ -24,9 +24,13 @@
<div class="rvgSwitch">
<h:selectOneMenu value="${'#'}{switcher.conversationIdOrOutcome}">
-<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())> <f:selectItem itemLabel="Create ${entity.shortName}" itemValue="edit${entity.shortName}"/>
-</#foreach><#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())> <f:selectItem itemLabel="Find ${entity.shortName}" itemValue="find${entity.shortName}"/>
-</#foreach> <f:selectItems value="${'#'}{switcher.selectItems}"/>
+<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())>
+ <f:selectItem itemLabel="Create ${entity.shortName}" itemValue="edit${entity.shortName}"/>
+</#foreach>
+<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())>
+ <f:selectItem itemLabel="Find ${entity.shortName}" itemValue="find${entity.shortName}"/>
+</#foreach>
+ <f:selectItems value="${'#'}{switcher.selectItems}"/>
</h:selectOneMenu>
<h:commandButton action="${'#'}{switcher.select}" value="Switch"/>
</div>
@@ -37,22 +41,37 @@
<span class="rvgInputs">
<span class="rvgMessage"><h:messages globalOnly="true"/></span>
-<#foreach field in pojo.getAllPropertiesIterator()><#if !c2h.isCollection(field) && !c2h.isManyToOne(field)> <h:outputLabel value="${'#'}{msg.${pojo.shortName}_${field.name}}" for="${field.name}">
-<#if field.equals(pojo.identifierProperty)><#if field.value.identifierGeneratorStrategy == "assigned"> <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}" disabled="${'#'}{!${entityEditor}.new}"/>
-</#if><#else><#if field.value.typeName == "date"> <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}">
+<#foreach field in pojo.getAllPropertiesIterator()>
+<#if !c2h.isCollection(field) && !c2h.isManyToOne(field)>
+ <h:outputLabel value="${'#'}{msg.${pojo.shortName}_${field.name}}" for="${field.name}">
+<#if field.equals(pojo.identifierProperty)>
+<#if field.value.identifierGeneratorStrategy == "assigned">
+ <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}" disabled="${'#'}{!${entityEditor}.new}"/>
+</#if>
+<#else>
+<#if field.value.typeName == "date">
+ <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}">
<f:convertDateTime type="date" dateStyle="short"/>
</h:inputText>
-<#elseif field.value.typeName == "time"> <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}">
+<#elseif field.value.typeName == "time">
+ <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}">
<f:convertDateTime type="time"/>
</h:inputText>
-<#elseif field.value.typeName == "timestamp"> <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}">
+<#elseif field.value.typeName == "timestamp">
+ <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}">
<f:convertDateTime type="both" dateStyle="short"/>
</h:inputText>
-<#elseif field.value.typeName == "boolean"> <h:selectBooleanCheckbox value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}"/>
-<#else> <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}"/>
-</#if></#if> <span class="rvgMessage"><h:message for="${field.name}"/></span>
+<#elseif field.value.typeName == "boolean">
+ <h:selectBooleanCheckbox value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}"/>
+<#else>
+ <h:inputText value="${'#'}{${entityEditor}.instance.${field.name}}" id="${field.name}"/>
+</#if>
+</#if>
+ <span class="rvgMessage"><h:message for="${field.name}"/></span>
</h:outputLabel>
-</#if></#foreach> </span>
+</#if>
+</#foreach>
+ </span>
<span class="rvgActions">
<h:commandButton type="submit" value="${'#'}{msg.Create}" action="${'#'}{${entityEditor}.create}" rendered="${'#'}{${entityEditor}.new}"/>
@@ -64,22 +83,32 @@
</fieldset>
</div>
-<#foreach property in pojo.getAllPropertiesIterator()><#if c2h.isManyToOne(property)><#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))> <div class="rvgResults">
+<#foreach property in pojo.getAllPropertiesIterator()>
+<#if c2h.isManyToOne(property)>
+<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
+ <div class="rvgResults">
<h2><h:outputText value="${'#'}{msg.${pojo.shortName}_${property.name}}"/></h2>
<h:outputText value="${'#'}{msg.No} ${'#'}{msg.${pojo.shortName}_${property.name}}" rendered="${'#'}{${entityEditor}.instance.${property.name} == null}"/>
<h:dataTable var="parent" value="${'#'}{${entityEditor}.instance.${property.name}}"
rendered="${'#'}{${entityEditor}.instance.${property.name} != null}" rowClasses="rvgRowOne,rvgRowTwo">
-<#foreach parentProperty in parentPojo.getAllPropertiesIterator()><#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)> <h:column>
+<#foreach parentProperty in parentPojo.getAllPropertiesIterator()>
+<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)>
+ <h:column>
<f:facet name="header"><h:outputText value="${'#'}{msg.${parentPojo.shortName}_${parentProperty.name}}"/></f:facet>
<h:outputText value="${'#'}{parent.${parentProperty.name}}"/>
</h:column>
-</#if><#if c2h.isManyToOne(parentProperty)><#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> <h:column>
+</#if>
+<#if c2h.isManyToOne(parentProperty)>
+<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
+ <h:column>
<f:facet name="header">
<h:outputText value="${'#'}{msg.${parentPojo.shortName}_${parentProperty.name}} ${'#'}{msg.${parentParentPojo.shortName}_${parentParentPojo.identifierProperty.name}}"/>
</f:facet>
<h:outputText value="${'#'}{parent.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}"/>
</h:column>
-</#if></#foreach> <h:column>
+</#if>
+</#foreach>
+ <h:column>
<f:facet name="header"><h:outputText value="${'#'}{msg.Action}"/></f:facet>
<h:commandButton action="${'#'}{${entityEditor}.${property.name}}" value="${'#'}{msg.View} ${'#'}{msg.${parentPojo.shortName}}"/>
</h:column>
@@ -91,20 +120,30 @@
</div>
-</#if><#if c2h.isOneToManyCollection(property)> <div class="rvgResults">
+</#if>
+<#if c2h.isOneToManyCollection(property)>
+ <div class="rvgResults">
<h2><h:outputText value="${'#'}{msg.${pojo.shortName}_${property.name}}"/></h2>
-<#assign childList = property.name + "List"><#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)> <h:outputText value="${'#'}{msg.No} ${'#'}{msg.${pojo.shortName}_${property.name}}" rendered="${'#'}{${childList}.rowCount==0}"/>
+<#assign childList = property.name + "List">
+<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
+ <h:outputText value="${'#'}{msg.No} ${'#'}{msg.${pojo.shortName}_${property.name}}" rendered="${'#'}{${childList}.rowCount==0}"/>
<h:dataTable value="${'#'}{${childList}}" var="child" rendered="${'#'}{${childList}.rowCount>0}" rowClasses="rvgRowOne,rvgRowTwo">
-<#foreach childProperty in childPojo.getAllPropertiesIterator()><#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)> <h:column>
+<#foreach childProperty in childPojo.getAllPropertiesIterator()>
+<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)>
+ <h:column>
<f:facet name="header"><h:outputText value="${'#'}{msg.${childPojo.shortName}_${childProperty.name}}"/></f:facet>
<h:outputText value="${'#'}{child.${childProperty.name}}"/>
</h:column>
-</#if></#foreach> <h:column>
+</#if>
+</#foreach>
+ <h:column>
<f:facet name="header"><h:outputText value="${'#'}{msg.Action}"/></f:facet>
<h:commandButton action="${'#'}{${entityEditor}.select${childPojo.shortName}}" value="${'#'}{msg.View} ${'#'}{msg.${childPojo.shortName}}"/>
-<#if property.value.key.nullable><!-- <h:commandButton action="${'#'}{${entityEditor}.remove${childPojo.shortName}}" value="${'#'}{msg.Remove} ${'#'}{msg.${childPojo.shortName}}"/> -->
-</#if> </h:column>
+<#if property.value.key.nullable>
+<!-- <h:commandButton action="${'#'}{${entityEditor}.remove${childPojo.shortName}}" value="${'#'}{msg.Remove} ${'#'}{msg.${childPojo.shortName}}"/> -->
+</#if>
+ </h:column>
</h:dataTable>
<span class="rvgPage">
@@ -114,7 +153,8 @@
</div>
-</#if></#foreach>
+</#if>
+</#foreach>
</h:form>
</body>
Modified: trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl 2006-06-20 10:27:20 UTC (rev 10027)
+++ trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl 2006-06-20 10:27:37 UTC (rev 10028)
@@ -2,7 +2,11 @@
// Generated ${date} by Hibernate Tools ${version}
<#assign classbody>
-<#assign entityEditor = pojo.shortName.toLowerCase() + "Editor"><#assign entityFinder = pojo.shortName.toLowerCase() + "Finder"><#assign entityList = pojo.shortName.toLowerCase() + "List"><#assign entity = pojo.shortName.toLowerCase()><#assign entityClass = pojo.importType(pojo.qualifiedDeclarationName)>
+<#assign entityEditor = pojo.shortName.toLowerCase() + "Editor">
+<#assign entityFinder = pojo.shortName.toLowerCase() + "Finder">
+<#assign entityList = pojo.shortName.toLowerCase() + "List">
+<#assign entity = pojo.shortName.toLowerCase()>
+<#assign entityClass = pojo.importType(pojo.qualifiedDeclarationName)>
@${pojo.importType("org.jboss.seam.annotations.Name")}("${entityEditor}")
@${pojo.importType("javax.ejb.Stateful")}
@${pojo.importType("javax.interceptor.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
@@ -44,7 +48,8 @@
@${pojo.importType("org.jboss.seam.annotations.Begin")}(join=true)
@${pojo.importType("org.jboss.seam.annotations.IfInvalid")}(outcome=${pojo.importType("org.jboss.seam.annotations.Outcome")}.REDISPLAY)
public String create() {
-<#if pojo.identifierProperty.value.identifierGeneratorStrategy == "assigned"> if ( entityManager.find(${entityClass}.class, instance.${pojo.getGetterSignature(pojo.identifierProperty)}())!=null )
+<#if pojo.identifierProperty.value.identifierGeneratorStrategy == "assigned">
+ if ( entityManager.find(${entityClass}.class, instance.${pojo.getGetterSignature(pojo.identifierProperty)}())!=null )
{
${pojo.importType("javax.faces.context.FacesContext")}.getCurrentInstance().addMessage(null,
new ${pojo.importType("javax.faces.application.FacesMessage")}(
@@ -56,10 +61,15 @@
}
</#if> entityManager.persist(instance);
isNew = false;
-<#foreach property in pojo.getAllPropertiesIterator()><#if c2h.isManyToOne(property)><#assign getter = "get" + pojo.getPropertyName(property)> if (instance.${getter}()!=null) {
+<#foreach property in pojo.getAllPropertiesIterator()>
+ <#if c2h.isManyToOne(property)>
+ <#assign getter = "get" + pojo.getPropertyName(property)>
+ if (instance.${getter}()!=null) {
instance.${getter}().get${pojo.shortName}s().add(instance);
}
-</#if></#foreach> refreshFinder();
+ </#if>
+</#foreach>
+ refreshFinder();
return "edit${pojo.shortName}";
}
@@ -72,8 +82,13 @@
@${pojo.importType("org.jboss.seam.annotations.End")}(ifOutcome="find")
public String delete() {
entityManager.remove(instance);
-<#foreach property in pojo.getAllPropertiesIterator()><#if c2h.isManyToOne(property)><#assign getter = "get" + pojo.getPropertyName(property)> instance.${getter}().get${pojo.shortName}s().remove(instance);
-</#if></#foreach> refreshFinder();
+<#foreach property in pojo.getAllPropertiesIterator()>
+ <#if c2h.isManyToOne(property)>
+ <#assign getter = "get" + pojo.getPropertyName(property)>
+ instance.${getter}().get${pojo.shortName}s().remove(instance);
+ </#if>
+</#foreach>
+ refreshFinder();
return doneOutcome;
}
@@ -90,7 +105,11 @@
@${pojo.importType("org.jboss.seam.annotations.Destroy")} @${pojo.importType("javax.ejb.Remove")}
public void destroy() {}
-<#foreach property in pojo.getAllPropertiesIterator()><#assign getter = "get" + pojo.getPropertyName(property)><#if c2h.isManyToOne(property)><#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))><#assign parentEditor = parentPojo.shortName.toLowerCase() + "Editor">
+<#foreach property in pojo.getAllPropertiesIterator()>
+ <#assign getter = "get" + pojo.getPropertyName(property)>
+ <#if c2h.isManyToOne(property)>
+ <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
+ <#assign parentEditor = parentPojo.shortName.toLowerCase() + "Editor">
@${pojo.importType("org.jboss.seam.annotations.In")}(create=true)
private transient ${parentPojo.shortName}Editor ${parentEditor};
@@ -101,14 +120,18 @@
return "edit${parentPojo.shortName}";
}
-<#assign entitySelector = parentPojo.shortName.toLowerCase() + "Selector"><#assign childSelector = pojo.shortName.toLowerCase() + parentPojo.shortName + "Selector"> @${pojo.importType("org.jboss.seam.annotations.Begin")}(join=true)
+<#assign entitySelector = parentPojo.shortName.toLowerCase() + "Selector"><#assign childSelector = pojo.shortName.toLowerCase() + parentPojo.shortName + "Selector">
+ @${pojo.importType("org.jboss.seam.annotations.Begin")}(join=true)
public String select${parentPojo.shortName}() {
${pojo.staticImport("org.jboss.seam.ScopeType", "CONVERSATION")}.getContext().set("${entitySelector}",
${pojo.importType("org.jboss.seam.Component")}.getInstance("${childSelector}", true) );
return "select${parentPojo.shortName}";
}
-</#if><#if c2h.isOneToManyCollection(property)><#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)><#assign childEditor = childPojo.shortName.toLowerCase() + "Editor">
+</#if>
+<#if c2h.isOneToManyCollection(property)>
+ <#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
+ <#assign childEditor = childPojo.shortName.toLowerCase() + "Editor">
@${pojo.importType("org.jboss.seam.annotations.datamodel.DataModel")}
public ${pojo.importType("java.util.List")} ${getter}List() {
return instance == null || instance.${getter}()==null ?
@@ -136,13 +159,15 @@
return "edit${childPojo.shortName}";
}
-<#if property.value.key.nullable>
+ <#if property.value.key.nullable>
/*public String remove${childPojo.shortName}() {
instance.${getter}.remove( selected${childPojo.shortName} );
selected${childPojo.shortName}.set${pojo.shortName}(null);
return "edit";
}*/
-</#if></#if></#foreach>
+ </#if>
+</#if>
+</#foreach>
}
</#assign>
Modified: trunk/HibernateExt/tools/src/templates/seam/faces-config.xml.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/faces-config.xml.ftl 2006-06-20 10:27:20 UTC (rev 10027)
+++ trunk/HibernateExt/tools/src/templates/seam/faces-config.xml.ftl 2006-06-20 10:27:37 UTC (rev 10028)
@@ -4,7 +4,8 @@
"http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
<faces-config>
-<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())> <!-- navigation rules for ${entity.qualifiedDeclarationName} -->
+<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())>
+ <!-- navigation rules for ${entity.qualifiedDeclarationName} -->
<navigation-rule>
<navigation-case>
Modified: trunk/HibernateExt/tools/src/templates/seam/find.jsp.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/find.jsp.ftl 2006-06-20 10:27:20 UTC (rev 10027)
+++ trunk/HibernateExt/tools/src/templates/seam/find.jsp.ftl 2006-06-20 10:27:37 UTC (rev 10028)
@@ -4,7 +4,11 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<f:view>
<f:loadBundle basename="messages" var="msg"/>
-<#assign entityFinder = pojo.shortName.toLowerCase() + "Finder"><#assign entitySelector = pojo.shortName.toLowerCase() + "Selector"><#assign entityList = pojo.shortName.toLowerCase() + "List"><#assign entityvar = pojo.shortName.toLowerCase()> <head>
+<#assign entityFinder = pojo.shortName.toLowerCase() + "Finder">
+<#assign entitySelector = pojo.shortName.toLowerCase() + "Selector">
+<#assign entityList = pojo.shortName.toLowerCase() + "List">
+<#assign entityvar = pojo.shortName.toLowerCase()>
+ <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title><h:outputText value="${'#'}{${entitySelector}.pageTitle}"/></title>
<style type="text/css" media="all">
@@ -19,9 +23,13 @@
<div class="rvgSwitch">
<h:selectOneMenu value="${'#'}{switcher.conversationIdOrOutcome}">
-<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())> <f:selectItem itemLabel="Create ${entity.shortName}" itemValue="edit${entity.shortName}"/>
-</#foreach><#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())> <f:selectItem itemLabel="Find ${entity.shortName}" itemValue="find${entity.shortName}"/>
-</#foreach> <f:selectItems value="${'#'}{switcher.selectItems}"/>
+<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())>
+ <f:selectItem itemLabel="Create ${entity.shortName}" itemValue="edit${entity.shortName}"/>
+</#foreach>
+<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())>
+ <f:selectItem itemLabel="Find ${entity.shortName}" itemValue="find${entity.shortName}"/>
+</#foreach>
+ <f:selectItems value="${'#'}{switcher.selectItems}"/>
</h:selectOneMenu>
<h:commandButton action="${'#'}{switcher.select}" value="Switch"/>
</div>
@@ -31,20 +39,30 @@
<legend><h:outputText value="${'#'}{msg.${pojo.shortName}} ${'#'}{msg.SearchCriteria}"/></legend>
<span class="rvgInputs">
-<#foreach field in pojo.getAllPropertiesIterator()><#if !c2h.isCollection(field) && !c2h.isManyToOne(field)> <h:outputLabel value="${'#'}{msg.${pojo.shortName}_${field.name}}" for="${field.name}">
-<#if field.value.typeName == "date"> <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}">
+<#foreach field in pojo.getAllPropertiesIterator()>
+<#if !c2h.isCollection(field) && !c2h.isManyToOne(field)>
+ <h:outputLabel value="${'#'}{msg.${pojo.shortName}_${field.name}}" for="${field.name}">
+<#if field.value.typeName == "date">
+ <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}">
<f:convertDateTime type="date" dateStyle="short"/>
</h:inputText>
-<#elseif field.value.typeName == "time"> <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}">
+<#elseif field.value.typeName == "time">
+ <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}">
<f:convertDateTime type="time"/>
</h:inputText>
-<#elseif field.value.typeName == "timestamp"> <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}">
+<#elseif field.value.typeName == "timestamp">
+ <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}">
<f:convertDateTime type="both" dateStyle="short"/>
</h:inputText>
-<#elseif field.value.typeName == "boolean"> <h:selectBooleanCheckbox value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}"/>
-<#else> <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}"/>
-</#if> </h:outputLabel>
-</#if></#foreach> <h:outputLabel value="${'#'}{msg.PageSize}" for="pageSize">
+<#elseif field.value.typeName == "boolean">
+ <h:selectBooleanCheckbox value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}"/>
+<#else>
+ <h:inputText value="${'#'}{${entityFinder}.example.${field.name}}" id="${field.name}"/>
+</#if>
+ </h:outputLabel>
+</#if>
+</#foreach>
+ <h:outputLabel value="${'#'}{msg.PageSize}" for="pageSize">
<h:inputText value="${'#'}{${entityFinder}.pageSize}" id="pageSize"/>
</h:outputLabel>
</span>
@@ -66,7 +84,9 @@
<h:dataTable value="${'#'}{${entityList}}" var="${entityvar}" rendered="${'#'}{${entityList}.rowCount>0}"
rowClasses="rvgRowOne,rvgRowTwo" headerClass="rvgOrder">
-<#foreach property in pojo.getAllPropertiesIterator()><#if !c2h.isCollection(property) && !c2h.isManyToOne(property)> <h:column>
+<#foreach property in pojo.getAllPropertiesIterator()>
+<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
+ <h:column>
<f:facet name="header">
<h:commandLink value="${'#'}{msg.${pojo.shortName}_${property.name}}" action="${'#'}{${entityFinder}.reorder}">
<f:param name="orderBy" value="${property.name}"/>
@@ -74,13 +94,18 @@
</f:facet>
<h:outputText value="${'#'}{${entityvar}.${property.name}}"/>
</h:column>
-</#if><#if c2h.isManyToOne(property)><#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))> <h:column>
+</#if>
+<#if c2h.isManyToOne(property)>
+<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
+ <h:column>
<f:facet name="header">
<h:outputText value="${'#'}{msg.${pojo.shortName}_${property.name}} ${'#'}{msg.${parentPojo.shortName}_${parentPojo.identifierProperty.name}}"/>
</f:facet>
<h:outputText value="${'#'}{${entityvar}.${property.name}.${parentPojo.identifierProperty.name}}"/>
</h:column>
-</#if></#foreach> <h:column>
+</#if>
+</#foreach>
+ <h:column>
<f:facet name="header"><h:outputText value="${'#'}{msg.Action}"/></f:facet>
<h:commandButton action="${'#'}{${entitySelector}.select}" value="${'#'}{${entitySelector}.buttonLabel}"/>
</h:column>
@@ -98,7 +123,6 @@
</h:form>
-
</body>
</f:view>
</html>
\ No newline at end of file
Modified: trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl 2006-06-20 10:27:20 UTC (rev 10027)
+++ trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl 2006-06-20 10:27:37 UTC (rev 10028)
@@ -2,7 +2,10 @@
// Generated ${date} by Hibernate Tools ${version}
<#assign classbody>
-<#assign entityFinder = pojo.shortName.toLowerCase() + "Finder"><#assign entityList = pojo.shortName.toLowerCase() + "List"><#assign entityvar = pojo.shortName.toLowerCase()><#assign entityClass = pojo.importType(pojo.qualifiedDeclarationName)>
+<#assign entityFinder = pojo.shortName.toLowerCase() + "Finder">
+<#assign entityList = pojo.shortName.toLowerCase() + "List">
+<#assign entityvar = pojo.shortName.toLowerCase()>
+<#assign entityClass = pojo.importType(pojo.qualifiedDeclarationName)>
@${pojo.importType("org.jboss.seam.annotations.Name")}("${entityFinder}")
@${pojo.importType("javax.ejb.Stateful")}
@${pojo.importType("org.jboss.seam.annotations.Scope")}(${pojo.importType("org.jboss.seam.ScopeType")}.SESSION)
@@ -43,25 +46,33 @@
${pojo.importType("java.util.Map")}<String, Object> parameters = new ${pojo.importType("java.util.HashMap")}<String, Object>();
StringBuffer queryString = new StringBuffer();
<#foreach property in pojo.getAllPropertiesIterator()>
-<#assign valueMethod = pojo.getGetterSignature(property) + "()"><#assign type = c2j.getJavaTypeName(property, true)><#if type == "java.lang.String"> if ( example.${valueMethod} != null && example.${valueMethod}.length() > 0 ) {
+<#assign valueMethod = pojo.getGetterSignature(property) + "()">
+<#assign type = c2j.getJavaTypeName(property, true)>
+<#if type == "java.lang.String">
+ if ( example.${valueMethod} != null && example.${valueMethod}.length() > 0 ) {
queryString.append(" and ${entityvar}.${property.name} like :${property.name}");
parameters.put( "${property.name}", '%' + example.${valueMethod} + '%' );
}
-<#elseif type == "boolean"> queryString.append(" and ${entityvar}.${property.name} = :${property.name}");
+<#elseif type == "boolean">
+ queryString.append(" and ${entityvar}.${property.name} = :${property.name}");
parameters.put( "${property.name}", example.${valueMethod} );
-<#elseif type == "long" || type == "int" || type == "short" || type == "byte"> if ( example.${valueMethod} != 0 ) {
+<#elseif type == "long" || type == "int" || type == "short" || type == "byte">
+ if ( example.${valueMethod} != 0 ) {
queryString.append(" and ${entityvar}.${property.name} = :${property.name}");
parameters.put( "${property.name}", example.${valueMethod} );
}
-<#elseif type == "float" || type == "double"> if ( example.${valueMethod} != 0.0 ) {
+<#elseif type == "float" || type == "double">
+ if ( example.${valueMethod} != 0.0 ) {
queryString.append(" and ${entityvar}.${property.name} = :${property.name}");
parameters.put( "${property.name}", example.${valueMethod} );
}
-<#elseif !c2h.isCollection(property) && !c2h.isManyToOne(property)> if ( example.${valueMethod} != null ) {
+<#elseif !c2h.isCollection(property) && !c2h.isManyToOne(property)>
+ if ( example.${valueMethod} != null ) {
queryString.append(" and ${entityvar}.${property.name} = :${property.name}");
parameters.put( "${property.name}", example.${valueMethod} );
}
-</#if></#foreach>
+</#if>
+</#foreach>
if ( queryString.length()==0 ) {
queryString.append("select ${entityvar} from ${pojo.shortName} ${entityvar}");
}
Modified: trunk/HibernateExt/tools/src/templates/seam/messages.properties.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/messages.properties.ftl 2006-06-20 10:27:20 UTC (rev 10027)
+++ trunk/HibernateExt/tools/src/templates/seam/messages.properties.ftl 2006-06-20 10:27:37 UTC (rev 10028)
@@ -21,6 +21,9 @@
PageSize=results per page
AlreadyExists=already exists
-<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())>${entity.shortName}=${entity.shortName}
-<#foreach property in entity.getAllPropertiesIterator()>${entity.shortName}_${property.name}=${property.name}
-</#foreach></#foreach>
\ No newline at end of file
+<#foreach entity in c2j.getPOJOIterator(cfg.getClassMappings())>
+${entity.shortName}=${entity.shortName}
+<#foreach property in entity.getAllPropertiesIterator()>
+${entity.shortName}_${property.name}=${property.name}
+</#foreach>
+</#foreach>
\ No newline at end of file
Modified: trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl 2006-06-20 10:27:20 UTC (rev 10027)
+++ trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl 2006-06-20 10:27:37 UTC (rev 10028)
@@ -15,7 +15,10 @@
public boolean isCreateEnabled();
-<#assign entityEditor = pojo.shortName.toLowerCase() + "Editor"><#assign entitySelector = pojo.shortName.toLowerCase() + "Selector"><#assign entityFinder = pojo.shortName.toLowerCase() + "Finder"> @${pojo.importType("javax.ejb.Stateless")}
+<#assign entityEditor = pojo.shortName.toLowerCase() + "Editor">
+<#assign entitySelector = pojo.shortName.toLowerCase() + "Selector">
+<#assign entityFinder = pojo.shortName.toLowerCase() + "Finder">
+ @${pojo.importType("javax.ejb.Stateless")}
@${pojo.importType("org.jboss.seam.annotations.Name")}("${entitySelector}")
@${pojo.importType("javax.interceptor.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
public static class Default${pojo.shortName}Selector implements ${pojo.shortName}Selector {
@@ -59,7 +62,12 @@
}
-<#foreach property in pojo.getAllPropertiesIterator()><#if c2h.isOneToManyCollection(property)><#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)><#assign childEditor = childPojo.shortName.toLowerCase() + "Editor"><#assign childSelector = childPojo.shortName.toLowerCase() + pojo.shortName + "Selector"> @${pojo.importType("javax.ejb.Stateless")}
+<#foreach property in pojo.getAllPropertiesIterator()>
+<#if c2h.isOneToManyCollection(property)>
+<#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
+<#assign childEditor = childPojo.shortName.toLowerCase() + "Editor">
+<#assign childSelector = childPojo.shortName.toLowerCase() + pojo.shortName + "Selector">
+ @${pojo.importType("javax.ejb.Stateless")}
@${pojo.importType("org.jboss.seam.annotations.Name")}("${childSelector}")
@${pojo.importType("org.jboss.annotation.ejb.LocalBinding")}(jndiBinding="${childPojo.qualifiedDeclarationName}${pojo.shortName}Selector")
@${pojo.importType("org.jboss.seam.annotations.JndiName")}("${childPojo.qualifiedDeclarationName}${pojo.shortName}Selector")
@@ -114,7 +122,8 @@
}
-</#if></#foreach>}
+</#if>
+</#foreach>}
</#assign>
${pojo.generateImports()}
|
