[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud Controller.java.vsl

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

  User: walterim
  Date: 07/03/04 08:06:54

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views
                        renderActionFormInput.vm
               andromda-jsf2/src/main/resources/templates/jsf2/forms/crud
                        Form.java.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
                        Controller.java.vsl
  Log:
  File upload support
  
  Revision  Changes    Path
  1.5       +3 -1      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.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- renderActionFormInput.vm	18 Jan 2007 12:37:13 -0000	1.4
  +++ renderActionFormInput.vm	4 Mar 2007 16:06:54 -0000	1.5
  @@ -67,7 +67,9 @@
           </tr:panelLabelAndMessage>  
   #else
   ##if the widget type is not defined explicit ...
  -#if($parameter.type.enumeration)
  +#if($parameter.inputFile)
  +        <tr:inputFile id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" columns="50"/>
  +#elseif($parameter.type.enumeration)
   #set ($multiSelect = $parameter.type.collectionType || $parameter.type.arrayType)
   #set ($selectBoxType = "selectOneChoice")
   #if ($multiSelect)
  
  
  
  1.3       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl
  
  Index: Form.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/forms/crud/Form.java.vsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -w -r1.2 -r1.3
  --- Form.java.vsl	18 Jan 2007 10:11:08 -0000	1.2
  +++ Form.java.vsl	4 Mar 2007 16:06:54 -0000	1.3
  @@ -94,7 +94,7 @@
   #foreach ($field in $manageable.manageableAttributes)
   #if ($field.type.collectionType)
   #set ($fieldTypeName = "java.util.List")
  -#elseif ($field.type.fileType)
  +#elseif ($field.inputFile)
   #set ($fieldTypeName = "$fileTypeName")
   #else
   #set ($fieldTypeName = $field.type.fullyQualifiedName)
  
  
  
  1.5       +8 -0      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
  
  Index: Controller.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- Controller.java.vsl	20 Feb 2007 10:14:55 -0000	1.4
  +++ Controller.java.vsl	4 Mar 2007 16:06:54 -0000	1.5
  @@ -250,7 +250,11 @@
   			${manageable.manageableServiceAccessorCall}.create(
   #set ($comma = '')
   #foreach ($member in $manageable.manageableMembers)
  +#if ($member.inputFile)
  +            	${comma}org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream())
  +#else	
               	${comma}form.${member.getterName}()
  +#end            	
   #set ($comma = ', ')
   #end
           	);
  @@ -259,7 +263,11 @@
           	${manageable.manageableServiceAccessorCall}.update(
   #set ($comma = '')
   #foreach ($member in $manageable.manageableMembers)
  +#if ($member.inputFile)
  +            	${comma}org.apache.commons.io.IOUtils.toByteArray(form.${member.getterName}().getInputStream())
  +#else	
               	${comma}form.${member.getterName}()
  +#end            	
   #set ($comma = ', ')
   #end
           	);