[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views renderActionFormInput.vm

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

  User: walterim
  Date: 08/09/18 05:57:51

  Modified:    andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
                        JSFManageableEntityAttributeLogicImpl.java
               andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
               andromda-jsf2/src/main/resources/templates/jsf2/views
                        renderActionFormInput.vm
  Log:
  Better handling of associations between manageable and non-manageable associations.
  
  Revision  Changes    Path
  1.4       +29 -0     cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityAttributeLogicImpl.java
  
  Index: JSFManageableEntityAttributeLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFManageableEntityAttributeLogicImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- JSFManageableEntityAttributeLogicImpl.java	7 Sep 2007 16:42:48 -0000	1.3
  +++ JSFManageableEntityAttributeLogicImpl.java	18 Sep 2008 12:57:51 -0000	1.4
  @@ -6,6 +6,7 @@
   import org.andromda.utils.StringUtilsHelper;
   import org.andromda.metafacades.uml.ClassifierFacade;
   import org.andromda.metafacades.uml.ModelElementFacade;
  +import org.andromda.metafacades.uml.ParameterFacade;
   import org.apache.commons.lang.ObjectUtils;
   import org.apache.commons.lang.StringUtils;
   
  @@ -562,4 +563,32 @@
   
           return dateFormat;
       }
  +    
  +    /**
  +     * @see org.andromda.cartridges.jsf2.metafacades.JSFAttribute#getFormPropertyName(org.andromda.metafacades.uml.ParameterFacade)
  +     */
  +    protected String handleGetFormPropertyName(final ParameterFacade ownerParameter)
  +    {
  +        final StringBuffer propertyName = new StringBuffer();
  +        if (ownerParameter != null)
  +        {
  +            propertyName.append(ownerParameter.getName());
  +            propertyName.append('.');
  +        }
  +        final String name = this.getName();
  +        if (name != null && name.trim().length() > 0)
  +        {
  +            propertyName.append(name);
  +        }
  +        return propertyName.toString();
  +    }
  +    
  +    /**
  +     * @see org.andromda.cartridges.jsf2.metafacades.JSFAttribute#getFormPropertyId(java.lang.String)
  +     */
  +    protected String handleGetFormPropertyId(final ParameterFacade ownerParameter)
  +    {
  +        return StringUtilsHelper.lowerCamelCaseName(this.getFormPropertyName(ownerParameter));
  +    }
  +
   }
  \ No newline at end of file
  
  
  
  1.17      +226 -179  cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
  
  	<<Binary file>>
  
  
  1.10      +5 -0      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm
  
  Index: renderActionFormInput.vm
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- renderActionFormInput.vm	11 Aug 2008 12:26:18 -0000	1.9
  +++ renderActionFormInput.vm	18 Sep 2008 12:57:51 -0000	1.10
  @@ -8,8 +8,13 @@
   ##
   #macro(renderActionInput $parameter $ownerParameter)
   #if ($parameter.backingListName)
  +#if ($ownerParameter.type.hasStereotype('Entity'))
  +#set ($propertyId = $parameter.getFormPropertyId($ownerParameter))
  +#set ($valuePropertyName = ${parameter.getFormPropertyName($ownerParameter)})
  +#else
   #set ($propertyId = $parameter.name)
   #set ($valuePropertyName = $parameter.name)
  +#end
   #set ($backingListName = $parameter.backingListName)
   #set ($backingValueName = $parameter.backingValueName)
   #else