svn commit: r1143186 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java

[mgrigorov]

Author: mgrigorov
Date: Tue Jul  5 19:44:13 2011
New Revision: 1143186

URL: http://svn.apache.org/viewvc?rev=1143186&view=rev
Log:
WICKET-3868 Feedback message should be handled the same way everywhere.


Modified:
    
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=1143186&r1=1143185&r2=1143186&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
 Tue Jul  5 19:44:13 2011
@@ -464,10 +464,10 @@ public class AjaxEditableLabel<T> extend
        protected void onError(final AjaxRequestTarget target)
        {
                Serializable errorMessage = 
editor.getFeedbackMessage().getMessage();
-               if (errorMessage instanceof String)
+               if (errorMessage != null)
                {
                        target.appendJavaScript("window.status='" +
-                               
JavaScriptUtils.escapeQuotes((String)errorMessage) + "';");
+                               
JavaScriptUtils.escapeQuotes(errorMessage.toString()) + "';");
                }
                target.appendJavaScript("{var el=wicketGet('" + 
editor.getMarkupId() +
                        "'); el.select(); el.focus();}");