myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1141728 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets: FaceletViewDeclarationLanguage.java el/LocationMethodExpression.java el/LocationValueExpression.java el/ValueExpressionMethodExpression.java
Date Thu, 30 Jun 2011 21:32:14 GMT
Author: lu4242
Date: Thu Jun 30 21:32:14 2011
New Revision: 1141728

URL: http://svn.apache.org/viewvc?rev=1141728&view=rev
Log:
MYFACES-3200 All values of self-defined composite-component attributes disappear unexpected.

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java

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=1141728&r1=1141727&r2=1141728&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
Thu Jun 30 21:32:14 2011
@@ -2138,7 +2138,7 @@ public class FaceletViewDeclarationLangu
         // Per spec section 11.1.3, the default value for the partial state saving feature
needs
         // to be true if 2.0, false otherwise.
         
-        partialStateSavingDefault = "2.0".equals(facesVersion);
+        partialStateSavingDefault = "2.0".equals(facesVersion) || "2.1".equals(facesVersion);
         
         // In jsf 2.0 this code evolve as PartialStateSaving feature
         //_buildBeforeRestore = _getBooleanParameter(context, PARAM_BUILD_BEFORE_RESTORE,
false);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java?rev=1141728&r1=1141727&r2=1141728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
Thu Jun 30 21:32:14 2011
@@ -18,9 +18,15 @@
  */
 package org.apache.myfaces.view.facelets.el;
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
 import javax.el.ELContext;
 import javax.el.MethodExpression;
 import javax.el.MethodInfo;
+import javax.el.ValueExpression;
 import javax.faces.FacesWrapper;
 import javax.faces.context.FacesContext;
 import javax.faces.view.Location;
@@ -40,7 +46,8 @@ import javax.faces.view.Location;
  * @author Jakob Korherr (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class LocationMethodExpression extends MethodExpression implements FacesWrapper<MethodExpression>
+public class LocationMethodExpression extends MethodExpression 
+    implements FacesWrapper<MethodExpression>, Externalizable
 {
 
     private static final long serialVersionUID = 1634644578979226893L;
@@ -117,4 +124,17 @@ public class LocationMethodExpression ex
     {
         return delegate;
     }
+    
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+    {
+        this.delegate = (MethodExpression) in.readObject();
+        this.location = (Location) in.readObject();
+    }
+
+    public void writeExternal(ObjectOutput out) throws IOException
+    {
+        out.writeObject(this.delegate);
+        out.writeObject(this.location);
+    }
+
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java?rev=1141728&r1=1141727&r2=1141728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
Thu Jun 30 21:32:14 2011
@@ -18,6 +18,11 @@
  */
 package org.apache.myfaces.view.facelets.el;
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
 import javax.el.ELContext;
 import javax.el.ValueExpression;
 import javax.faces.FacesWrapper;
@@ -39,7 +44,8 @@ import javax.faces.view.Location;
  * @author Jakob Korherr (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class LocationValueExpression extends ValueExpression implements FacesWrapper<ValueExpression>
+public class LocationValueExpression extends ValueExpression
+    implements FacesWrapper<ValueExpression>, Externalizable
 {
     
     private static final long serialVersionUID = -5636849184764526288L;
@@ -153,4 +159,16 @@ public class LocationValueExpression ext
     {
         return delegate;
     }
+    
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+    {
+        this.delegate = (ValueExpression) in.readObject();
+        this.location = (Location) in.readObject();
+    }
+
+    public void writeExternal(ObjectOutput out) throws IOException
+    {
+        out.writeObject(this.delegate);
+        out.writeObject(this.location);
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java?rev=1141728&r1=1141727&r2=1141728&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
Thu Jun 30 21:32:14 2011
@@ -18,6 +18,11 @@
  */
 package org.apache.myfaces.view.facelets.el;
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
 import javax.el.ELContext;
 import javax.el.MethodExpression;
 import javax.el.MethodInfo;
@@ -34,7 +39,8 @@ import javax.faces.context.FacesContext;
  * @author Jakob Korherr (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class ValueExpressionMethodExpression extends MethodExpression implements FacesWrapper<ValueExpression>
+public class ValueExpressionMethodExpression extends MethodExpression 
+    implements FacesWrapper<ValueExpression>, Externalizable
 {
     
     private static final long serialVersionUID = -2847633717581167765L;
@@ -96,4 +102,13 @@ public class ValueExpressionMethodExpres
     {
         return valueExpression;
     }
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+    {
+        this.valueExpression = (ValueExpression) in.readObject();
+    }
+
+    public void writeExternal(ObjectOutput out) throws IOException
+    {
+        out.writeObject(this.valueExpression);
+    }
 }



Mime
View raw message