svn commit: r900267 - /myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java

[lu...@apache.org]

Author: lu4242
Date: Mon Jan 18 01:54:41 2010
New Revision: 900267

URL: http://svn.apache.org/viewvc?rev=900267&view=rev
Log:
MYFACES-2491 _ErrorPageWriter does not print component properties

Modified:
    myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java

Modified: myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java?rev=900267&r1=900266&r2=900267&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java (original)
+++ myfaces/core/branches/1.2.x/api/src/main/java/javax/faces/webapp/_ErrorPageWriter.java Mon Jan 18 01:54:41 2010
@@ -18,26 +18,43 @@
  */
 package javax.faces.webapp;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
-
-import javax.faces.context.FacesContext;
-import javax.faces.context.ExternalContext;
-import javax.faces.component.UIComponent;
-import javax.el.Expression;
-import javax.el.ValueExpression;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
 import java.beans.BeanInfo;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.lang.reflect.Method;
 import java.text.DateFormat;
-import java.util.*;
-import java.util.regex.Pattern;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
 import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.el.Expression;
+import javax.el.ValueExpression;
+import javax.faces.component.UIComponent;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
 
 /**
  * @author Jacob Hookom (ICLA with ASF filed)
@@ -396,6 +413,18 @@
                             if (v instanceof Expression) {
                                 str = ((Expression) v).getExpressionString();
                             }
+                            else if (v instanceof ValueBinding)
+                            {
+                                str = ((ValueBinding) v).getExpressionString();
+                            }
+                            else if (v instanceof MethodBinding)
+                            {
+                                str = ((MethodBinding) v).getExpressionString();
+                            }
+                            else
+                            {
+                                str = v.toString();
+                            }
                             writer.write(str.replaceAll("<", TS));
                             writer.write("\"");
                         }