[jboss-cvs] jboss-seam/seam-gen/view ...
Gavin King
gavin.king at jboss.com
Fri Feb 9 18:18:25 EST 2007
User: gavin
Date: 07/02/09 18:18:25
Modified: seam-gen/view edit.xhtml.ftl view.xhtml.ftl
Log:
composite key navigation
Revision Changes Path
1.27 +33 -1 jboss-seam/seam-gen/view/edit.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: edit.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/edit.xhtml.ftl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- edit.xhtml.ftl 9 Feb 2007 22:49:37 -0000 1.26
+++ edit.xhtml.ftl 9 Feb 2007 23:18:25 -0000 1.27
@@ -199,11 +199,20 @@
id="${property.name}">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)>
+<#if parentPojo.isComponent(parentProperty)>
+<#foreach componentProperty in parentProperty.value.propertyIterator>
+ <h:column>
+ <f:facet name="header">${componentProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${componentProperty.name}}
+ </h:column>
+</#foreach>
+<#else>
<h:column>
<f:facet name="header">${parentProperty.name}</f:facet>
${'#'}{${parentName}.${parentProperty.name}}
</h:column>
</#if>
+</#if>
<#if c2h.isManyToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<h:column>
@@ -218,8 +227,15 @@
id="view${parentName}"
value="View"
propagation="none">
+<#if parentPojo.isComponent(parentPojo.identifierProperty)>
+<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
+ <f:param name="${parentName}${util.upper(componentProperty.name)}"
+ value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
+</#foreach>
+<#else>
<f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
+</#if>
</s:link>
</h:column>
</h:dataTable>
@@ -248,11 +264,20 @@
id="${property.name}">
<#foreach childProperty in childPojo.allPropertiesIterator>
<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)>
+<#if childPojo.isComponent(childProperty)>
+<#foreach componentProperty in childProperty.value.propertyIterator>
+ <h:column>
+ <f:facet name="header">${componentProperty.name}</f:facet>
+ ${'#'}{${childName}.${childProperty.name}.${componentProperty.name}}
+ </h:column>
+</#foreach>
+<#else>
<h:column>
<f:facet name="header">${childProperty.name}</f:facet>
<h:outputText value="${'#'}{${childName}.${childProperty.name}}"/>
</h:column>
</#if>
+</#if>
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
@@ -260,8 +285,15 @@
id="select${childName}"
value="Select"
propagation="none">
+<#if childPojo.isComponent(childPojo.identifierProperty)>
+<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
+ <f:param name="${childName}${util.upper(componentProperty.name)}"
+ value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
+</#foreach>
+<#else>
<f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
+</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
1.12 +32 -0 jboss-seam/seam-gen/view/view.xhtml.ftl
(In the diff below, changes in quantity of whitespace are not shown.)
Index: view.xhtml.ftl
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/view.xhtml.ftl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- view.xhtml.ftl 9 Feb 2007 22:49:37 -0000 1.11
+++ view.xhtml.ftl 9 Feb 2007 23:18:25 -0000 1.12
@@ -63,11 +63,20 @@
id="${property.name}">
<#foreach parentProperty in parentPojo.allPropertiesIterator>
<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)>
+<#if parentPojo.isComponent(parentProperty)>
+<#foreach componentProperty in parentProperty.value.propertyIterator>
+ <h:column>
+ <f:facet name="header">${componentProperty.name}</f:facet>
+ ${'#'}{${parentName}.${parentProperty.name}.${componentProperty.name}}
+ </h:column>
+</#foreach>
+<#else>
<h:column>
<f:facet name="header">${parentProperty.name}</f:facet>
${'#'}{${parentName}.${parentProperty.name}}
</h:column>
</#if>
+</#if>
<#if c2h.isManyToOne(parentProperty)>
<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
<h:column>
@@ -81,8 +90,15 @@
<s:link id="view${parentName}"
value="View"
view="/${parentPageName}.xhtml">
+<#if parentPojo.isComponent(parentPojo.identifierProperty)>
+<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
+ <f:param name="${parentName}${util.upper(componentProperty.name)}"
+ value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}.${componentProperty.name}}"/>
+</#foreach>
+<#else>
<f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
+</#if>
</s:link>
</h:column>
</h:dataTable>
@@ -110,19 +126,35 @@
id="${property.name}">
<#foreach childProperty in childPojo.allPropertiesIterator>
<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)>
+<#if childPojo.isComponent(childProperty)>
+<#foreach componentProperty in childProperty.value.propertyIterator>
+ <h:column>
+ <f:facet name="header">${componentProperty.name}</f:facet>
+ ${'#'}{${childName}.${childProperty.name}.${componentProperty.name}}
+ </h:column>
+</#foreach>
+<#else>
<h:column>
<f:facet name="header">${childProperty.name}</f:facet>
<h:outputText value="${'#'}{${childName}.${childProperty.name}}"/>
</h:column>
</#if>
+</#if>
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
<s:link id="select${childName}"
value="Select"
view="/${childPageName}.xhtml">
+<#if childPojo.isComponent(childPojo.identifierProperty)>
+<#foreach componentProperty in childPojo.identifierProperty.value.propertyIterator>
+ <f:param name="${childName}${util.upper(componentProperty.name)}"
+ value="${'#'}{${childName}.${childPojo.identifierProperty.name}.${componentProperty.name}}"/>
+</#foreach>
+<#else>
<f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
+</#if>
<f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
More information about the jboss-cvs-commits
mailing list