Author: julien(a)jboss.com Date: 2007-02-19 07:47:47 -0500 (Mon, 19 Feb 2007) New Revision: 6332 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java Log: don't display children of dashboard contexts in admin portlet for now Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-02-19 12:26:51 UTC (rev 6331) +++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-02-19 12:47:47 UTC (rev 6332) @@ -496,12 +496,9 @@ PortalObjectImpl parent = (PortalObjectImpl)getParent(); // We need the parent to find out the context details - if (parent instanceof ContextImpl) + if (this instanceof ContextImpl) { - ContextImpl context = (ContextImpl)parent; - - // - String dashboard = context.getDeclaredProperty("dashboard"); + String dashboard = getDeclaredProperty("dashboard"); if ("true".equals(dashboard)) { String dashboardId = getName(); Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java 2007-02-19 12:26:51 UTC (rev 6331) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java 2007-02-19 12:47:47 UTC (rev 6332) @@ -23,11 +23,7 @@ package org.jboss.portal.core.portlet.management; import org.apache.myfaces.custom.tree2.TreeNode; -import org.jboss.portal.core.model.portal.PortalContainer; -import org.jboss.portal.core.model.portal.Page; -import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.PortalObjectId; import java.util.ArrayList; @@ -45,6 +41,41 @@ /** The serialVersionUID */ private static final long serialVersionUID = 7253085860667670643L; + public static LazyPortalObjectTreeNode newInstance(PortalObject object) + { + if (object.isDashboard()) + { + return new DashboardNode(object); + } + else + { + return new LazyPortalObjectTreeNode(object); + } + } + + private static class DashboardNode extends LazyPortalObjectTreeNode + { + public DashboardNode(PortalObject object) + { + super(object); + } + + public List getChildren() + { + return Collections.EMPTY_LIST; + } + + public boolean isLeaf() + { + return true; + } + + public int getChildCount() + { + return 0; + } + } + /** . */ private PortalObject object; @@ -57,7 +88,7 @@ /** . */ private String type; - public LazyPortalObjectTreeNode(PortalObject object) + protected LazyPortalObjectTreeNode(PortalObject object) { this.object = object; this.description = object.getName(); @@ -97,11 +128,13 @@ { public int compare(Object o1, Object o2) { - int high1 = getOrder(o1); - int high2 = getOrder(o2); + PortalObject po1 = (PortalObject)o1; + PortalObject po2 = (PortalObject)o2; + int high1 = po1.getType(); + int high2 = po2.getType(); if (high1 == high2) { - return ((PortalObject)o1).getName().compareTo(((PortalObject)o2).getName()); + return po1.getName().compareTo(po2.getName()); } else { @@ -112,7 +145,7 @@ for (int i = 0; i < children.size(); i++) { PortalObject child = (PortalObject)children.get(i); - children.set(i, new LazyPortalObjectTreeNode(child)); + children.set(i, LazyPortalObjectTreeNode.newInstance(child)); } } return children; @@ -152,25 +185,4 @@ { return object.getChildren().size(); } - - private static int getOrder(Object o) - { - if (o instanceof PortalContainer) - { - return 0; - } - if (o instanceof Portal) - { - return 1; - } - if (o instanceof Page) - { - return 2; - } - if (o instanceof Window) - { - return 3; - } - return 4; - } } Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-19 12:26:51 UTC (rev 6331) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-19 12:47:47 UTC (rev 6332) @@ -404,7 +404,7 @@ public TreeNode getTreeData() { PortalObject root = portalObjectContainer.getRootObject(); - return new LazyPortalObjectTreeNode(root); + return LazyPortalObjectTreeNode.newInstance(root); } public SelectItem[] getInstanceItems()