[seam-commits] Seam SVN: r9402 - in trunk/seam-gen: view and 1 other directory.

Author: dan.j.allen Date: 2008-10-23 14:53:40 -0400 (Thu, 23 Oct 2008) New Revision: 9402 Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl trunk/seam-gen/icefaces/view/view.xhtml.ftl trunk/seam-gen/view/edit.xhtml.ftl trunk/seam-gen/view/view.xhtml.ftl Log: use the variable name grandparent rather than parentParent Modified: trunk/seam-gen/icefaces/view/edit.xhtml.ftl =================================================================== --- trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-10-23 18:53:05 UTC (rev 9401) +++ trunk/seam-gen/icefaces/view/edit.xhtml.ftl 2008-10-23 18:53:40 UTC (rev 9402) @@ -120,18 +120,18 @@ </#if> </#if> <#if isToOne(parentProperty)> -<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> -<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)> -<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator> +<#assign grandparentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> +<#if grandparentPojo.isComponent(grandparentPojo.identifierProperty)> +<#foreach componentProperty in grandparentPojo.identifierProperty.value.propertyIterator> <ice:column id="$editColumn${parentProperty.name}Id"> <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}} + ${'#'}{${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}.${componentProperty.name}} </ice:column> </#foreach> <#else> <ice:column id="$editColumn${parentProperty.name}Id"> - <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(grandparentPojo.identifierProperty.name)?uncap_first}</f:facet> + ${'#'}{${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}} </ice:column> </#if> </#if> Modified: trunk/seam-gen/icefaces/view/view.xhtml.ftl =================================================================== --- trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-10-23 18:53:05 UTC (rev 9401) +++ trunk/seam-gen/icefaces/view/view.xhtml.ftl 2008-10-23 18:53:40 UTC (rev 9402) @@ -98,18 +98,18 @@ </#if> </#if> <#if isToOne(parentProperty)> -<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> -<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)> -<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator> +<#assign grandparentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> +<#if grandparentPojo.isComponent(grandparentPojo.identifierProperty)> +<#foreach componentProperty in grandparentPojo.identifierProperty.value.propertyIterator> <ice:column id="view${parentProperty.name}ColumnId"> <f:facet name="header">${label(parentProperty.name)} ${label(componentProperty.name)?uncap_first}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}} + ${'#'}{${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}.${componentProperty.name}} </ice:column> </#foreach> <#else> - <ice:column id="view${parentParentPojo.identifierProperty.name}ColumnName"> - <f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet> - ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}} + <ice:column id="view${grandparentPojo.identifierProperty.name}ColumnName"> + <f:facet name="header">${label(parentProperty.name)} ${label(grandparentPojo.identifierProperty.name)?uncap_first}</f:facet> + ${'#'}{${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}} </ice:column> </#if> </#if> Modified: trunk/seam-gen/view/edit.xhtml.ftl =================================================================== --- trunk/seam-gen/view/edit.xhtml.ftl 2008-10-23 18:53:05 UTC (rev 9401) +++ trunk/seam-gen/view/edit.xhtml.ftl 2008-10-23 18:53:40 UTC (rev 9402) @@ -113,18 +113,18 @@ </#if> </#if> <#if isToOne(parentProperty)> -<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> -<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)> -<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator> +<#assign grandparentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> +<#if grandparentPojo.isComponent(grandparentPojo.identifierProperty)> +<#foreach componentProperty in grandparentPojo.identifierProperty.value.propertyIterator> <h:column> <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/> + <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${grandparentPojo.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> - <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/> + <f:facet name="header">${label(parentProperty.name)} ${label(grandparentPojo.identifierProperty.name)?uncap_first}</f:facet> + <@outputValue property=grandparentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}}" indent=16/> </h:column> </#if> </#if> Modified: trunk/seam-gen/view/view.xhtml.ftl =================================================================== --- trunk/seam-gen/view/view.xhtml.ftl 2008-10-23 18:53:05 UTC (rev 9401) +++ trunk/seam-gen/view/view.xhtml.ftl 2008-10-23 18:53:40 UTC (rev 9402) @@ -86,18 +86,18 @@ </#if> </#if> <#if isToOne(parentProperty)> -<#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> -<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)> -<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator> +<#assign grandparentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))> +<#if grandparentPojo.isComponent(grandparentPojo.identifierProperty)> +<#foreach componentProperty in grandparentPojo.identifierProperty.value.propertyIterator> <h:column> <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/> + <@outputValue property=componentProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${grandparentPojo.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> - <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/> + <f:facet name="header">${label(parentProperty.name)} ${label(grandparentPojo.identifierProperty.name)?uncap_first}</f:facet> + <@outputValue property=grandparentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${grandparentPojo.identifierProperty.name}}" indent=16/> </h:column> </#if> </#if>