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

[Gavin King]

  User: gavin   
  Date: 07/02/07 10:40:19

  Modified:    seam-gen/view    edit.xhtml.ftl list.xhtml.ftl
                        view.xhtml.ftl
  Log:
  hum, lets see if this works
  
  Revision  Changes    Path
  1.23      +3 -3      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.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- edit.xhtml.ftl	17 Jan 2007 18:56:38 -0000	1.22
  +++ edit.xhtml.ftl	7 Feb 2007 15:40:19 -0000	1.23
  @@ -26,7 +26,7 @@
               <table>
                   <s:validateAll>
   <#foreach property in pojo.allPropertiesIterator>
  -<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property.columnSpan==1>
  +<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && !c2h.isOneToMany(property) && property.columnSpan==1>
   <#assign propertyIsId = property.equals(pojo.identifierProperty)>
   <#if !propertyIsId || property.value.identifierGeneratorStrategy == "assigned">
   <#assign column = property.columnIterator.next()>
  @@ -201,7 +201,7 @@
                 rowClasses="rvgRowOne,rvgRowTwo"
                         id="${property.name}">
   <#foreach parentProperty in parentPojo.allPropertiesIterator>
  -<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)>
  +<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && !c2h.isOneToMany(parentProperty)>
               <h:column>
                   <f:facet name="header">${parentProperty.name}</f:facet>
                   ${'#'}{${parentName}.${parentProperty.name}}
  @@ -250,7 +250,7 @@
                       rowClasses="rvgRowOne,rvgRowTwo"
                               id="${property.name}">
   <#foreach childProperty in childPojo.allPropertiesIterator>
  -<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)>
  +<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && !c2h.isOneToMany(childProperty)>
                   <h:column>
                       <f:facet name="header">${childProperty.name}</f:facet>
                       <h:outputText value="${'#'}{${childName}.${childProperty.name}}"/>
  
  
  
  1.11      +2 -2      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.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- list.xhtml.ftl	16 Dec 2006 15:05:39 -0000	1.10
  +++ list.xhtml.ftl	7 Feb 2007 15:40:19 -0000	1.11
  @@ -26,7 +26,7 @@
           <div class="dialog">
               <table>
   <#foreach property in pojo.allPropertiesIterator>
  -<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
  +<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && !c2h.isOneToMany(property)>
   <#if property.value.typeName == "string">
                   <tr class="prop">
                       <td class="name">${property.name}</td>
  @@ -59,7 +59,7 @@
                 value="${'#'}{${listName}.resultList}" 
              rendered="${'#'}{not empty ${listName}.resultList}">
   <#foreach property in pojo.allPropertiesIterator>
  -<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
  +<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && !c2h.isOneToMany(property)>
           <h:column>
               <f:facet name="header">
                   <s:link styleClass="columnHeader"
  
  
  
  1.9       +3 -3      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- view.xhtml.ftl	16 Dec 2006 13:26:10 -0000	1.8
  +++ view.xhtml.ftl	7 Feb 2007 15:40:19 -0000	1.9
  @@ -23,7 +23,7 @@
       <div id="${componentName}" class="dialog">
           <table>
   <#foreach property in pojo.allPropertiesIterator>
  -<#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
  +<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && !c2h.isOneToMany(property)>
   <#if !property.equals(pojo.identifierProperty) || property.value.identifierGeneratorStrategy == "assigned">
   
               <tr class="prop">
  @@ -92,7 +92,7 @@
                 rowClasses="rvgRowOne,rvgRowTwo"
                         id="${property.name}">
   <#foreach parentProperty in parentPojo.allPropertiesIterator>
  -<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty)>
  +<#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && !c2h.isOneToMany(parentProperty)>
               <h:column>
                   <f:facet name="header">${parentProperty.name}</f:facet>
                   ${'#'}{${parentName}.${parentProperty.name}}
  @@ -139,7 +139,7 @@
                   rowClasses="rvgRowOne,rvgRowTwo"
                           id="${property.name}">
   <#foreach childProperty in childPojo.allPropertiesIterator>
  -<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty)>
  +<#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && !c2h.isOneToMany(childProperty)>
               <h:column>
                   <f:facet name="header">${childProperty.name}</f:facet>
                   <h:outputText value="${'#'}{${childName}.${childProperty.name}}"/>