[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades JSFActionLogicImpl.java

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

  User: walterim
  Date: 07/12/05 07:41:03

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/facelets
                        view-action.xhtml.vsl
               andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip
               andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades
                        JSFActionLogicImpl.java
  Log:
  Corrected a bug regarding isNeedsFileUpload method
  
  Revision  Changes    Path
  1.5       +1 -1      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl
  
  Index: view-action.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/facelets/view-action.xhtml.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- view-action.xhtml.vsl	19 Jul 2007 18:09:30 -0000	1.4
  +++ view-action.xhtml.vsl	5 Dec 2007 15:41:02 -0000	1.5
  @@ -34,7 +34,7 @@
   #else
   #set ($clientValidation = $clientValidation && $action.validationRequired)
   #set ($formValidateName = "validate$stringUtils.capitalize($formName)")
  -<tr:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end#if($view.needsFileUpload) usesUpload="true"#end>
  +<tr:form id="$formName"#if($clientValidation) onsubmit="return $formValidateName(this);"#end#if($action.needsFileUpload) usesUpload="true"#end>
   #if (!$action.hiddenParameters.empty)
       <ui:include src="${action.viewFragmentPath}-hidden-params.xhtml"/>
   #end
  
  
  
  1.10      +174 -230  cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip
  
  	<<Binary file>>
  
  
  1.2       +25 -0     cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFActionLogicImpl.java
  
  Index: JSFActionLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFActionLogicImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- JSFActionLogicImpl.java	5 Dec 2006 19:39:09 -0000	1.1
  +++ JSFActionLogicImpl.java	5 Dec 2007 15:41:02 -0000	1.2
  @@ -729,4 +729,29 @@
       {
           return this.getMessages(JSFProfile.TAGGEDVALUE_ACTION_WARNING_MESSAGE);
       }
  +    
  +    /**
  +     * @see org.andromda.cartridges.jsf2.metafacades.JSFAction#isNeedsFileUpload()
  +     */
  +    protected boolean handleIsNeedsFileUpload()
  +    {
  +        if(this.getParameters().size() == 0)
  +            return false;
  +            
  +        for (final Iterator iterator = this.getParameters().iterator(); iterator.hasNext();)
  +        {
  +            final Object object = iterator.next();
  +            if (object instanceof JSFParameter){
  +                final JSFParameter parameter = (JSFParameter)object;
  +                if(parameter.isInputFile())
  +                   return true;
  +                if(parameter.isComplex()){
  +                    for(final Iterator attributes = parameter.getAttributes().iterator(); iterator.hasNext();)
  +                        if(((JSFAttribute)attributes.next()).isInputFile())
  +                            return true;
  +                }
  +            }
  +        }
  +        return false;
  +    }
   }