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

[Max Rydahl Andersen]

  User: mandersen
  Date: 07/10/31 14:42:50

  Modified:    seam-gen/pojo  Tag: Seam_1_2_1_AP GetPropertyAnnotation.ftl
  Log:
  HBX-1004 @NotNull should not go on non-assigned ids
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.4.2   +9 -9      jboss-seam/seam-gen/pojo/GetPropertyAnnotation.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GetPropertyAnnotation.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/pojo/GetPropertyAnnotation.ftl,v
  retrieving revision 1.2.4.1
  retrieving revision 1.2.4.2
  diff -u -b -r1.2.4.1 -r1.2.4.2
  --- GetPropertyAnnotation.ftl	26 Oct 2007 13:44:39 -0000	1.2.4.1
  +++ GetPropertyAnnotation.ftl	31 Oct 2007 18:42:50 -0000	1.2.4.2
  @@ -1,5 +1,5 @@
   <#include "Ejb3PropertyGetAnnotation.ftl"/> 
  -<#if !property.optional && !property.equals(pojo.identifierProperty)> 
  +<#if !property.optional && ( !property.equals(pojo.identifierProperty) || property.value.identifierGeneratorStrategy == "assigned" )>
       @${pojo.importType("org.hibernate.validator.NotNull")} 
   </#if> 
   <#if property.columnSpan==1>