jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1325728 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: api/ChildNodeEntry.java kernel/AbstractChildNodeEntry.java kernel/AbstractNodeState.java kernel/KernelChildNodeEntry.java
Date Fri, 13 Apr 2012 12:08:16 GMT
Author: angela
Date: Fri Apr 13 12:08:15 2012
New Revision: 1325728

URL: http://svn.apache.org/viewvc?rev=1325728&view=rev
Log:
OAK-18 - Define Oak API

- naming consistency: ChildNodeEntry#getNode returns NodeState -> rename method.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ChildNodeEntry.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractChildNodeEntry.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelChildNodeEntry.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ChildNodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ChildNodeEntry.java?rev=1325728&r1=1325727&r2=1325728&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ChildNodeEntry.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ChildNodeEntry.java
Fri Apr 13 12:08:15 2012
@@ -38,6 +38,6 @@ public interface ChildNodeEntry {
     /**
      * TODO: document
      */
-    NodeState getNode();
+    NodeState getNodeState();
 
 }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractChildNodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractChildNodeEntry.java?rev=1325728&r1=1325727&r2=1325728&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractChildNodeEntry.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractChildNodeEntry.java
Fri Apr 13 12:08:15 2012
@@ -43,7 +43,7 @@ public abstract class AbstractChildNodeE
         } else if (that instanceof ChildNodeEntry) {
             ChildNodeEntry other = (ChildNodeEntry) that;
             return getName().equals(other.getName())
-                    && getNode().equals(other.getNode());
+                    && getNodeState().equals(other.getNodeState());
         } else {
             return false;
         }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractNodeState.java?rev=1325728&r1=1325727&r2=1325728&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractNodeState.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/AbstractNodeState.java
Fri Apr 13 12:08:15 2012
@@ -59,7 +59,7 @@ public abstract class AbstractNodeState 
     public NodeState getChildNode(String name) {
         for (ChildNodeEntry entry : getChildNodeEntries(0, -1)) {
             if (name.equals(entry.getName())) {
-                return entry.getNode();
+                return entry.getNodeState();
             }
         }
         return null;
@@ -108,7 +108,7 @@ public abstract class AbstractNodeState 
 
         long childNodeCount = 0;
         for (ChildNodeEntry entry : getChildNodeEntries(0, -1)) {
-            if (!entry.getNode().equals(other.getChildNode(entry.getName()))) {
+            if (!entry.getNodeState().equals(other.getChildNode(entry.getName()))) {
                 return false;
             }
             childNodeCount++;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelChildNodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelChildNodeEntry.java?rev=1325728&r1=1325727&r2=1325728&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelChildNodeEntry.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelChildNodeEntry.java
Fri Apr 13 12:08:15 2012
@@ -37,7 +37,7 @@ class KernelChildNodeEntry extends Abstr
     }
 
     @Override
-    public NodeState getNode() {
+    public NodeState getNodeState() {
         return node;
     }
 



Mime
View raw message