jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1335051 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Date Mon, 07 May 2012 14:56:54 GMT
Author: mduerig
Date: Mon May  7 14:56:54 2012
New Revision: 1335051

URL: http://svn.apache.org/viewvc?rev=1335051&view=rev
Log:
OAK-84: Delegates for Session, Node, Property and Item
remove left overs

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

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1335051&r1=1335050&r2=1335051&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Mon May  7 14:56:54 2012
@@ -78,11 +78,6 @@ public class NodeImpl extends ItemImpl i
         this.dlg = dlg;
     }
 
-    // TODO
-    public String getOakPath() {
-        return dlg.getPath();
-    }
-    
     //---------------------------------------------------------------< Item >---
     /**
      * @see javax.jcr.Item#isNode()
@@ -366,12 +361,12 @@ public class NodeImpl extends ItemImpl i
     public Node getNode(String relPath) throws RepositoryException {
         checkStatus();
 
-        NodeImpl node = getNodeOrNull(relPath);
-        if (node == null) {
+        NodeDelegate nd = dlg.getChild(toOakPath(relPath));
+        if (nd == null) {
             throw new PathNotFoundException(relPath);
         }
         else {
-            return node;
+            return new NodeImpl(nd);
         }
     }
 
@@ -419,11 +414,11 @@ public class NodeImpl extends ItemImpl i
     public Property getProperty(String relPath) throws RepositoryException {
         checkStatus();
 
-        Property property = getPropertyOrNull(relPath);
-        if (property == null) {
+        PropertyDelegate pd = dlg.getProperty(toOakPath(relPath));
+        if (pd == null) {
             throw new PathNotFoundException(relPath + " not found on " + getPath());
         } else {
-            return property;
+            return new PropertyImpl(pd);
         }
     }
 
@@ -550,14 +545,14 @@ public class NodeImpl extends ItemImpl i
     public boolean hasNode(String relPath) throws RepositoryException {
         checkStatus();
 
-        return getNodeOrNull(relPath) != null;
+        return dlg.getChild(toOakPath(relPath)) != null;
     }
 
     @Override
     public boolean hasProperty(String relPath) throws RepositoryException {
         checkStatus();
 
-        return getPropertyOrNull(relPath) != null;
+        return dlg.getProperty(toOakPath(relPath)) != null;
     }
 
     @Override
@@ -943,35 +938,20 @@ public class NodeImpl extends ItemImpl i
     private static Iterator<Node> nodeIterator(Iterator<NodeDelegate> childNodes)
{
         return Iterators.map(childNodes, new Function1<NodeDelegate, Node>() {
             @Override
-            public Node apply(NodeDelegate state) {
-                return new NodeImpl(state);
+            public Node apply(NodeDelegate nodeDelegate) {
+                return new NodeImpl(nodeDelegate);
             }
         });
     }
 
-    private static Iterator<Property> propertyIterator(
-            Iterator<PropertyDelegate> properties) {
+    private static Iterator<Property> propertyIterator(Iterator<PropertyDelegate>
properties) {
         return Iterators.map(properties,
-                new Function1<PropertyDelegate, Property>() {
-                    @Override
-                    public Property apply(PropertyDelegate propertyDelegate) {
-                        return new PropertyImpl(propertyDelegate);
-                    }
-                });
-    }
-
-    private NodeImpl getNodeOrNull(String relJcrPath)
-            throws RepositoryException {
-
-        NodeDelegate nd = dlg.getChild(toOakPath(relJcrPath));
-        return nd == null ? null : new NodeImpl(nd);
-    }
-
-    private PropertyImpl getPropertyOrNull(String relJcrPath)
-            throws RepositoryException {
-
-        PropertyDelegate pd = dlg.getProperty(toOakPath(relJcrPath));
-        return pd == null ? null : new PropertyImpl(pd);
+            new Function1<PropertyDelegate, Property>() {
+                @Override
+                public Property apply(PropertyDelegate propertyDelegate) {
+                    return new PropertyImpl(propertyDelegate);
+                }
+            });
     }
 
     private static int getTargetType(Value value, int type) {



Mime
View raw message