[Andromda-cvs] CVS update: cartridges/andromda-spring/src/templates/spring/crud SpringCrudDaoBase.vsl

[Wouter Z. <dra...@us...>]

  User: draftdog
  Date: 06/01/30 04:20:42

  Modified:    andromda-spring/src/templates/spring/crud Tag: V3_x_HEAD
                        SpringCrudDaoBase.vsl
  Log:
  update to recent fix: manageable entities using inheritance have the same return type in the DAOs (the hierarchy root)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.34.4.7  +2 -2      cartridges/andromda-spring/src/templates/spring/crud/SpringCrudDaoBase.vsl
  
  Index: SpringCrudDaoBase.vsl
  ===================================================================
  RCS file: /cvsroot/andromda/cartridges/andromda-spring/src/templates/spring/crud/SpringCrudDaoBase.vsl,v
  retrieving revision 1.34.4.6
  retrieving revision 1.34.4.7
  diff -u -w -r1.34.4.6 -r1.34.4.7
  --- SpringCrudDaoBase.vsl	27 Jan 2006 23:04:11 -0000	1.34.4.6
  +++ SpringCrudDaoBase.vsl	30 Jan 2006 12:20:41 -0000	1.34.4.7
  @@ -259,7 +259,7 @@
       public $manageable.fullyQualifiedEntityName update($memberList)
       {
   #set ($identifier = $manageable.manageableIdentifier)
  -        final $manageable.fullyQualifiedEntityName entity =#if($manageable.fullyQualifiedName != $manageable.fullyQualifiedEntityName) (${manageable.fullyQualifiedName})#end this.getDao().load($identifier.name);
  +        final $manageable.fullyQualifiedEntityName entity =#if($manageable.fullyQualifiedName != $manageable.generalizationRoot.fullyQualifiedName) (${manageable.fullyQualifiedName})#end this.getDao().load($identifier.name);
   
   #foreach ($member in $manageable.manageableAttributes)
   #if (!$member.equals($identifier))## the identifier is already present since we loaded the entity
  @@ -279,7 +279,7 @@
           $member.type.fullyQualifiedName $memberEntityName = null;
           if ($member.name != null)
           {
  -            $memberEntityName =#if($member.type.fullyQualifiedName != $member.type.fullyQualifiedEntityName) (${member.type.fullyQualifiedName})#end ${member.daoGetterName}().load($member.name);
  +            $memberEntityName =#if($member.type.fullyQualifiedName != $member.type.generalizationRoot.fullyQualifiedName) (${member.type.fullyQualifiedName})#end ${member.daoGetterName}().load($member.name);
           }
   #end
   #if ($member.required)