You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/04/13 16:18:24 UTC

cvs commit: incubator-myfaces/src/jsfapi/javax/faces/component UIData.java

schof       2005/04/13 07:18:24

  Modified:    src/jsfapi/javax/faces/component UIData.java
  Log:
  Fixes MYFACES-174 (Thanks to Mathias Broeklemann for the patch)
  
  Revision  Changes    Path
  1.31      +39 -35    incubator-myfaces/src/jsfapi/javax/faces/component/UIData.java
  
  Index: UIData.java
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/src/jsfapi/javax/faces/component/UIData.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- UIData.java	24 Mar 2005 16:46:02 -0000	1.30
  +++ UIData.java	13 Apr 2005 14:18:24 -0000	1.31
  @@ -43,6 +43,9 @@
    * @author Manfred Geiler (latest modification by $Author$)
    * @version $Revision$ $Date$
    * $Log$
  + * Revision 1.31  2005/04/13 14:18:24  schof
  + * Fixes MYFACES-174 (Thanks to Mathias Broeklemann for the patch)
  + *
    * Revision 1.30  2005/03/24 16:46:02  matzew
    * MYFACES-142
    *
  @@ -614,39 +617,40 @@
   		super.encodeEnd(context);
   	}
   
  -	private boolean isAllChildrenAndFacetsValid()
  -	{
  -		int first = getFirst();
  -		int rows = getRows();
  -		int last;
  -		if (rows == 0)
  -		{
  -			last = getRowCount();
  -		}
  -		else
  -		{
  -			last = first + rows;
  -		}
  -		try
  -		{
  -			for (int rowIndex = first; rowIndex < last; rowIndex++)
  -			{
  -				setRowIndex(rowIndex);
  -				if (isRowAvailable())
  -				{
  -					if (!isAllEditableValueHoldersValidRecursive(getFacetsAndChildren()))
  -					{
  -						return false;
  -					}
  -				}
  -			}
  -		}
  -		finally
  -		{
  -			setRowIndex(-1);
  -		}
  -		return true;
  -	}
  +    private boolean isAllChildrenAndFacetsValid()
  +    {
  +        int first = getFirst();
  +        int rows = getRows();
  +        int last;
  +        if (rows == 0)
  +        {
  +            last = getRowCount();
  +        }
  +        else
  +        {
  +            last = first + rows;
  +        }
  +        int setRowIndex = getRowIndex();
  +        try
  +        {
  +            for (int rowIndex = first; rowIndex < last; rowIndex++)
  +            {
  +                setRowIndex(rowIndex);
  +                if (isRowAvailable())
  +                {
  +                    if (!isAllEditableValueHoldersValidRecursive(getFacetsAndChildren()))
  +                    {
  +                        return false;
  +                    }
  +                }
  +            }
  +        }
  +        finally
  +        {
  +            setRowIndex(setRowIndex);
  +        }
  +        return true;
  +    }
   
   	private boolean isAllEditableValueHoldersValidRecursive(Iterator facetsAndChildrenIterator)
   	{