You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2007/12/04 02:22:54 UTC
svn commit: r600763 -
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/tomahawk/application/jsp/JspTilesTwoViewHandlerImpl.java
Author: mmarinschek
Date: Mon Dec 3 17:22:53 2007
New Revision: 600763
URL: http://svn.apache.org/viewvc?rev=600763&view=rev
Log:
fix for https://issues.apache.org/jira/browse/TOMAHAWK-1160 (TOMAHAWK-1160): enable tiles-2 support in MyFaces
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/tomahawk/application/jsp/JspTilesTwoViewHandlerImpl.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/tomahawk/application/jsp/JspTilesTwoViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/tomahawk/application/jsp/JspTilesTwoViewHandlerImpl.java?rev=600763&r1=600762&r2=600763&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/tomahawk/application/jsp/JspTilesTwoViewHandlerImpl.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/tomahawk/application/jsp/JspTilesTwoViewHandlerImpl.java Mon Dec 3 17:22:53 2007
@@ -88,25 +88,29 @@
//propagate our new view-id to wherever it makes sense
setViewId(viewToRender, viewId, facesContext);
- handleCharacterEncoding(viewId, externalContext, viewToRender);
-
- container.startContext(requestObjects);
- try {
- container.render(tilesId,requestObjects);
- } catch (TilesException e) {
- throw new FacesException(e);
- }
- finally {
- container.endContext(requestObjects);
- }
-
- handleCharacterEncodingPostDispatch(externalContext);
+ renderTilesView(externalContext, requestObjects, container, viewToRender, viewId, tilesId);
}
else {
//we're not using tiles as no valid definition has been found
//just call the delegate view-handler to let it do its thing
_viewHandler.renderView(facesContext, viewToRender);
}
+ }
+
+ private void renderTilesView(ExternalContext externalContext, Object[] requestObjects, TilesContainer container, UIViewRoot viewToRender, String viewId, String tilesId) {
+ handleCharacterEncoding(viewId, externalContext, viewToRender);
+
+ container.startContext(requestObjects);
+ try {
+ container.render(tilesId,requestObjects);
+ } catch (TilesException e) {
+ throw new FacesException(e);
+ }
+ finally {
+ container.endContext(requestObjects);
+ }
+
+ handleCharacterEncodingPostDispatch(externalContext);
}
private void setViewId(UIViewRoot viewToRender, String viewId, FacesContext facesContext) {