jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1440602 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
Date Wed, 30 Jan 2013 19:37:18 GMT
Author: angela
Date: Wed Jan 30 19:37:18 2013
New Revision: 1440602

URL: http://svn.apache.org/viewvc?rev=1440602&view=rev
Log:
OAK-599: add issue reference and replace usage of PropertyDelegate#getPropertyLocation where
it isn't needed.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.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=1440602&r1=1440601&r2=1440602&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
Wed Jan 30 19:37:18 2013
@@ -584,7 +584,7 @@ public class TreeImpl implements Tree {
 
     //-------------------------------------------------------< TreeLocation >---
 
-    public class NodeLocation extends AbstractNodeLocation<TreeImpl> {
+    private final class NodeLocation extends AbstractNodeLocation<TreeImpl> {
 
         private NodeLocation(TreeImpl tree) {
             super(tree);
@@ -636,7 +636,8 @@ public class TreeImpl implements Tree {
         }
     }
 
-    public class PropertyLocation extends AbstractPropertyLocation<NodeLocation> {
+    // TODO: OAK-599 (accessed by PropertyDelegate)
+    public final class PropertyLocation extends AbstractPropertyLocation<NodeLocation>
{
 
         private PropertyLocation(NodeLocation parentLocation, String name) {
             super(parentLocation, name);

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java?rev=1440602&r1=1440601&r2=1440602&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
Wed Jan 30 19:37:18 2013
@@ -43,7 +43,8 @@ public class PropertyDelegate extends It
 
     /**
      * Get the value of the property
-     * @return  the value of the property
+     *
+     * @return the value of the property
      * @throws InvalidItemStateException
      */
     @Nonnull
@@ -53,7 +54,8 @@ public class PropertyDelegate extends It
 
     /**
      * Get the values of the property
-     * @return  the values of the property
+     *
+     * @return the values of the property
      * @throws InvalidItemStateException
      */
     @Nonnull
@@ -63,7 +65,8 @@ public class PropertyDelegate extends It
 
     /**
      * Determine whether the property is multi valued
-     * @return  {@code true} if multi valued
+     *
+     * @return {@code true} if multi valued
      */
     public boolean isMultivalue() throws InvalidItemStateException {
         return getPropertyState().isArray();
@@ -71,6 +74,7 @@ public class PropertyDelegate extends It
 
     /**
      * Set the value of the property
+     *
      * @param value
      */
     public void setValue(Value value) throws RepositoryException {
@@ -79,6 +83,7 @@ public class PropertyDelegate extends It
 
     /**
      * Set the values of the property
+     *
      * @param values
      */
     public void setValues(Iterable<Value> values) throws RepositoryException {
@@ -96,13 +101,14 @@ public class PropertyDelegate extends It
 
     @Nonnull
     private PropertyState getPropertyState() throws InvalidItemStateException {
-        PropertyState property = getPropertyLocation().getProperty();
+        PropertyState property = getLocation().getProperty();
         if (property == null) {
             throw new InvalidItemStateException();
         }
         return property;
     }
 
+    // TODO: OAK-599
     @Nonnull
     private PropertyLocation getPropertyLocation() throws InvalidItemStateException {
         TreeLocation location = getLocation();



Mime
View raw message