Author: julien_viet Date: 2009-11-24 07:44:44 -0500 (Tue, 24 Nov 2009) New Revision: 783 Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java Log: - make API avoid to return Collection type with extends (<? extends Foo>) as it makes API not flexible (like child reordering) Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java 2009-11-24 11:49:59 UTC (rev 782) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Navigation.java 2009-11-24 12:44:44 UTC (rev 783) @@ -67,7 +67,7 @@ * * @return the child navigations */ - List<? extends Navigation> getChildren(); + List<Navigation> getChildren(); /** * Returns a specified navigation. Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java 2009-11-24 11:49:59 UTC (rev 782) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Page.java 2009-11-24 12:44:44 UTC (rev 783) @@ -75,7 +75,7 @@ * * @return the children */ - Collection<? extends Page> getChildren(); + Collection<Page> getChildren(); /** * Returns a named child or null if it does not exist. Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java 2009-11-24 11:49:59 UTC (rev 782) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Site.java 2009-11-24 12:44:44 UTC (rev 783) @@ -62,7 +62,9 @@ */ Workspace getWorkspace(); - /** Destroy the site. */ + /** + * Destroy the site. + */ void destroy(); } Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2009-11-24 11:49:59 UTC (rev 782) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2009-11-24 12:44:44 UTC (rev 783) @@ -106,10 +106,13 @@ } } - public List<? extends Navigation> getChildren() + public List<Navigation> getChildren() { NavigationContainer childrenContainer = getChildrenContainer(); - return childrenContainer.getNavigationList(); + + // Yeah a bit ugly but navigation list should support type safety itself + // (i.e only accept object of type NavigationImpl + return (List)childrenContainer.getNavigationList(); } public Navigation getChild(String name) Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2009-11-24 11:49:59 UTC (rev 782) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2009-11-24 12:44:44 UTC (rev 783) @@ -219,10 +219,10 @@ return childrenContainer.addPage(name); } - public Collection<? extends Page> getChildren() + public Collection<Page> getChildren() { PageContainer childrenContainer = getChildrenContainer(); - return childrenContainer.getPages().values(); + return (Collection)childrenContainer.getPages().values(); } public PageImpl getChild(String name)