myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject cvs commit: incubator-myfaces/src/jsfapi/javax/faces/component _SharedRendererUtils.java
Date Wed, 06 Apr 2005 19:39:30 GMT
manolito    2005/04/06 12:39:30

  Modified:    src/jsfapi/javax/faces/component _SharedRendererUtils.java
  Log:
  MYFACES-157 patch removed, not necessary because of MYFACES-149 fix
  
  Revision  Changes    Path
  1.6       +10 -7     incubator-myfaces/src/jsfapi/javax/faces/component/_SharedRendererUtils.java
  
  Index: _SharedRendererUtils.java
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/src/jsfapi/javax/faces/component/_SharedRendererUtils.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- _SharedRendererUtils.java	6 Apr 2005 10:21:55 -0000	1.5
  +++ _SharedRendererUtils.java	6 Apr 2005 19:39:30 -0000	1.6
  @@ -32,6 +32,9 @@
    * @author Manfred Geiler (latest modification by $Author$)
    * @version $Revision$ $Date$
    * $Log$
  + * Revision 1.6  2005/04/06 19:39:30  manolito
  + * MYFACES-157 patch removed, not necessary because of MYFACES-149 fix
  + *
    * Revision 1.5  2005/04/06 10:21:55  manolito
    * MYFACES-149 fix for NullPointerException in _SharedRendererUtils.getConvertedUISelectManyValue
    *
  @@ -118,7 +121,7 @@
                   // expected type is a List
                   // --> according to javadoc of UISelectMany we assume that the element
type
                   //     is java.lang.String, and copy the String array to a new List
  -                int len = submittedValue != null ? submittedValue.length : 0;
  +                int len = submittedValue.length;
                   List lst = new ArrayList(len);
                   for (int i = 0; i < len; i++)
                   {
  @@ -151,7 +154,7 @@
           {
               // ...but have no idea of expected type
               // --> so let's convert it to an Object array
  -            int len = submittedValue != null ? submittedValue.length : 0;
  +            int len = submittedValue.length;
               Object[] convertedValues = new Object[len];
               for (int i = 0; i < len; i++)
               {
  @@ -166,7 +169,7 @@
               // Curious case: According to specs we should assume, that the element type
               // of this List is java.lang.String. But there is a Converter set for this
               // component. Because the user must know what he is doing, we will convert
the values.
  -            int len = submittedValue != null ? submittedValue.length : 0;
  +            int len = submittedValue.length;
               List lst = new ArrayList(len);
               for (int i = 0; i < len; i++)
               {
  @@ -183,7 +186,7 @@
           if (arrayComponentType.isPrimitive())
           {
               //primitive array
  -            int len = submittedValue != null ? submittedValue.length : 0;
  +            int len = submittedValue.length;
               Object convertedValues = Array.newInstance(arrayComponentType, len);
               for (int i = 0; i < len; i++)
               {
  @@ -195,7 +198,7 @@
           else
           {
               //Object array
  -            int len = submittedValue != null ? submittedValue.length : 0;
  +            int len = submittedValue.length;
               Object[] convertedValues = new Object[len];
               for (int i = 0; i < len; i++)
               {
  
  
  

Mime
View raw message