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

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

  User: cwbrandon
  Date: 07/08/31 09:20:34

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/utils
                        FacesContextUtils.java.vsl
               andromda-jsf2/src/main/resources/templates/jsf2/flow
                        ActionForward.java.vsl
  Log:
  minor cleanup and fixes
  
  Revision  Changes    Path
  1.2       +11 -16    cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/FacesContextUtils.java.vsl
  
  Index: FacesContextUtils.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/utils/FacesContextUtils.java.vsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- FacesContextUtils.java.vsl	5 Dec 2006 19:39:21 -0000	1.1
  +++ FacesContextUtils.java.vsl	31 Aug 2007 16:20:33 -0000	1.2
  @@ -12,6 +12,7 @@
   import javax.servlet.ServletContext;
   import javax.servlet.ServletRequest;
   import javax.servlet.ServletResponse;
  +import javax.servlet.http.HttpServletRequest;
   
   /**
    * Contains utilities for dealing with the FacesContext.
  @@ -21,23 +22,17 @@
   public class $className
   {
       /**
  -     * Retrieves the current faces context given the <code>servletContext</code>, <code>request</code>,
  +     * Retrieves the current faces context given the <code>request</code>,
        * and <code>response</code>.
        * 
  -     * @param servletContext the servlet context.
        * @param request the ServletRequest instance.
        * @param response the ServletResponse instance
        * @return the current faces context.
        */
       public static FacesContext getFacesContext(
  -        final ServletContext servletContext,
           final ServletRequest request,
           final ServletResponse response)
       {
  -        if (servletContext == null)
  -        {
  -            throw new IllegalArgumentException("'servletContext' can not be null");
  -        }
           if (request == null)
           {
               throw new IllegalArgumentException("'request' can not be null");
  @@ -46,6 +41,8 @@
           {
               throw new IllegalArgumentException("'response' can not be null");
           }
  +        final HttpServletRequest httpRequest = (HttpServletRequest)request;
  +        final ServletContext servletContext = httpRequest.getSession().getServletContext();
           final LifecycleFactory lifecycleFactory =
               (LifecycleFactory)FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
           final Lifecycle lifecycle = lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
  @@ -65,20 +62,18 @@
       
       /**
        * Attempts to resolve the variable having the given <code>name</code> from the given 
  -     * <code>servletContext</code>, <code>request</code>, and <code>response</code>
  -     * @param servletContext the servlet context.
  +     * <code>request</code>, and <code>response</code>
        * @param request the ServletRequest instance.
        * @param response the ServletResponse instance
        * @param name the name of the variable to resolve.
        * @return
        */
       public static Object resolveVariable(
  -        final ServletContext servletContext,
           final ServletRequest request,
           final ServletResponse response,
           final String name)
       {
  -        final FacesContext facesContext = getFacesContext(servletContext,request,response);
  +        final FacesContext facesContext = getFacesContext(request, response);
           final javax.faces.el.VariableResolver variableResolver = facesContext.getApplication().getVariableResolver();
           return variableResolver.resolveVariable(
                   facesContext,
  
  
  
  1.4       +6 -6      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl
  
  Index: ActionForward.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/ActionForward.java.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- ActionForward.java.vsl	31 Aug 2007 15:32:51 -0000	1.3
  +++ ActionForward.java.vsl	31 Aug 2007 16:20:34 -0000	1.4
  @@ -33,19 +33,19 @@
   #set ($controller = $action.controller)
           $controller.fullyQualifiedName controller =
               ($controller.fullyQualifiedName)${facesContextUtilsFullyQualifiedName}.resolveVariable(
  -                this.getServletContext(), request, response,
  +                request, response,
                   "$controller.beanName");
   #if ($action.useCase)
   #set ($useCase = $action.useCase)
   #else
   #set ($useCase = $action)
   #end
  -#if (!$useCase.allForwards.empty)
  +##if (!$useCase.allForwards.empty)
           String forwardPath = ${managedBeansPackage}.UseCaseForwards.getPath(controller.${action.controllerAction}());
           response.sendRedirect(request.getContextPath() + forwardPath + (request.getQueryString() != null ? "?"+request.getQueryString() : ""));
  -#else
  -        controller.${action.controllerAction}();
  -#end
  +##else
  + ##       controller.${action.controllerAction}();
  +##end
       }
   
       /**