Author: max.andersen(a)jboss.com Date: 2006-10-24 10:32:42 -0400 (Tue, 24 Oct 2006) New Revision: 10645 Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl Log: HBX-790 Excessive &nbsp;'s imparing entity table layout Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 11:31:35 UTC (rev 10644) +++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/entity.ftl 2006-10-24 14:32:42 UTC (rev 10645) @@ -85,19 +85,19 @@ <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>> <#if dochelper.getComponentPOJO(property)?exists> - &nbsp; <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame"> - ${compoclass.getJavaTypeName(property, jdk5)} + ${compoclass.getJavaTypeName(property, jdk5)?default("&nbsp;")} </A> <#else> - &nbsp; ${compoclass.getJavaTypeName(property, jdk5)} - </#if> + ${compoclass.getJavaTypeName(property, jdk5)?default("&nbsp;")} + </#if> </TD> <TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>> - &nbsp; <#if compoclass.hasFieldJavaDoc(property)?exists> - ${compoclass.getFieldDescription(property)} + ${compoclass.getFieldDescription(property)?default("&nbsp;")} + <#else> + &nbsp; </#if> </TD> </TR> @@ -125,12 +125,13 @@ Column </TD> <TD WIDTH="14%"> - &nbsp; ${class.getJavaTypeName(propertyIdentifier, jdk5)} + ${class.getJavaTypeName(propertyIdentifier, jdk5)?default("&nbsp;")} </TD> <TD WIDTH="58%"> - &nbsp; <#if class.hasFieldJavaDoc(propertyIdentifier)> - ${class.getFieldDescription(propertyIdentifier)} + ${class.getFieldDescription(propertyIdentifier)?default("&nbsp;")} + <#else> + &nbsp; </#if> </TD> </TR> @@ -204,19 +205,19 @@ <TD WIDTH="14%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>> <#if dochelper.getComponentPOJO(property)?exists> - &nbsp; <A HREF='${docFileManager.getRef(docFile, docFileManager.getEntityDocFileByDeclarationName(dochelper.getComponentPOJO(property)))}' TARGET="generalFrame"> - ${class.getJavaTypeName(property, jdk5)} + ${class.getJavaTypeName(property, jdk5)?default("&nbsp;")} </A> <#else> - &nbsp; ${class.getJavaTypeName(property, jdk5)} + ${class.getJavaTypeName(property, jdk5)?default("&nbsp;")} </#if> </TD> <TD WIDTH="44%" <#if (rowspan>0)>ROWSPAN="${rowspan}"</#if>> - &nbsp; <#if class.hasFieldJavaDoc(property)> - ${class.getFieldDescription(property)} + ${class.getFieldDescription(property)?default("&nbsp;")} + <#else> + &nbsp; </#if> </TD> </TR> Modified: branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl 2006-10-24 11:31:35 UTC (rev 10644) +++ branches/Branch_3_2/HibernateExt/tools/src/templates/doc/entities/package-summary.ftl 2006-10-24 14:32:42 UTC (rev 10645) @@ -30,7 +30,7 @@ </A> </TD> <TD WIDTH="70%"> - &nbsp;${class.getMetaAsString("class-description")} + ${class.getMetaAsString("class-description")?default("&nbsp;")} </TD> </TR> </#foreach>