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

[Gavin King]

  User: gavin   
  Date: 07/02/09 23:19:36

  Modified:    seam-gen/src  EntityHome.java.ftl
  Log:
  association wiring
  
  Revision  Changes    Path
  1.8       +26 -3     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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- EntityHome.java.ftl	9 Feb 2007 23:56:33 -0000	1.7
  +++ EntityHome.java.ftl	10 Feb 2007 04:19:36 -0000	1.8
  @@ -11,7 +11,7 @@
   <#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}.instance}", required=false)
  +    @${pojo.importType("org.jboss.seam.annotations.In")}(value="${'#'}{${parentHomeName}.managedInstance}", required=false)
       ${parentPojo.shortName} ${property.name};
   </#if>
   </#foreach>
  @@ -56,13 +56,36 @@
   <#if pojo.isComponent(pojo.identifierProperty)>
           ${componentName}.setId( new ${entityName}Id() );
   </#if>
  +        return ${componentName};
  +    }
  +    
  +    public void wire()
  +    {
   <#foreach property in pojo.allPropertiesIterator>
   <#if c2h.isManyToOne(property)>
   <#assign setter = "set" + pojo.getPropertyName(property)>
  -        ${componentName}.${setter}(${property.name});
  +        if ( ${property.name}!=null )
  +        {
  +           getInstance().${setter}(${property.name});
  +        }
   </#if>
   </#foreach>
  -        return ${componentName};
  +    }
  +    
  +    public boolean isWired()
  +    {
  +<#foreach property in pojo.allPropertiesIterator>
  +<#if (c2h.isManyToOne(property) && !property.optional)>
  +<#assign getter = "get" + pojo.getPropertyName(property)>
  +        if ( getInstance().${getter}()==null ) return false;
  +</#if>
  +</#foreach>
  +        return true;
  +    }
  +    
  +    public ${entityName} getManagedInstance()
  +    {
  +        return isManaged() ? getInstance() : null;
       }
    	
   <#foreach property in pojo.allPropertiesIterator>