Author: julien(a)jboss.com Date: 2008-04-04 08:10:09 -0400 (Fri, 04 Apr 2008) New Revision: 10502 Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java Log: added support for sibbling and children pages Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java 2008-04-04 11:53:43 UTC (rev 10501) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/PresentationServerImpl.java 2008-04-04 12:10:09 UTC (rev 10502) @@ -48,9 +48,13 @@ public PresentationServerImpl() { ContextNode root = structuralStateContext.getRoot(); - PageNode page = root.addChild("default", PageNode.class); - page.addChild("foo", WindowNode.class); - page.addChild("bar", WindowNode.class); + PageNode defaultPage = root.addChild("default", PageNode.class); + PageNode fooPage = root.addChild("foo", PageNode.class); + PageNode barPage = root.addChild("bar", PageNode.class); + defaultPage.addChild("foo", WindowNode.class); + defaultPage.addChild("bar", WindowNode.class); + defaultPage.addChild("juu", PageNode.class); + defaultPage.addChild("daa", PageNode.class); } public StructuralStateContext getStructuralStateContext() Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-04 11:53:43 UTC (rev 10501) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-04-04 12:10:09 UTC (rev 10502) @@ -115,13 +115,20 @@ } else if (object instanceof UIPage) { - writer.print("<div>"); + if (node.getChildren() != null) + { + writer.print("<div>"); - // - renderChildren(node, writer); + // + renderChildren(node, writer); - // - writer.print("</div>"); + // + writer.print("</div>"); + } + else + { + writer.print("<div>Link to page : " + object.getId() + "</div>"); + } } else if (object instanceof UIWindow) { Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java 2008-04-04 11:53:43 UTC (rev 10501) +++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/DefaultPageViewPortScope.java 2008-04-04 12:10:09 UTC (rev 10502) @@ -125,7 +125,7 @@ pageStatus = NO_PAGE; break; case DEFAULT_PAGE_SIBLING: - pageStatus = DEFAULT_PAGE; + pageStatus = NO_PAGE; break; case DEFAULT_PAGE_CHILD: pageStatus = DEFAULT_PAGE;