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

[Gavin King]

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

  Modified:    seam-gen/src  EntityHome.java.ftl
  Log:
  handle circular associations
  
  Revision  Changes    Path
  1.11      +6 -4      jboss-seam/seam-gen/src/EntityHome.java.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityHome.java.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/src/EntityHome.java.ftl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- EntityHome.java.ftl	24 Feb 2007 17:12:05 -0000	1.10
  +++ EntityHome.java.ftl	25 Feb 2007 21:13:57 -0000	1.11
  @@ -11,8 +11,8 @@
   <#if c2h.isManyToOne(property)>
   <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
   <#assign parentHomeName = util.lower(parentPojo.shortName) + "Home">
  -    @${pojo.importType("org.jboss.seam.annotations.In")}(value="${'#'}{${parentHomeName}.managedInstance}", required=false)
  -    ${parentPojo.shortName} ${property.name};
  +    @${pojo.importType("org.jboss.seam.annotations.In")}(create=true)
  +    ${parentPojo.shortName}Home ${parentHomeName};
   </#if>
   </#foreach>
   
  @@ -65,7 +65,9 @@
   <#if c2h.isManyToOne(property)>
   <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
   <#if parentPojo.shortName!=pojo.shortName>
  +<#assign parentHomeName = util.lower(parentPojo.shortName) + "Home">
   <#assign setter = "set" + pojo.getPropertyName(property)>
  +        ${parentPojo.shortName} ${property.name}=${parentHomeName}.getDefinedInstance();
           if ( ${property.name}!=null )
           {
              getInstance().${setter}(${property.name});
  @@ -86,9 +88,9 @@
           return true;
       }
       
  -    public ${entityName} getManagedInstance()
  +    public ${entityName} getDefinedInstance()
       {
  -        return isManaged() ? getInstance() : null;
  +        return isIdDefined() ? getInstance() : null;
       }
    	
   <#foreach property in pojo.allPropertiesIterator>