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

[Gavin King]

  User: gavin   
  Date: 07/02/25 16:13:57

  Modified:    seam-gen/view    edit.page.xml.ftl param.xml.ftl
                        view.page.xml.ftl
  Log:
  handle circular associations
  
  Revision  Changes    Path
  1.13      +3 -0      jboss-seam/seam-gen/view/edit.page.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: edit.page.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/edit.page.xml.ftl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- edit.page.xml.ftl	13 Feb 2007 07:24:25 -0000	1.12
  +++ edit.page.xml.ftl	25 Feb 2007 21:13:57 -0000	1.13
  @@ -24,7 +24,10 @@
   <#else>
      <param name="${idName}" value="${'#'}{${homeName}.${idName}}"/>
   </#if>
  +<#assign entities=util.set()>
  +<#if entities.add(pojo.shortName)>
   <#include "param.xml.ftl">
  +</#if>
   
      <navigation from-action="${'#'}{${homeName}.persist}">
          <end-conversation/>
  
  
  
  1.5       +10 -2     jboss-seam/seam-gen/view/param.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: param.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/param.xml.ftl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- param.xml.ftl	10 Feb 2007 05:06:10 -0000	1.4
  +++ param.xml.ftl	25 Feb 2007 21:13:57 -0000	1.5
  @@ -1,12 +1,19 @@
   <#foreach property in pojo.allPropertiesIterator>
   <#if c2h.isManyToOne(property)>
   <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
  -<#if parentPojo.shortName!=pojo.shortName>
  +<#if entities.add(parentPojo.shortName)>
   <#assign parentComponentName = util.lower(parentPojo.shortName)>
   <#assign parentHomeName = parentComponentName + "Home">
  -<#assign parentIdName = parentComponentName + util.upper(parentPojo.identifierProperty.name)>
      <param name="${parentComponentName}From"/>
  +<#assign parentIdName = parentComponentName + util.upper(parentPojo.identifierProperty.name)>
  +<#if c2j.isComponent(parentPojo.identifierProperty)>
  +<#foreach parentComponentProperty in parentPojo.identifierProperty.value.propertyIterator>
  +<#assign parentCidName = parentComponentName + util.upper(parentComponentProperty.name)>
  +   <param name="${parentCidName}" value="${'#'}{${parentHomeName}.${parentIdName}.${parentComponentProperty.name}}"/>
  +</#foreach>
  +<#else>
      <param name="${parentIdName}" value="${'#'}{${parentHomeName}.${parentIdName}}"/>
  +</#if>
   <#assign p = pojo>
   <#assign pojo = parentPojo>
   <#include "param.xml.ftl">
  @@ -14,3 +21,4 @@
   </#if>
   </#if>
   </#foreach>
  +
  
  
  
  1.3       +3 -0      jboss-seam/seam-gen/view/view.page.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: view.page.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/view.page.xml.ftl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- view.page.xml.ftl	9 Feb 2007 22:49:37 -0000	1.2
  +++ view.page.xml.ftl	25 Feb 2007 21:13:57 -0000	1.3
  @@ -16,5 +16,8 @@
   <#else>
      <param name="${idName}" value="${'#'}{${homeName}.${idName}}"/>
   </#if>
  +<#assign entities=util.set()>
  +<#if entities.add(pojo.shortName)>
   <#include "param.xml.ftl">
  +</#if>
   </page>
  \ No newline at end of file