myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cjhow...@apache.org
Subject svn commit: r805756 - in /myfaces/core/trunk: api/src/main/java/javax/faces/context/ api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/ impl/src/main/java/org/apache/myfaces/view/facelets/
Date Wed, 19 Aug 2009 11:37:24 GMT
Author: cjhoward
Date: Wed Aug 19 11:37:24 2009
New Revision: 805756

URL: http://svn.apache.org/viewvc?rev=805756&view=rev
Log:
MYFACES-2330 - more basic-ajax fixes

Removed:
    myfaces/core/trunk/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Logger.js
    myfaces/core/trunk/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_SimpleHtmlParser.js
Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriter.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriter.java?rev=805756&r1=805755&r2=805756&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriter.java Wed Aug 19
11:37:24 2009
@@ -47,12 +47,12 @@
     
     public void startCDATA() throws IOException
     {
-        // no-op
+        write ("<![CDATA[");
     }
     
     public void endCDATA() throws IOException
     {
-        // no-op
+        write ("]]>");
     }
     
     public abstract void writeAttribute(String name, Object value, String property) throws
IOException;

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=805756&r1=805755&r2=805756&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
Wed Aug 19 11:37:24 2009
@@ -634,6 +634,8 @@
     @Override
     public void renderView(FacesContext context, UIViewRoot view) throws IOException
     {
+        Object stateObj;
+        
         if (!view.isRendered())
         {
             return;
@@ -676,7 +678,11 @@
                     {
                         context.getExternalContext().getSession(true);
                     }
-
+                    
+                    // Spec indicates that saveView() must be called before startDocument().
+                    
+                    stateObj = stateMgr.saveView(context);
+                    
                     // render the view to the response
                     writer.startDocument();
 
@@ -698,7 +704,6 @@
                         if (end >= 0)
                         {
                             // save state
-                            Object stateObj = stateMgr.saveView(context);
                             String stateStr;
                             if (stateObj == null)
                             {
@@ -730,6 +735,8 @@
                         else
                         {
                             origWriter.write(content);
+                            
+                            //stateMgr.saveView(context);
                         }
                     }
                 }



Mime
View raw message