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

[Gavin King]

  User: gavin   
  Date: 07/02/09 17:49:37

  Modified:    seam-gen/src   EntityHome.java.ftl EntityList.java.ftl
  Log:
  basic working support for composite keys
  
  Revision  Changes    Path
  1.6       +17 -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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- EntityHome.java.ftl	10 Dec 2006 15:42:02 -0000	1.5
  +++ EntityHome.java.ftl	9 Feb 2007 22:49:37 -0000	1.6
  @@ -17,7 +17,11 @@
   </#foreach>
   
   <#assign idName = entityName + util.upper(pojo.identifierProperty.name)>
  +<#if c2j.isComponent(pojo.identifierProperty)>
  +<#assign idType = entityName + "Id">
  +<#else>
   <#assign idType = pojo.importType(pojo.identifierProperty.type.returnedClass.name)>
  +</#if>
       public void set${idName}(${idType} id)
       {
           setId(id);
  @@ -28,17 +32,27 @@
           return (${idType}) getId();
       }
   
  +<#if pojo.isComponent(pojo.identifierProperty)>
  +    public ${entityName}Home()
  +    {
  +        set${idName}( new ${entityName}Id() );
  +    }
  +</#if>
  +
       @Override
       protected ${entityName} createInstance()
       {
  -        ${entityName} result = new ${entityName}();
  +        ${entityName} ${componentName} = new ${entityName}();
  +<#if pojo.isComponent(pojo.identifierProperty)>
  +        ${componentName}.setId( new ${entityName}Id() );
  +</#if>
   <#foreach property in pojo.allPropertiesIterator>
   <#if c2h.isManyToOne(property)>
   <#assign setter = "set" + pojo.getPropertyName(property)>
  -        result.${setter}(${property.name});
  +        ${componentName}.${setter}(${property.name});
   </#if>
   </#foreach>
  -        return result;
  +        return ${componentName};
       }
    	
   <#foreach property in pojo.allPropertiesIterator>
  
  
  
  1.5       +18 -0     jboss-seam/seam-gen/src/EntityList.java.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityList.java.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/src/EntityList.java.ftl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- EntityList.java.ftl	16 Dec 2006 13:26:10 -0000	1.4
  +++ EntityList.java.ftl	9 Feb 2007 22:49:37 -0000	1.5
  @@ -15,14 +15,32 @@
       private static final String[] RESTRICTIONS = {
   <#foreach property in pojo.allPropertiesIterator>
   <#if !c2h.isCollection(property) && !c2h.isManyToOne(property)>
  +<#if c2j.isComponent(property)>
  +<#foreach componentProperty in property.value.propertyIterator>
  +<#if componentProperty.value.typeName == "string">
  +        "lower(${componentName}.${property.name}.${componentProperty.name}) like concat(lower(${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}),'%')",
  +</#if>
  +</#foreach>
  +<#else>
   <#if property.value.typeName == "string">
           "lower(${componentName}.${property.name}) like concat(lower(${'#'}{${listName}.${componentName}.${property.name}}),'%')",
   </#if>
   </#if>
  +</#if>
   </#foreach>
       };
   
  +<#if pojo.isComponent(pojo.identifierProperty)>
  +    private ${entityName} ${componentName};
  +
  +    public ${entityName}List()
  +    {
  +        ${componentName} = new ${entityName}();
  +        ${componentName}.setId( new ${entityName}Id() );
  +    }
  +<#else>
       private ${entityName} ${componentName} = new ${entityName}();
  +</#if>
   
       @Override
       public String getEjbql()