svn commit: r588532 - /myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java

[ma...@apache.org]

Author: matzew
Date: Thu Oct 25 22:33:39 2007
New Revision: 588532

URL: http://svn.apache.org/viewvc?rev=588532&view=rev
Log:
TRINIDAD-134
thx to Scott 

Modified:
    myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java

Modified: myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=588532&r1=588531&r2=588532&view=diff
==============================================================================
--- myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Thu Oct 25 22:33:39 2007
@@ -198,7 +198,7 @@
 
     PageState viewState = (PageState) saved;
 
-    UIViewRoot root = viewState.popRoot(context);
+    UIViewRoot root = viewState._popRoot(context);
     if (root != null)
     {
       return root; // bug 4712492
@@ -520,7 +520,7 @@
 
       _LOG.fine("Successfully found view state for token {0}", token);
 
-      UIViewRoot root = viewState.popRoot(context); // bug 4712492
+      UIViewRoot root = viewState._popRoot(context); // bug 4712492
       if (root != null)
       {
         _LOG.finer("UIViewRoot for token {0} already exists. Bypassing restoreState", token);
@@ -924,7 +924,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    public UIViewRoot popRoot(FacesContext fc)
+    private UIViewRoot _popRoot(FacesContext fc)
     {
       UIViewRoot root = null;
       Object viewRootState = null;
@@ -953,8 +953,8 @@
         // so to clear the events, we create a new UIViewRoot.
         // must get the UIViewRoot from the application so that
         // we pick up any custom ViewRoot defined in faces-config.xml:
-        UIViewRoot newRoot = (UIViewRoot) 
-          fc.getApplication().createComponent(UIViewRoot.COMPONENT_TYPE);
+        UIViewRoot newRoot = (UIViewRoot)
+          fc.getApplication().getViewHandler().createView(fc, root.getViewId());
         
         // must call restoreState so that we setup attributes, listeners,
         // uniqueIds, etc ...