[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...

[Peter Muir]

  User: pmuir   
  Date: 07/02/18 14:43:17

  Modified:    src/ui/org/jboss/seam/ui  ConverterChain.java
  Log:
  JBSEAM-879
  
  Revision  Changes    Path
  1.6       +30 -16    jboss-seam/src/ui/org/jboss/seam/ui/ConverterChain.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConverterChain.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/ConverterChain.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ConverterChain.java	11 Feb 2007 16:33:06 -0000	1.5
  +++ ConverterChain.java	18 Feb 2007 19:43:17 -0000	1.6
  @@ -68,12 +68,25 @@
         if (component instanceof ValueHolder)
         {
            ValueHolder valueHolder = (ValueHolder) component;
  -         ValueBinding vb =component.getValueBinding("converter");
  -         if (vb != null) {
  -            addConverterToChain(vb);
  -         } else {
  +         ValueBinding converterValueBinding = component.getValueBinding("converter");
  +         if (converterValueBinding != null)
  +         {
  +            addConverterToChain(converterValueBinding);
  +         }
  +         else if (valueHolder.getConverter() != null)
  +         {
               addConverterToChain(valueHolder.getConverter());
            }
  +         else
  +         {
  +            ValueBinding valueBinding = component.getValueBinding("value");
  +            FacesContext facesContext = FacesContext.getCurrentInstance();
  +            if (valueBinding != null)
  +            {
  +               addConverterToChain(facesContext.getApplication().createConverter(
  +                        valueBinding.getType(facesContext)));
  +            }
  +         }
            valueHolder.setConverter(this);
         }
      }
  @@ -185,11 +198,12 @@
   
      }
      
  -   private List<PrioritizableConverter> getConverters() {
  -      if (dirty) {
  +   private List<PrioritizableConverter> getConverters()
  +   {
  +      if (dirty)
  +      {
            Collections.sort(converters);
         }
         return converters;
      }
  -
   }