Author: julien_viet Date: 2009-09-10 09:49:21 -0400 (Thu, 10 Sep 2009) New Revision: 169 Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java Log: pending commit commited for Arnaud release Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java 2009-09-09 23:49:09 UTC (rev 168) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/composer/ComponentIterator.java 2009-09-10 13:49:21 UTC (rev 169) @@ -61,7 +61,7 @@ if (type == IterationType.START) { if (current instanceof UIContainer) { UIContainer container = (UIContainer)current; - Iterator<? extends UIComponent> iterator = container.getChildren().iterator(); + Iterator<? extends UIComponent> iterator = container.iterator(); if (iterator.hasNext()) { stack.add(new ContainerVisit(container, iterator)); current = iterator.next(); Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java 2009-09-09 23:49:09 UTC (rev 168) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ui/UIContainer.java 2009-09-10 13:49:21 UTC (rev 169) @@ -20,20 +20,18 @@ import org.gatein.mop.api.workspace.ObjectType; -import java.util.Collection; +import java.util.List; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public interface UIContainer extends UIComponent { +public interface UIContainer extends UIComponent, List<UIComponent> { - Collection<? extends UIComponent> getChildren(); + <T extends UIComponent> T add(ObjectType<T> componentType, String componentName); - <T extends UIComponent> T addChild(ObjectType<T> componentType, String componentName); + <T extends UIComponent> T add(int index, ObjectType<T> componentType, String componentName); - UIComponent getChild(String componentName); + UIComponent get(String componentName); - <T extends UIComponent> T getChild(ObjectType<T> componentType, String componentName); - }