svn commit: r654003 - /wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java

[gseitz]

Author: gseitz
Date: Tue May  6 23:34:52 2008
New Revision: 654003

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

Modified:
    
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java

Modified: 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=654003&r1=654002&r2=654003&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
 (original)
+++ 
wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
 Tue May  6 23:34:52 2008
@@ -19,6 +19,7 @@
 import java.io.Serializable;
 import java.util.List;
 
+import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -204,6 +205,29 @@
                return editor;
        }
 
+
+       protected Component newLabel(MarkupContainer parent, String 
componentId, final IModel model)
+       {
+               IModel wrapper = new AbstractReadOnlyModel()
+               {
+                       private static final long serialVersionUID = 1L;
+
+                       public Object getObject()
+                       {
+                               if (renderer != null)
+                               {
+                                       return 
renderer.getDisplayValue(model.getObject());
+                               }
+                               else
+                               {
+                                       return model.getObject();
+                               }
+                       }
+
+               };
+               return super.newLabel(parent, componentId, wrapper);
+       }
+
        protected void onModelChanged()
        {
                super.onModelChanged();