From oak-commits-return-284-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Fri Apr 13 12:08:40 2012 Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EDC7D9F1F for ; Fri, 13 Apr 2012 12:08:40 +0000 (UTC) Received: (qmail 1085 invoked by uid 500); 13 Apr 2012 12:08:40 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 1065 invoked by uid 500); 13 Apr 2012 12:08:40 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 1056 invoked by uid 99); 13 Apr 2012 12:08:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2012 12:08:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2012 12:08:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8F3AE2388860; Fri, 13 Apr 2012 12:08:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120413120816.8F3AE2388860@eris.apache.org> 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; }