You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by or...@apache.org on 2005/08/29 01:41:36 UTC
svn commit: r263964 - in /myfaces/impl/trunk/src/java/org/apache/myfaces:
application/NavigationHandlerImpl.java
application/jsp/JspViewHandlerImpl.java lifecycle/LifecycleImpl.java
portlet/MyFacesGenericPortlet.java
Author: oros
Date: Sun Aug 28 16:41:28 2005
New Revision: 263964
URL: http://svn.apache.org/viewcvs?rev=263964&view=rev
Log:
following the spec, null is a valid viewId
Modified:
myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
myfaces/impl/trunk/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
myfaces/impl/trunk/src/java/org/apache/myfaces/portlet/MyFacesGenericPortlet.java
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=263964&r1=263963&r2=263964&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java Sun Aug 28 16:41:28 2005
@@ -157,7 +157,9 @@
{
ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
//create new view
- UIViewRoot viewRoot = viewHandler.createView(facesContext, navigationCase.getToViewId());
+ String newViewId = navigationCase.getToViewId();
+ UIViewRoot viewRoot = viewHandler.createView(facesContext, newViewId);
+ viewRoot.setViewId(newViewId);
facesContext.setViewRoot(viewRoot);
facesContext.renderResponse();
}
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=263964&r1=263963&r2=263964&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Sun Aug 28 16:41:28 2005
@@ -111,7 +111,11 @@
}
uiViewRoot = (UIViewRoot)application.createComponent(UIViewRoot.COMPONENT_TYPE);
- uiViewRoot.setViewId(viewId);
+// as of JSF spec page 7-16:
+// "It is the callers responsibility to ensure that setViewId() is called
+// on the returned view, passing the same viewId value."
+// so we do not set the viewId here
+// uiViewRoot.setViewId(viewId);
if (currentLocale != null)
{
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=263964&r1=263963&r2=263964&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Sun Aug 28 16:41:28 2005
@@ -114,6 +114,7 @@
if (viewRoot == null)
{
viewRoot = viewHandler.createView(facesContext, viewId);
+ viewRoot.setViewId(viewId);
facesContext.renderResponse();
//viewCreated = true;
}
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/portlet/MyFacesGenericPortlet.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/portlet/MyFacesGenericPortlet.java?rev=263964&r1=263963&r2=263964&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/portlet/MyFacesGenericPortlet.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/portlet/MyFacesGenericPortlet.java Sun Aug 28 16:41:28 2005
@@ -300,6 +300,7 @@
ViewHandler viewHandler = application.getViewHandler();
FacesContext facesContext = facesContext(request, response);
UIViewRoot viewRoot = viewHandler.createView(facesContext, view);
+ viewRoot.setViewId(view);
facesContext.setViewRoot(viewRoot);
lifecycle.render(facesContext);
}