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

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

  User: cwbrandon
  Date: 08/04/29 18:05:55

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet
                        PortletPhaseListener.java.vsl
  Log:
  move role logic up
  
  Revision  Changes    Path
  1.8       +5 -5      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl
  
  Index: PortletPhaseListener.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet/PortletPhaseListener.java.vsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -r1.7 -r1.8
  --- PortletPhaseListener.java.vsl	29 Apr 2008 19:03:25 -0000	1.7
  +++ PortletPhaseListener.java.vsl	30 Apr 2008 01:05:54 -0000	1.8
  @@ -20,8 +20,6 @@
           final String viewId = this.getViewId(event);
           if (viewId != null && event.getFacesContext() != null)
           {
  -            if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
  -            {
   #foreach ($role in $roles)
   #set ($userIsInRoleName = "userIs${stringUtils.upperCamelCaseName($role.name.toLowerCase())}")
   #set ($specializedRoles = $role.generalizedByActors)
  @@ -32,6 +30,8 @@
                   ;
                   ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName",  Boolean.valueOf($userIsInRoleName));
   #end
  +            if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
  +            {
   #foreach ($useCase in $useCases)
   #set ($controller = $useCase.controller)
   #set ($ifClause = "if")