svn commit: r800491 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: application/DefaultViewHandlerSupport.java view/facelets/FaceletViewDeclarationLanguage.java

[cj...@apache.org]

Author: cjhoward
Date: Mon Aug  3 18:53:06 2009
New Revision: 800491

URL: http://svn.apache.org/viewvc?rev=800491&view=rev
Log:
MYFACES-2302 - Fix Facelet restore view and DefaultViewHandlerSupport deriveViewId().

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java?rev=800491&r1=800490&r2=800491&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java Mon Aug  3 18:53:06 2009
@@ -244,10 +244,14 @@
             uri = uri.substring(prefix.length() - 1);    //cut off only /faces, leave the trailing '/' char for the next iteration
         }
         //now delete any remaining leading '/'
-        if(uri.startsWith("/"))
+        // TODO: CJH: I don't think this is correct, considering that getActionURL() expects everything to
+        // start with '/', and in the suffix case we only mess with the suffix and leave leading
+        // slashes alone.  Please review...
+        /*if(uri.startsWith("/"))
         {
             uri = uri.substring(1);
-        }
+        }*/
+        
         return uri;
     }
     

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java?rev=800491&r1=800490&r2=800491&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java Mon Aug  3 18:53:06 2009
@@ -32,6 +32,7 @@
 
 import javax.el.ELException;
 import javax.faces.FacesException;
+import javax.faces.application.Application;
 import javax.faces.application.ProjectStage;
 import javax.faces.application.Resource;
 import javax.faces.application.StateManager;
@@ -386,14 +387,15 @@
         }
         //else if (!_buildBeforeRestore)
         //{
-            return super.restoreView(context, viewId);
+            //return super.restoreView(context, viewId);
         //}
         //else
         //{
             // TODO: VALIDATE - Is _buildBeforeRestore relevant at all for 2.0? -= SL =-
             // ANS: buildBeforeRestore evolved to partial state saving, so this logic 
             // is now on StateManagerStrategy implementation -= Leo U =- 
-            /*
+            // CJH: uncommenting for now, seems to work.
+        
             UIViewRoot viewRoot = createView(context, viewId);
 
             context.setViewRoot(viewRoot);
@@ -416,8 +418,8 @@
             application.getStateManager().restoreView(context, viewId, renderKitId);
 
             return viewRoot;
-        }
-        */
+        //}
+        
     }
 
     /**