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 D19C1DC79 for ; Tue, 21 Aug 2012 14:21:35 +0000 (UTC) Received: (qmail 57974 invoked by uid 500); 21 Aug 2012 14:21:35 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 57945 invoked by uid 500); 21 Aug 2012 14:21:35 -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-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 57936 invoked by uid 99); 21 Aug 2012 14:21:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2012 14:21:35 +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; Tue, 21 Aug 2012 14:21:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 50FD723888EA; Tue, 21 Aug 2012 14:20:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1375564 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: api/Tree.java spi/state/NodeBuilder.java Date: Tue, 21 Aug 2012 14:20:51 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120821142051.50FD723888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Tue Aug 21 14:20:50 2012 New Revision: 1375564 URL: http://svn.apache.org/viewvc?rev=1375564&view=rev Log: OAK-266: Clarify Tree interface Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java?rev=1375564&r1=1375563&r2=1375564&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java Tue Aug 21 14:20:50 2012 @@ -216,7 +216,7 @@ public interface Tree { * @return the affected property state */ @Nonnull - PropertyState setProperty(String name, CoreValue value); + PropertyState setProperty(String name, @Nonnull CoreValue value); /** * Set a multivalued valued property state @@ -226,10 +226,11 @@ public interface Tree { * @return the affected property state */ @Nonnull - PropertyState setProperty(String name, List values); + PropertyState setProperty(String name, @Nonnull List values); /** - * Remove the property with the given name. + * Remove the property with the given name. This method has no effect if a + * property of the given {@code name} does not exist. * * @param name The name of the property */ Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java?rev=1375564&r1=1375563&r2=1375564&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/NodeBuilder.java Tue Aug 21 14:20:50 2012 @@ -20,7 +20,6 @@ import java.util.List; import javax.annotation.Nonnull; -import com.sun.istack.internal.NotNull; import org.apache.jackrabbit.oak.api.CoreValue; import org.apache.jackrabbit.oak.api.PropertyState; @@ -67,7 +66,7 @@ public interface NodeBuilder { * @param name name child node containing the sub-tree * @param nodeState sub-tree */ - void setNode(String name, @NotNull NodeState nodeState); + void setNode(String name, @Nonnull NodeState nodeState); /** * Remove a child node. This method has no effect if a @@ -105,7 +104,7 @@ public interface NodeBuilder { * @param name property name * @param value */ - void setProperty(String name, @NotNull CoreValue value); + void setProperty(String name, @Nonnull CoreValue value); /** * Set a property. @@ -113,7 +112,7 @@ public interface NodeBuilder { * @param name property name * @param values */ - void setProperty(String name, @NotNull List values); + void setProperty(String name, @Nonnull List values); /** * Remove the named property. This method has no effect if a