[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/component ...

[Peter Muir]

  User: pmuir   
  Date: 07/11/16 13:49:02

  Modified:    ui/src/main/java/org/jboss/seam/ui/component 
                        UISelectItems.java
  Log:
  JBSEAM-1768
  
  Revision  Changes    Path
  1.9       +11 -2     jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UISelectItems.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- UISelectItems.java	13 Nov 2007 19:30:30 -0000	1.8
  +++ UISelectItems.java	16 Nov 2007 18:49:02 -0000	1.9
  @@ -21,6 +21,8 @@
   
   package org.jboss.seam.ui.component;
   
  +import static org.jboss.seam.util.Strings.emptyIfNull;
  +
   import java.lang.reflect.Array;
   import java.util.ArrayList;
   import java.util.Arrays;
  @@ -108,6 +110,10 @@
      
      public abstract void setDisabled(Boolean disabled);
   
  +   public abstract Object getItemValue();
  +   
  +   public abstract void setItemValue(Object itemValue);
  +
      @Override
      public Object getValue()
      {
  @@ -172,9 +178,12 @@
         for (Object o : iterable)
         {
            initVar(o);
  -         String label = getLabel();
  +         String itemLabel = emptyIfNull(getLabel());
  +         Object value = getItemValue();
  +         Object itemValue = value == null ? o : value;
            Boolean disabled = getDisabled();
  -         selectItems.add(new javax.faces.model.SelectItem(o, label == null ? null : label, "", disabled == null ? false : disabled));
  +         boolean itemDisabled = disabled == null ? false : disabled;
  +         selectItems.add( new javax.faces.model.SelectItem(itemValue, itemLabel, "", itemDisabled) );
            destroyVar();
         }
         return selectItems;