jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1376482 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
Date Thu, 23 Aug 2012 13:34:27 GMT
Author: mduerig
Date: Thu Aug 23 13:34:26 2012
New Revision: 1376482

URL: http://svn.apache.org/viewvc?rev=1376482&view=rev
Log:
OAK-275: Introduce TreeLocation interface
remove redundant nullable annotations from implementations

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1376482&r1=1376481&r2=1376482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
Thu Aug 23 13:34:26 2012
@@ -553,7 +553,6 @@ public class TreeImpl implements Tree, P
             this.tree = tree;
         }
 
-        @Nonnull
         @Override
         public TreeLocation getParent() {
             return tree.parent == null
@@ -561,7 +560,6 @@ public class TreeImpl implements Tree, P
                 : new NodeLocation(tree.parent);
         }
 
-        @Nonnull
         @Override
         public TreeLocation getChild(String name) {
             PropertyState property = tree.internalGetProperty(name);
@@ -608,13 +606,11 @@ public class TreeImpl implements Tree, P
             this.property = property;
         }
 
-        @Nonnull
         @Override
         public TreeLocation getParent() {
             return parent;
         }
 
-        @Nonnull
         @Override
         public TreeLocation getChild(String name) {
             return NullLocation.INSTANCE;
@@ -646,13 +642,11 @@ public class TreeImpl implements Tree, P
     private static class NullLocation implements TreeLocation {
         static NullLocation INSTANCE = new NullLocation();
 
-        @Nonnull
         @Override
         public TreeLocation getParent() {
             return this;
         }
 
-        @Nonnull
         @Override
         public TreeLocation getChild(String name) {
             return this;



Mime
View raw message