You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/03/06 00:25:22 UTC
svn commit: r514916 -
/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
Author: bommel
Date: Mon Mar 5 15:25:20 2007
New Revision: 514916
URL: http://svn.apache.org/viewvc?view=rev&rev=514916
Log:
fixed ClassCastException
Modified:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java?view=diff&rev=514916&r1=514915&r2=514916
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java Mon Mar 5 15:25:20 2007
@@ -902,12 +902,11 @@
*/
private void removeFormerChildren(UIComponent component)
{
- Set formerChildIdsSet = (Set)component.getAttributes().get(FORMER_CHILD_IDS_SET_ATTR);
- if (formerChildIdsSet != null)
+ List<String> formerChildIds = (List<String>)component.getAttributes().get(FORMER_CHILD_IDS_SET_ATTR);
+ if (formerChildIds != null)
{
- for (Iterator iterator = formerChildIdsSet.iterator(); iterator.hasNext();)
+ for (String childId : formerChildIds)
{
- String childId = (String)iterator.next();
if (_childrenAdded == null || !_childrenAdded.contains(childId))
{
UIComponent childToRemove = component.findComponent(childId);
@@ -938,14 +937,12 @@
/** See removeFormerChildren. */
private void removeFormerFacets(UIComponent component)
{
- Set formerFacetNamesSet = (Set)component.getAttributes().get(FORMER_FACET_NAMES_SET_ATTR);
- if (formerFacetNamesSet != null)
+ List<String> formerFacetNames = (List<String>)component.getAttributes().get(FORMER_FACET_NAMES_SET_ATTR);
+ if (formerFacetNames != null)
{
- for (Iterator iterator = formerFacetNamesSet.iterator(); iterator.hasNext();)
+ for (String facetName : formerFacetNames)
{
- String facetName = (String)iterator.next();
- if (_facetsAdded == null || !_facetsAdded.contains(facetName))
- {
+ if (_facetsAdded == null || !_facetsAdded.contains(facetName)) {
component.getFacets().remove(facetName);
}
}