[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils FormPopulator.java.vsl

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/05/19 19:54:29

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/forms
                        FormImpl.java.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/utils
                        FormPopulator.java.vsl
  Log:
  add condition back (shouldn't have removed it).  Just make sure we set complex objects "set" flags when they are created by default
  
  Revision  Changes    Path
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- FormImpl.java.vsl	17 Apr 2008 20:41:51 -0000	1.4
  +++ FormImpl.java.vsl	20 May 2008 02:54:29 -0000	1.5
  @@ -46,6 +46,7 @@
           if (this.$field.name == null)
           {
               this.$field.name = new ${field.type.fullyQualifiedName}();
  +            this.${field.setterName}(this.$field.name);
           }
   #end
           return this.${field.name};
  
  
  
  1.7       +15 -12    cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/FormPopulator.java.vsl
  
  Index: FormPopulator.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/FormPopulator.java.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- FormPopulator.java.vsl	20 May 2008 00:32:40 -0000	1.6
  +++ FormPopulator.java.vsl	20 May 2008 02:54:29 -0000	1.7
  @@ -63,6 +63,8 @@
                                   isFromFormPropertySet = (java.lang.Boolean)org.apache.commons.beanutils.PropertyUtils.getProperty(fromForm, isSetPropertyName);
                               }
                           }
  +                        if (!override || (override && isFromFormPropertySet != null && isFromFormPropertySet.booleanValue()))
  +                        {
                           if (override || (isToFormPropertySet == null || !isToFormPropertySet.booleanValue()))
                           {
                               final java.beans.PropertyDescriptor toDescriptor =
  @@ -86,6 +88,7 @@
                       }
                   }
               }
  +            }
               catch (final Throwable throwable)
               {
                   throw new RuntimeException(throwable);