[Andromdaplugins-cvs] CVS update: cartridges/andromda-ejb3/src/main/resources/templates/ejb3 EntityEmbeddable.vsl

[Vance K. <va...@us...>]

  User: vancek  
  Date: 06/01/31 07:17:57

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        EntityEmbeddable.vsl
  Log:
  static constants are defined as public (not private), check to see if generic finders are modelled,
  
  Revision  Changes    Path
  1.12      +7 -6      cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
  
  Index: EntityEmbeddable.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -r1.11 -r1.12
  --- EntityEmbeddable.vsl	29 Jan 2006 03:19:56 -0000	1.11
  +++ EntityEmbeddable.vsl	31 Jan 2006 15:17:57 -0000	1.12
  @@ -79,7 +79,7 @@
       
   #**##foreach ($constant in $constants)
       @javax.persistence.Transient
  -    private static final $constant.type.fullyQualifiedName $constant.name = $constant.defaultValue;
  +    public static final $constant.type.fullyQualifiedName $constant.name = $constant.defaultValue;
   #**##end
   #end
   #set ($attributes = $entity.attributes)
  @@ -475,8 +475,8 @@
   
   ## Do not include the findAll finder for inheriting classes when the
   ## inheritance strategy is single table.  This is defined in the base
  -## class.
  -#**##if (($entity.inheritanceSingleTable && !$entity.requiresGeneralizationMapping) || !$entity.inheritanceSingleTable)
  +## class.  Only render if the findAll finder hasn't been modelled.
  +#**##if ((($entity.inheritanceSingleTable && !$entity.requiresGeneralizationMapping) || !$entity.inheritanceSingleTable) && !$entity.finderFindAllExists)
       /**
        * Returns the collection of all ${entity.name}s.
        *
  @@ -496,7 +496,8 @@
   ## queries, so queries based on the base/root class are polymorphic.
   ## Do not include the findByPrimaryKey if this bean has a composite
   ## primary key class.
  -#**##if (!$entity.compositePrimaryKeyPresent && !$entity.requiresGeneralizationMapping)
  +## Only render if the findAll finder hasn't been modelled.
  +#**##if (!$entity.compositePrimaryKeyPresent && !$entity.requiresGeneralizationMapping && !$entity.finderFindByPrimaryKeyExists)
   #*  *##foreach ($attribute in $entity.getIdentifiers(false))
   #*    *##set ($identifierName = $attribute.name)
   #*    *##set ($identifierType = $attribute.type.fullyQualifiedName)
  @@ -580,13 +581,13 @@
   
       // --------------- Business Methods -----------------
       
  -#**##foreach ($operation in )
  +#**##foreach ($operation in $businessOperations)
   #*  *##set ($signature = $operation.signature)
   #*  *##set ($visibility = $operation.visibility.toString())
  +#*  *##set ($returnType = $operation.returnType.fullyQualifiedName)
       /**
   $operation.getDocumentation("     * ")
        */
  -#*  *##set ($returnType = $operation.returnType.fullyQualifiedName)
   #*  *##if ($operation.exceptionsPresent)
       $visibility abstract $returnType $signature
           throws $operation.exceptionList;