jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
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 GMT
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<CoreValue> values);
+    PropertyState setProperty(String name, @Nonnull List<CoreValue> 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<CoreValue> values);
+    void setProperty(String name, @Nonnull List<CoreValue> values);
 
     /**
      * Remove the named property. This method has no effect if a



Mime
View raw message