svn commit: r1572467 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java

[an...@apache.org]

Author: angela
Date: Thu Feb 27 08:47:38 2014
New Revision: 1572467

URL: http://svn.apache.org/r1572467
Log:
remove obsolete TODO wrt handling of hidden items, which has entirely been moved to the Tree implementations.

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1572467&r1=1572466&r2=1572467&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java Thu Feb 27 08:47:38 2014
@@ -44,7 +44,6 @@ import org.apache.jackrabbit.oak.commons
 import org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager;
 import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
 import org.apache.jackrabbit.oak.plugins.nodetype.NodeTypeConstants;
-import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
 import org.apache.jackrabbit.oak.util.TreeUtil;
 
 import static com.google.common.base.Objects.toStringHelper;
@@ -237,7 +236,6 @@ public class NodeDelegate extends ItemDe
      * @return number of properties of the node
      */
     public long getPropertyCount() throws InvalidItemStateException {
-        // TODO: Exclude "invisible" internal properties (OAK-182)
         return getTree().getPropertyCount();
     }
 
@@ -286,13 +284,7 @@ public class NodeDelegate extends ItemDe
      */
     @Nonnull
     public Iterator<PropertyDelegate> getProperties() throws InvalidItemStateException {
-        return transform(filter(getTree().getProperties().iterator(), new Predicate<PropertyState>() {
-                @Override
-                public boolean apply(PropertyState property) {
-                    // FIXME clarify handling of hidden items (OAK-753)
-                    return !NodeStateUtils.isHidden(property.getName());
-                }
-                }),
+        return transform(getTree().getProperties().iterator(),
                 new Function<PropertyState, PropertyDelegate>() {
                     @Override
                     public PropertyDelegate apply(PropertyState propertyState) {
@@ -313,7 +305,6 @@ public class NodeDelegate extends ItemDe
      * @return number of child nodes of the node
      */
     public long getChildCount(long max) throws InvalidItemStateException {
-        // TODO: Exclude "invisible" internal child nodes (OAK-182)
         return getTree().getChildrenCount(max);
     }