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

[gseitz]

Author: gseitz
Date: Tue May  6 23:27:52 2008
New Revision: 654002

URL: http://svn.apache.org/viewvc?rev=654002&view=rev
Log:
WICKET-1590: use IChoiceRenderer (if available) for the Label

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

Modified: 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=654002&r1=654001&r2=654002&view=diff
==============================================================================
--- 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
 (original)
+++ 
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
 Tue May  6 23:27:52 2008
@@ -20,6 +20,7 @@
 
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebComponent;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
@@ -216,6 +217,32 @@
        }
 
        @Override
+       protected WebComponent<T> newLabel(MarkupContainer< ? > parent, String 
componentId,
+               final IModel<T> model)
+       {
+               IModel<T> wrapper = new AbstractReadOnlyModel<T>()
+               {
+                       private static final long serialVersionUID = 1L;
+
+                       @Override
+                       @SuppressWarnings("unchecked")
+                       public T getObject()
+                       {
+                               if (renderer != null)
+                               {
+                                       return 
(T)renderer.getDisplayValue(model.getObject());
+                               }
+                               else
+                               {
+                                       return model.getObject();
+                               }
+                       }
+
+               };
+               return super.newLabel(parent, componentId, wrapper);
+       }
+
+       @Override
        protected void onModelChanged()
        {
                super.onModelChanged();