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

[Gavin King]

  User: gavin   
  Date: 07/02/10 00:06:10

  Modified:    seam-gen/view    edit.xhtml.ftl param.xml.ftl view.xhtml.ftl
  Log:
  make it not crap out on self-associations
  
  Revision  Changes    Path
  1.34      +4 -4      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.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- edit.xhtml.ftl	10 Feb 2007 04:38:43 -0000	1.33
  +++ edit.xhtml.ftl	10 Feb 2007 05:06:10 -0000	1.34
  @@ -72,7 +72,7 @@
   <#assign parentPageName = parentPojo.shortName>
   <#assign parentName = util.lower(parentPojo.shortName)>
   
  -    <div class="association" id="${property.name}">
  +    <div class="association" id="${property.name}Parent">
       
           <h3>${property.name}</h3>
       
  @@ -83,7 +83,7 @@
                      value="${'#'}{${homeName}.instance.${property.name}}" 
                   rendered="${'#'}{${homeName}.instance.${property.name} != null}"
                 rowClasses="rvgRowOne,rvgRowTwo"
  -                      id="${property.name}">
  +                      id="${property.name}Table">
   <#foreach parentProperty in parentPojo.allPropertiesIterator>
   <#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)>
   <#if parentPojo.isComponent(parentProperty)>
  @@ -140,7 +140,7 @@
   
       <f:subview rendered="${'#'}{${homeName}.managed}" id="${property.name}">
       
  -        <div class="association" id="${property.name}">
  +        <div class="association" id="${property.name}Children">
           
               <h3>${property.name}</h3>
           
  @@ -155,7 +155,7 @@
                              var="${childName}" 
                         rendered="${'#'}{not empty ${homeName}.${property.name}}" 
                       rowClasses="rvgRowOne,rvgRowTwo"
  -                            id="${property.name}">
  +                            id="${property.name}Table">
   <#foreach childProperty in childPojo.allPropertiesIterator>
   <#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)>
   <#if childPojo.isComponent(childProperty)>
  
  
  
  1.4       +2 -0      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- param.xml.ftl	25 Jan 2007 20:45:05 -0000	1.3
  +++ param.xml.ftl	10 Feb 2007 05:06:10 -0000	1.4
  @@ -1,6 +1,7 @@
   <#foreach property in pojo.allPropertiesIterator>
   <#if c2h.isManyToOne(property)>
   <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
  +<#if parentPojo.shortName!=pojo.shortName>
   <#assign parentComponentName = util.lower(parentPojo.shortName)>
   <#assign parentHomeName = parentComponentName + "Home">
   <#assign parentIdName = parentComponentName + util.upper(parentPojo.identifierProperty.name)>
  @@ -11,4 +12,5 @@
   <#include "param.xml.ftl">
   <#assign pojo = p>
   </#if>
  +</#if>
   </#foreach>
  
  
  
  1.14      +4 -4      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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- view.xhtml.ftl	10 Feb 2007 02:04:37 -0000	1.13
  +++ view.xhtml.ftl	10 Feb 2007 05:06:10 -0000	1.14
  @@ -48,7 +48,7 @@
   <#assign parentPageName = parentPojo.shortName>
   <#assign parentName = util.lower(parentPojo.shortName)>
   
  -    <div class="association" id="${property.name}">
  +    <div class="association" id="${property.name}Parent">
       
           <h3>${property.name}</h3>
           
  @@ -59,7 +59,7 @@
                      value="${'#'}{${homeName}.instance.${property.name}}" 
                   rendered="${'#'}{${homeName}.instance.${property.name} != null}"
                 rowClasses="rvgRowOne,rvgRowTwo"
  -                      id="${property.name}">
  +                      id="${property.name}Table">
   <#foreach parentProperty in parentPojo.allPropertiesIterator>
   <#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)>
   <#if parentPojo.isComponent(parentProperty)>
  @@ -106,7 +106,7 @@
   </#if>
   <#if c2h.isOneToManyCollection(property)>
   
  -    <div class="association" id="${property.name}">
  +    <div class="association" id="${property.name}Children">
       
           <h3>${property.name}</h3>
           
  @@ -122,7 +122,7 @@
                          var="${childName}" 
                     rendered="${'#'}{not empty ${homeName}.${property.name}}" 
                   rowClasses="rvgRowOne,rvgRowTwo"
  -                        id="${property.name}">
  +                        id="${property.name}Table">
   <#foreach childProperty in childPojo.allPropertiesIterator>
   <#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)>
   <#if childPojo.isComponent(childProperty)>