[jboss-cvs] jboss-seam/seam-gen/view ...

[Gavin King]

  User: gavin   
  Date: 07/02/25 16:27:18

  Modified:    seam-gen/view    edit.xhtml.ftl list.xhtml.ftl
                        view.xhtml.ftl
  Log:
  better representation of composite keys
  
  Revision  Changes    Path
  1.41      +9 -0      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.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- edit.xhtml.ftl	23 Feb 2007 17:07:02 -0000	1.40
  +++ edit.xhtml.ftl	25 Feb 2007 21:27:18 -0000	1.41
  @@ -109,11 +109,20 @@
   </#if>
   <#if c2h.isManyToOne(parentProperty)>
   <#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
  +<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
  +<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
  +            <h:column>
  +	    	    <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
  +		    	${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
  +            </h:column>
  +</#foreach>
  +<#else>
               <h:column>
   	    	    <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
   		    	${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
               </h:column>
   </#if>
  +</#if>
   </#foreach>
               <h:column>
                   <f:facet name="header">action</f:facet>
  
  
  
  1.17      +16 -1     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.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- list.xhtml.ftl	10 Feb 2007 07:33:22 -0000	1.16
  +++ list.xhtml.ftl	25 Feb 2007 21:27:18 -0000	1.17
  @@ -90,6 +90,20 @@
   </#if>
   <#if c2h.isManyToOne(property)>
   <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
  +<#if parentPojo.isComponent(parentPojo.identifierProperty)>
  +<#foreach componentProperty in parentPojo.identifierProperty.value.propertyIterator>
  +        <h:column>
  +            <f:facet name="header">
  +<#assign propertyPath = property.name + '.' + parentPojo.identifierProperty.name + '.' + componentProperty.name>
  +                <s:link styleClass="columnHeader"
  +                             value="${property.name} ${componentProperty.name} ${'#'}{${listName}.order=='${propertyPath} asc' ? messages.down : ( ${listName}.order=='${propertyPath} desc' ? messages.up : '' )}">
  +                    <f:param name="order" value="${'#'}{${listName}.order=='${propertyPath} asc' ? '${propertyPath} desc' : '${propertyPath} asc'}"/>
  +                </s:link>
  +            </f:facet>
  +            ${'#'}{${componentName}.${propertyPath}}
  +        </h:column>
  +</#foreach>
  +<#else>
           <h:column>
               <f:facet name="header">
   <#assign propertyPath = property.name + '.' + parentPojo.identifierProperty.name>
  @@ -98,9 +112,10 @@
                       <f:param name="order" value="${'#'}{${listName}.order=='${propertyPath} asc' ? '${propertyPath} desc' : '${propertyPath} asc'}"/>
                   </s:link>
               </f:facet>
  -            ${'#'}{${componentName}.${property.name}.${parentPojo.identifierProperty.name}}
  +            ${'#'}{${componentName}.${propertyPath}}
           </h:column>
   </#if>
  +</#if>
   </#foreach>
           <h:column>
               <f:facet name="header">action</f:facet>
  
  
  
  1.17      +11 -2     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.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- view.xhtml.ftl	16 Feb 2007 18:54:06 -0000	1.16
  +++ view.xhtml.ftl	25 Feb 2007 21:27:18 -0000	1.17
  @@ -78,11 +78,20 @@
   </#if>
   <#if c2h.isManyToOne(parentProperty)>
   <#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
  +<#if parentParentPojo.isComponent(parentParentPojo.identifierProperty)>
  +<#foreach componentProperty in parentParentPojo.identifierProperty.value.propertyIterator>
  +            <h:column>
  +	    	    <f:facet name="header">${parentProperty.name} ${componentProperty.name}</f:facet>
  +		    	${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}.${componentProperty.name}}
  +            </h:column>
  +</#foreach>
  +<#else>
               <h:column>
                   <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
                   ${'#'}{${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}
               </h:column>
   </#if>
  +</#if>
   </#foreach>
               <h:column>
                   <f:facet name="header">action</f:facet>