[portal-commits] JBoss Portal SVN: r11701 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node.

Author: thomas.heute(a)jboss.com Date: 2008-08-19 04:01:46 -0400 (Tue, 19 Aug 2008) New Revision: 11701 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java Log: Returns an empty mutable map Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-08-19 02:41:14 UTC (rev 11700) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2008-08-19 08:01:46 UTC (rev 11701) @@ -385,23 +385,23 @@ } /** Compute and returns a modifiable map made of the children nodes. */ - protected final Map buildChildMap(PortalNodeImpl objectNode) + protected final Map<String, PortalNode> buildChildMap(PortalNodeImpl objectNode) { PortalObject object = objectNode.object; // - Collection tmp = object.getChildren(); + Collection<PortalObject> tmp = object.getChildren(); // if (tmp.size() > 0) { - Map childrenMap = new HashMap(); + Map<String, PortalNode> childrenMap = new HashMap<String, PortalNode>(); // See if we have recursive permission on the provided node that will avoid to make a check for each of them boolean allVisible = portalAuthorizationManager.checkPermission(new PortalObjectPermission(objectNode.object.getId(), PortalObjectPermission.VIEW_RECURSIVE_ACTION)); // - for (Iterator i = tmp.iterator(); i.hasNext();) + for (Iterator<PortalObject> i = tmp.iterator(); i.hasNext();) { PortalObject childObject = (PortalObject)i.next(); @@ -427,7 +427,7 @@ } else { - return Collections.EMPTY_MAP; + return new HashMap<String, PortalNode>(); } } }