From: Chad B. <cwb...@us...> - 2008-03-21 16:16:00
|
User: cwbrandon Date: 08/03/21 09:15:27 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: fix comment Revision Changes Path 1.2 +2 -2 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.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- PortletPhaseListener.java.vsl 21 Mar 2008 16:07:12 -0000 1.1 +++ PortletPhaseListener.java.vsl 21 Mar 2008 16:15:27 -0000 1.2 @@ -4,8 +4,8 @@ #end /** - * Used to pass messages to the current faces context (this allows messages to live beyond - * a request, which is very useful when redirecting). + * A phase listener which handles the pre-population of the form that is passed + * from view to view. * * @author Chad Brandon */ |
From: Chad B. <cwb...@us...> - 2008-04-03 01:03:54
|
User: cwbrandon Date: 08/04/02 18:04:00 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: remove uneeded try/catch Revision Changes Path 1.3 +8 -15 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.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- PortletPhaseListener.java.vsl 21 Mar 2008 16:15:27 -0000 1.2 +++ PortletPhaseListener.java.vsl 3 Apr 2008 01:04:00 -0000 1.3 @@ -20,8 +20,6 @@ final String viewId = this.getViewId(event); if (viewId != null && event.getFacesContext() != null) { - try - { if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) { #set ($useCase = ${applicationUseCases.iterator().next()}) @@ -39,11 +37,6 @@ this.populateView(event, viewId); } } - catch (Exception ex) - { - ex.printStackTrace(); - } - } } private String getViewId(javax.faces.event.PhaseEvent event) |
From: Chad B. <cwb...@us...> - 2008-04-03 22:13:04
|
User: cwbrandon Date: 08/04/03 15:13:10 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: add another populateView call Revision Changes Path 1.4 +1 -0 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.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- PortletPhaseListener.java.vsl 3 Apr 2008 01:04:00 -0000 1.3 +++ PortletPhaseListener.java.vsl 3 Apr 2008 22:13:10 -0000 1.4 @@ -30,6 +30,7 @@ event.getFacesContext().getApplication().getVariableResolver().resolveVariable( event.getFacesContext(), "$controller.beanName"); controller.${useCase.controllerAction}(); + this.populateView(event, viewId); } } else if (javax.faces.event.PhaseId.APPLY_REQUEST_VALUES.equals(event.getPhaseId())) |
From: Chad B. <cwb...@us...> - 2008-04-03 23:53:19
|
User: cwbrandon Date: 08/04/03 16:53:23 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: spacing fix Revision Changes Path 1.5 +1 -1 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.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 |
From: Chad B. <cwb...@us...> - 2008-04-07 15:38:34
|
User: cwbrandon Date: 08/04/07 08:38:36 Modified: andromda-jsf2/src/main/resources/META-INF/andromda cartridge.xml andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades JSFUseCaseLogicImpl.java andromda-jsf2/src/main/uml JSFMetafacadeModel.xml.zip andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: make the portlet phase listener handle all front end use cases in the model Revision Changes Path 1.21 +2 -4 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml Index: cartridge.xml =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -w -r1.20 -r1.21 --- cartridge.xml 3 Apr 2008 22:21:20 -0000 1.20 +++ cartridge.xml 7 Apr 2008 15:38:34 -0000 1.21 @@ -1085,10 +1085,8 @@ outputCondition="portlet" outputOnEmptyElements="false"> <modelElements> - <modelElement variable="applicationUseCases"> - <type name="org.andromda.metafacades.uml.FrontEndUseCase"> - <property name="entryUseCase"/> - </type> + <modelElement variable="useCases"> + <type name="org.andromda.metafacades.uml.FrontEndUseCase"/> </modelElement> </modelElements> </template> 1.8 +15 -0 cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java Index: JSFUseCaseLogicImpl.java =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/java/org/andromda/cartridges/jsf2/metafacades/JSFUseCaseLogicImpl.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- JSFUseCaseLogicImpl.java 29 Mar 2008 00:05:32 -0000 1.7 +++ JSFUseCaseLogicImpl.java 7 Apr 2008 15:38:34 -0000 1.8 @@ -671,6 +671,7 @@ /** * @see org.andromda.cartridges.jsf2.metafacades.JSFUseCase#getRegistrationUseCases() */ + @SuppressWarnings("unchecked") protected List handleGetRegistrationUseCases() { final List useCases = new ArrayList(this.getAllUseCases()); @@ -708,6 +709,7 @@ /** * @see org.andromda.cartridges.jsf2.metafacades.JSFUseCase#getNavigationRules() */ + @SuppressWarnings("unchecked") protected Collection handleGetNavigationRules() { final Map rules = new LinkedHashMap(); @@ -768,6 +770,7 @@ { final JSFUseCase theUseCase = this; return CollectionUtils.select(getAllUseCases(),new Predicate() { + @SuppressWarnings("synthetic-access") public boolean evaluate(Object o) { final JSFUseCase useCase = (JSFUseCase)o; @@ -864,4 +867,16 @@ { return this.getInitialTargetPath(); } + + @SuppressWarnings("unchecked") + @Override + protected Collection handleGetAllViews() + { + final Set allViews = new LinkedHashSet(); + for (final Iterator iterator = this.getAllUseCases().iterator(); iterator.hasNext();) + { + allViews.addAll(((FrontEndUseCase)iterator.next()).getViews()); + } + return allViews; + } } 1.14 +213 -224 cartridges/andromda-jsf2/src/main/uml/JSFMetafacadeModel.xml.zip <<Binary file>> 1.6 +8 -3 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.5 retrieving revision 1.6 diff -u -w -r1.5 -r1.6 --- PortletPhaseListener.java.vsl 3 Apr 2008 23:53:23 -0000 1.5 +++ PortletPhaseListener.java.vsl 7 Apr 2008 15:38:36 -0000 1.6 @@ -22,9 +22,13 @@ { if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) { -#set ($useCase = ${applicationUseCases.iterator().next()}) +#foreach ($useCase in $useCases) #set ($controller = $useCase.controller) - if (viewId.equals("${useCase.initialTargetPath}.xhtml")) +#set ($ifClause = "if") +#if ($velocityCount > 1) +#set ($ifClause = "else $ifClause") +#end + $ifClause (viewId.equals("${useCase.initialTargetPath}.xhtml")) { final $controller.fullyQualifiedName controller = ($controller.fullyQualifiedName) event.getFacesContext().getApplication().getVariableResolver().resolveVariable( @@ -32,6 +36,7 @@ controller.${useCase.controllerAction}(); this.populateView(event, viewId); } +#end } else if (javax.faces.event.PhaseId.APPLY_REQUEST_VALUES.equals(event.getPhaseId())) { @@ -53,7 +58,7 @@ private void populateView(javax.faces.event.PhaseEvent event, String viewId) { -#foreach ($view in $useCase.views) +#foreach ($view in $useCases.iterator().next().allViews) #if ($view.populatorRequired) #set ($ifClause = "if") #if ($velocityCount > 1) |
From: Chad B. <cwb...@us...> - 2008-04-29 19:03:23
|
User: cwbrandon Date: 08/04/29 12:03:25 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: add population of any roles to portlet phase listener Revision Changes Path 1.7 +10 -0 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.6 retrieving revision 1.7 diff -u -w -r1.6 -r1.7 --- PortletPhaseListener.java.vsl 7 Apr 2008 15:38:36 -0000 1.6 +++ PortletPhaseListener.java.vsl 29 Apr 2008 19:03:25 -0000 1.7 @@ -22,6 +22,16 @@ { 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) + final boolean $userIsInRoleName = event.getFacesContext().getExternalContext().isUserInRole("$role.name") +#foreach ($specializedRole in $role.generalizedByActors) + || event.getFacesContext().getExternalContext().isUserInRole("$specializedRole.name") +#end + ; + ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName", Boolean.valueOf($userIsInRoleName)); +#end #foreach ($useCase in $useCases) #set ($controller = $useCase.controller) #set ($ifClause = "if") |
From: Chad B. <cwb...@us...> - 2008-04-30 01:05:47
|
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") |
From: Chad B. <cwb...@us...> - 2008-04-30 01:06:59
|
User: cwbrandon Date: 08/04/29 18:07:07 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: get rid of some unnecessary code Revision Changes Path 1.9 +1 -1 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.8 retrieving revision 1.9 diff -u -w -r1.8 -r1.9 --- PortletPhaseListener.java.vsl 30 Apr 2008 01:05:54 -0000 1.8 +++ PortletPhaseListener.java.vsl 30 Apr 2008 01:07:07 -0000 1.9 @@ -28,7 +28,7 @@ || event.getFacesContext().getExternalContext().isUserInRole("$specializedRole.name") #end ; - ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName", Boolean.valueOf($userIsInRoleName)); + ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute("$userIsInRoleName", $userIsInRoleName); #end if (javax.faces.event.PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) { |
From: Chad B. <cwb...@us...> - 2008-05-06 18:49:47
|
User: cwbrandon Date: 08/05/06 11:49:49 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: Minor improvement Revision Changes Path 1.10 +2 -1 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.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- PortletPhaseListener.java.vsl 30 Apr 2008 01:07:07 -0000 1.9 +++ PortletPhaseListener.java.vsl 6 May 2008 18:49:48 -0000 1.10 @@ -86,7 +86,8 @@ protected void handleAfterPhase(javax.faces.event.PhaseEvent event) { final String viewId = this.getViewId(event); - if (javax.faces.event.PhaseId.INVOKE_APPLICATION.equals(event.getPhaseId())) + if (javax.faces.event.PhaseId.INVOKE_APPLICATION.equals(event.getPhaseId()) || + javax.faces.event.PhaseId.APPLY_REQUEST_VALUES.equals(event.getPhaseId())) { this.populateView(event, viewId); } |
From: Chad B. <cwb...@us...> - 2008-05-08 23:02:59
|
User: cwbrandon Date: 08/05/08 16:03:06 Modified: andromda-jsf2/src/main/resources/META-INF/andromda cartridge.xml andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: only include referenced roles (not all defined in the application) Revision Changes Path 1.29 +0 -3 cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml Index: cartridge.xml =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/META-INF/andromda/cartridge.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -w -r1.28 -r1.29 --- cartridge.xml 2 May 2008 21:21:39 -0000 1.28 +++ cartridge.xml 8 May 2008 23:03:06 -0000 1.29 @@ -1145,9 +1145,6 @@ <modelElement variable="useCases"> <type name="org.andromda.metafacades.uml.FrontEndUseCase"/> </modelElement> - <modelElement variable="roles"> - <type name="org.andromda.metafacades.uml.Role"/> - </modelElement> </modelElements> </template> 1.11 +1 -1 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.10 retrieving revision 1.11 diff -u -w -r1.10 -r1.11 --- PortletPhaseListener.java.vsl 6 May 2008 18:49:48 -0000 1.10 +++ PortletPhaseListener.java.vsl 8 May 2008 23:03:06 -0000 1.11 @@ -20,7 +20,7 @@ final String viewId = this.getViewId(event); if (viewId != null && event.getFacesContext() != null) { -#foreach ($role in $roles) +#foreach ($role in $useCases.iterator().next().getAllRoles()) #set ($userIsInRoleName = "userIs${stringUtils.upperCamelCaseName($role.name.toLowerCase())}") #set ($specializedRoles = $role.generalizedByActors) final boolean $userIsInRoleName = event.getFacesContext().getExternalContext().isUserInRole("$role.name") |
From: Chad B. <cwb...@us...> - 2008-06-30 15:15:15
|
User: cwbrandon Date: 08/06/30 08:15:23 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: improve handling of use case entry points Revision Changes Path 1.13 +6 -3 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.12 retrieving revision 1.13 diff -u -w -r1.12 -r1.13 --- PortletPhaseListener.java.vsl 16 May 2008 22:09:05 -0000 1.12 +++ PortletPhaseListener.java.vsl 30 Jun 2008 15:15:22 -0000 1.13 @@ -19,7 +19,7 @@ @Override protected void handleBeforePhase(javax.faces.event.PhaseEvent event) { - final String viewId = this.getViewId(event); + String viewId = this.getViewId(event); if (viewId != null && event.getFacesContext() != null) { // - make the faces context available to all views @@ -43,12 +43,15 @@ #if ($velocityCount > 1) #set ($ifClause = "else $ifClause") #end - $ifClause (viewId.equals("${useCase.initialTargetPath}.xhtml")) + $ifClause (viewId.equals("${useCase.portletViewPath}.xhtml")) { final $controller.fullyQualifiedName controller = ($controller.fullyQualifiedName) event.getFacesContext().getApplication().getVariableResolver().resolveVariable( event.getFacesContext(), "$controller.beanName"); - controller.${useCase.controllerAction}(); + event.getFacesContext().getApplication().getNavigationHandler().handleNavigation( + event.getFacesContext(), null, controller.${useCase.controllerAction}()); + // - get the new view id before population since we are navigating to a new view + viewId = event.getFacesContext().getViewRoot().getViewId(); this.populateView(event, viewId); } #end |
From: Chad B. <cwb...@us...> - 2008-07-03 21:42:06
|
User: cwbrandon Date: 08/07/03 14:42:16 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: keep track of what views have been populated so we don't do it more than once Revision Changes Path 1.16 +43 -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.15 retrieving revision 1.16 diff -u -w -r1.15 -r1.16 --- PortletPhaseListener.java.vsl 3 Jul 2008 18:27:18 -0000 1.15 +++ PortletPhaseListener.java.vsl 3 Jul 2008 21:42:15 -0000 1.16 @@ -81,7 +81,7 @@ } } - private String getViewId(javax.faces.event.PhaseEvent event) + protected String getViewId(javax.faces.event.PhaseEvent event) { String viewId = null; if (event.getFacesContext() != null) @@ -94,6 +94,9 @@ private void populateView(javax.faces.event.PhaseEvent event, String viewId) { + final java.lang.Object session = event.getFacesContext().getExternalContext().getSession(false); + if (!this.isViewPopulated(session, viewId)) + { #foreach ($view in $useCases.iterator().next().allViews) #if ($view.populatorRequired) #set ($ifClause = "if") @@ -106,6 +109,8 @@ } #end #end + this.setCurrentView(session, viewId); + } } @Override @@ -116,5 +121,38 @@ { this.populateView(event, viewId); } + else + { + // - remove the current view + this.setCurrentView(event.getFacesContext().getExternalContext().getSession(false), null); + } + } + + /** + * The name of the attribute that stores the current view id for this phase listener. + */ + private static final String CURRENT_VIEW_ATTRIBUTE = PortletPhaseListener.class.getName() + "ViewId"; + + /** + * Keeps track of whether or not the view has already been populated (so that we don't try again). + * + * @param session the session object that stores the view id to keep track of whether or not its been populated. + * @param viewId the view Id. + * @return true if populated, false otherwise. + */ + protected boolean isViewPopulated(final Object session, final String viewId) + { + final Object currentView = ${managedBeansPackage}.JsfUtils.getAttribute(session, CURRENT_VIEW_ATTRIBUTE); + return currentView != null && currentView.equals(viewId); + } + + /** + * Sets the given viewId as the current view tracked by this portlet. + * @param session the session object that stores the view id to keep track of whether or not its been populated. + * @param viewId the view id to set. + */ + protected void setCurrentView(final Object session, final String viewId) + { + ${managedBeansPackage}.JsfUtils.setAttribute(session, CURRENT_VIEW_ATTRIBUTE, viewId); } } |
From: Chad B. <cwb...@us...> - 2008-08-22 15:47:55
|
User: cwbrandon Date: 08/08/22 08:48:02 Modified: andromda-jsf2/src/main/resources/templates/jsf2/flow/portlet PortletPhaseListener.java.vsl Log: fix error when no use cases present in model Revision Changes Path 1.19 +4 -0 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.18 retrieving revision 1.19 diff -u -w -r1.18 -r1.19 --- PortletPhaseListener.java.vsl 10 Jul 2008 20:15:53 -0000 1.18 +++ PortletPhaseListener.java.vsl 22 Aug 2008 15:48:01 -0000 1.19 @@ -63,6 +63,7 @@ // - make the faces context available to all views ((javax.portlet.PortletRequest)event.getFacesContext().getExternalContext().getRequest()).setAttribute(FACES_CONTEXT, event.getFacesContext()); +#if (!$useCases.empty) #foreach ($role in $useCases.iterator().next().getAllRoles()) #set ($userIsInRoleName = "userIs${stringUtils.upperCamelCaseName($role.name.toLowerCase())}") #set ($specializedRoles = $role.generalizedByActors) @@ -98,6 +99,7 @@ { this.populateView(event, viewId); } +#end } } @@ -117,6 +119,7 @@ final java.lang.Object session = event.getFacesContext().getExternalContext().getSession(false); if (!this.isViewPopulated(session, viewId)) { +#if (!$useCases.empty) #foreach ($view in $useCases.iterator().next().allViews) #if ($view.populatorRequired) #set ($ifClause = "if") @@ -129,6 +132,7 @@ } #end #end +#end this.setCurrentView(session, viewId); } } |