You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/06/30 23:31:02 UTC
svn commit: r1141727 - in
/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el:
LocationMethodExpression.java LocationValueExpression.java
ValueExpressionMethodExpression.java
Author: lu4242
Date: Thu Jun 30 21:31:02 2011
New Revision: 1141727
URL: http://svn.apache.org/viewvc?rev=1141727&view=rev
Log:
MYFACES-3200 All values of self-defined composite-component attributes disappear unexpected.
Modified:
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java?rev=1141727&r1=1141726&r2=1141727&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationMethodExpression.java Thu Jun 30 21:31:02 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/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java?rev=1141727&r1=1141726&r2=1141727&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/LocationValueExpression.java Thu Jun 30 21:31:02 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/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java?rev=1141727&r1=1141726&r2=1141727&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/el/ValueExpressionMethodExpression.java Thu Jun 30 21:31:02 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);
+ }
}