Author: nbelaevski Date: 2010-05-11 19:50:13 -0400 (Tue, 11 May 2010) New Revision: 16996 Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java Log: Fixed bug in ExtendedPartialViewContext for multiple meta-component IDs addition Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java 2010-05-11 23:45:25 UTC (rev 16995) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/ExtendedPartialVisitContext.java 2010-05-11 23:50:13 UTC (rev 16996) @@ -326,7 +326,7 @@ //TODO replace with constant sb.append(':'); } - sb.append(componentId); + sb.append(metadataComponentId != null ? metadataComponentId : componentId); List<IdTreeNode> idTreeChildNodes = idTreeNode.getChildNodes(); if (idTreeChildNodes != null) { Modified: root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java =================================================================== --- root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2010-05-11 23:45:25 UTC (rev 16995) +++ root/core/trunk/impl/src/test/java/org/richfaces/context/ExtendedPartialVisitContextTest.java 2010-05-11 23:50:13 UTC (rev 16996) @@ -748,5 +748,21 @@ "myForm:table:1:nestedTable:2:nestedTableText" ), trackingVisitCallback.getVisitedIds()); } + + //TODO nick - add alike tests + @Test + public void testMultipleMetaComponentIds() throws Exception { + createVisitContext(true); + + renderingContext.getIdsToVisit().add("myForm:table@header"); + renderingContext.getIdsToVisit().add("myForm:table@footer"); + + assertTrue(renderingContext.getIdsToVisit().contains("myForm:table@header")); + assertTrue(renderingContext.getIdsToVisit().contains("myForm:table@footer")); + + assertFalse(renderingContext.getIdsToVisit().contains("myForm")); + assertFalse(renderingContext.getIdsToVisit().contains("table")); + assertFalse(renderingContext.getIdsToVisit().contains("myForm:table")); + } }