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

[Gavin King]

  User: gavin   
  Date: 06/12/10 10:42:02

  Modified:    seam-gen/src  EntityHome.java.ftl
  Log:
  make the Done buttons work nicely
  
  Revision  Changes    Path
  1.5       +22 -30    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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- EntityHome.java.ftl	10 Nov 2006 05:48:27 -0000	1.4
  +++ EntityHome.java.ftl	10 Dec 2006 15:42:02 -0000	1.5
  @@ -1,43 +1,31 @@
  +${pojo.packageDeclaration}
  +<#assign classbody>
   <#assign entityName = pojo.shortName>
   <#assign componentName = util.lower(entityName)>
   <#assign homeName = componentName + "Home">
  -${pojo.packageDeclaration}
  -
  -import org.jboss.seam.annotations.Name;
  -import org.jboss.seam.annotations.In;
  -import org.jboss.seam.annotations.RequestParameter;
  -import org.jboss.seam.framework.EntityHome;
  -
  -import java.util.List;
  -import java.util.ArrayList;
  -
  - at Name("${homeName}")
  -public class ${entityName}Home extends EntityHome<${entityName}>
  +@${pojo.importType("org.jboss.seam.annotations.Name")}("${homeName}")
  +public class ${entityName}Home extends ${pojo.importType("org.jboss.seam.framework.EntityHome")}<${entityName}>
   {
   
  -    @RequestParameter 
  -    ${pojo.identifierProperty.type.returnedClass.name} ${componentName}Id;
  -    
   <#foreach property in pojo.allPropertiesIterator>
   <#if c2h.isManyToOne(property)>
   <#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
   <#assign parentHomeName = util.lower(parentPojo.shortName) + "Home">
  -    @In(value="${'#'}{${parentHomeName}.instance}", required=false)
  +    @${pojo.importType("org.jboss.seam.annotations.In")}(value="${'#'}{${parentHomeName}.instance}", required=false)
       ${parentPojo.shortName} ${property.name};
   </#if>
   </#foreach>
   
  -    @Override
  -    public Object getId() 
  -    { 
  -        if (${componentName}Id==null)
  +<#assign idName = entityName + util.upper(pojo.identifierProperty.name)>
  +<#assign idType = pojo.importType(pojo.identifierProperty.type.returnedClass.name)>
  +    public void set${idName}(${idType} id)
           {
  -            return super.getId();
  +        setId(id);
           }
  -        else
  +
  +    public ${idType} get${idName}()
           {
  -            return ${componentName}Id;
  -        }
  +        return (${idType}) getId();
       }
       
       @Override
  @@ -57,11 +45,15 @@
   <#assign getter = "get" + pojo.getPropertyName(property)>
   <#if c2h.isOneToManyCollection(property)>
   <#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
  -    public List<${childPojo.shortName}> ${getter}() {
  +    public ${pojo.importType("java.util.List")}<${childPojo.shortName}> ${getter}() {
           return getInstance() == null ? 
  -            null : new ArrayList<${childPojo.shortName}>( getInstance().${getter}() );
  +            null : new ${pojo.importType("java.util.ArrayList")}<${childPojo.shortName}>( getInstance().${getter}() );
       }
   </#if>
   </#foreach>
   
   }
  +</#assign>
  +
  +${pojo.generateImports()}
  +${classbody}