[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms FormImpl.java.vsl Form.java.vsl

[Walter M. <wal...@us...>]

  User: walterim
  Date: 08/08/04 09:58:11

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/forms
                        FormImpl.java.vsl Form.java.vsl
  Log:
  Makes the condition to create backinglists follow the same rules.
  
  Revision  Changes    Path
  1.10      +2 -0      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl
  
  Index: FormImpl.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/FormImpl.java.vsl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- FormImpl.java.vsl	15 Jul 2008 11:44:08 -0000	1.9
  +++ FormImpl.java.vsl	4 Aug 2008 16:58:10 -0000	1.10
  @@ -82,9 +82,11 @@
   #end
   #if (!$field.type.enumeration)
   #foreach ($attribute in $field.attributes)
  +#if ($attribute.isSelectable($field) || $attribute.type.enumeration || $attribute.isBackingValueRequired($field))
   #renderBackingListImplSupport($attribute $field)
   #end
   #end
  +#end
   
   #end
   #if ($action.formResetRequired)
  
  
  
  1.5       +2 -7      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/Form.java.vsl
  
  Index: Form.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/Form.java.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- Form.java.vsl	15 Jul 2008 11:44:08 -0000	1.4
  +++ Form.java.vsl	4 Aug 2008 16:58:10 -0000	1.5
  @@ -34,17 +34,12 @@
   $field.getDocumentation("     * ")
        */
       public void ${field.setterName}($fieldTypeName $field.name);
  -#if ( (!$field.complex || $field.type.enumeration) && $field.selectable)
  +#if ( (!$field.complex && !$field.defaultValuePresent) || $field.type.enumeration)
   #renderBackingListSupport($field "")
   #end
  -#if ($field.backingValueRequired)
  -#renderBackingValueSupport($field "")
  -#end
   #foreach ($attribute in $field.attributes)
  -#if ($attribute.isSelectable($field))
  +#if ($attribute.isSelectable($field) || $attribute.type.enumeration || $attribute.isBackingValueRequired($field))
   #renderBackingListSupport($attribute $field)
  -#elseif ($attribute.isBackingValueRequired($field))
  -#renderBackingValueSupport($attribute $field)
   #end
   #end
   #end