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

[Peter Muir]

  User: pmuir   
  Date: 07/11/13 14:30:30

  Modified:    ui/src/main/java/org/jboss/seam/ui/component 
                        UISelectItems.java
  Log:
  JBSEAM-2185
  
  Revision  Changes    Path
  1.8       +9 -4      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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- UISelectItems.java	8 Oct 2007 15:03:27 -0000	1.7
  +++ UISelectItems.java	13 Nov 2007 19:30:30 -0000	1.8
  @@ -172,7 +172,9 @@
         for (Object o : iterable)
         {
            initVar(o);
  -         selectItems.add(new javax.faces.model.SelectItem(o, getLabel() == null ? null : getLabel(), "", getDisabled() == null ? false : getDisabled()));
  +         String label = getLabel();
  +         Boolean disabled = getDisabled();
  +         selectItems.add(new javax.faces.model.SelectItem(o, label == null ? null : label, "", disabled == null ? false : disabled));
            destroyVar();
         }
         return selectItems;
  @@ -190,7 +192,10 @@
          * that if the result of the EL expression is an empty String, then the label will be hidden.
          */
         ValueExpression vb = getValueExpression("noSelectionLabel");
  -      if (getNoSelectionLabel() != null && vb == null && !(getHideNoSelectionLabel()  && getParentValue() != null))
  +      String noSelectionLabel = getNoSelectionLabel();
  +      Object parentValue = getParentValue();
  +      Boolean hideNoSelectionLabel = getHideNoSelectionLabel();
  +      if (noSelectionLabel != null && vb == null && !(hideNoSelectionLabel  && parentValue != null))
         {
            /* 
             * Here, the user has specfied a noSelectionLabel (may be an empty string), and, if hideNoSelectionLabel
  @@ -198,7 +203,7 @@
             */ 
            show = true;
         } 
  -      else if (getNoSelectionLabel() != null && !"".equals(getNoSelectionLabel()) && !(getHideNoSelectionLabel() && getParentValue() != null))
  +      else if (noSelectionLabel != null && !"".equals(noSelectionLabel) && !(hideNoSelectionLabel && parentValue != null))
         {
            /*
             * Here, the user has used an EL expression as the noSelectionLabel.  In this case, an empty string is
  @@ -209,7 +214,7 @@
         
         if (show)
         {
  -         NullableSelectItem s = new NullableSelectItem(NO_SELECTION_VALUE, getNoSelectionLabel());
  +         NullableSelectItem s = new NullableSelectItem(NO_SELECTION_VALUE, noSelectionLabel);
            ConverterChain converterChain = new ConverterChain(this.getParent());
            Converter noSelectionConverter = new NoSelectionConverter();
            // Make sure that the converter is only added once