jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r467914 - in /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry: ChildItemReference.java ChildNodeEntry.java PathElementReference.java PropertyReference.java UUIDReference.java
Date Thu, 26 Oct 2006 08:33:31 GMT
Author: angela
Date: Thu Oct 26 01:33:30 2006
New Revision: 467914

URL: http://svn.apache.org/viewvc?view=rev&rev=467914
Log:
work in progress

- remove public getParent(), consistently use protected parent field.
- make resolve protected

Modified:
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildItemReference.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildNodeEntry.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PathElementReference.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PropertyReference.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/UUIDReference.java

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildItemReference.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildItemReference.java?view=diff&rev=467914&r1=467913&r2=467914
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildItemReference.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildItemReference.java
Thu Oct 26 01:33:30 2006
@@ -84,7 +84,7 @@
         this.isf = isf;
         this.target = new WeakReference(child);
     }
-
+    
     /**
      * Resolves this <code>ChildItemReference</code> and returns the target
      * <code>ItemState</code> of this reference. This method may return a
@@ -97,7 +97,7 @@
      *                                  does not exist.
      * @throws ItemStateException       if an error occurs.
      */
-    public ItemState resolve()
+    protected ItemState resolve()
             throws NoSuchItemStateException, ItemStateException {
         // check if cached
         if (target != null) {
@@ -110,16 +110,6 @@
         ItemState state = doResolve();
         target = new WeakReference(state);
         return state;
-    }
-
-    /**
-     * Returns the parent <code>NodeState</code>. This is the source of this
-     * <code>ChildItemReference</code>.
-     *
-     * @return the parent <code>NodeState</code>.
-     */
-    public NodeState getParent() {
-        return parent;
     }
 
     /**

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildNodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildNodeEntry.java?view=diff&rev=467914&r1=467913&r2=467914
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildNodeEntry.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/ChildNodeEntry.java
Thu Oct 26 01:33:30 2006
@@ -53,9 +53,9 @@
     /**
      * @return the referenced <code>NodeState</code>.
      * @throws NoSuchItemStateException if the <code>NodeState</code> does not
-     *                                  exist anymore.
-     * @throws ItemStateException       if an error occurs while retrieving the
-     *                                  <code>NodeState</code>.
+     * exist anymore.
+     * @throws ItemStateException If an error occurs while retrieving the
+     * <code>NodeState</code>.
      */
     public NodeState getNodeState()
             throws NoSuchItemStateException, ItemStateException;
@@ -66,7 +66,7 @@
      * cached and ready to be returned by {@link #getNodeState()}.
      *
      * @return <code>true</code> if the <code>NodeState</code> is
available;
-     *         otherwise <code>false</code>.
+     * otherwise <code>false</code>.
      */
     public boolean isAvailable();
 }

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PathElementReference.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PathElementReference.java?view=diff&rev=467914&r1=467913&r2=467914
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PathElementReference.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PathElementReference.java
Thu Oct 26 01:33:30 2006
@@ -74,7 +74,7 @@
      */
     protected ItemState doResolve()
             throws NoSuchItemStateException, ItemStateException {
-        return isf.createNodeState(getId(), getParent());
+        return isf.createNodeState(getId(), parent);
     }
 
     /**

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PropertyReference.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PropertyReference.java?view=diff&rev=467914&r1=467913&r2=467914
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PropertyReference.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/PropertyReference.java
Thu Oct 26 01:33:30 2006
@@ -97,7 +97,7 @@
      */
     protected ItemState doResolve()
             throws NoSuchItemStateException, ItemStateException {
-        return isf.createPropertyState(getId(), getParent());
+        return isf.createPropertyState(getId(), parent);
     }
 
     //-------------------------------------------------< ChildPropertyEntry >---

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/UUIDReference.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/UUIDReference.java?view=diff&rev=467914&r1=467913&r2=467914
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/UUIDReference.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/entry/UUIDReference.java
Thu Oct 26 01:33:30 2006
@@ -80,7 +80,7 @@
      */
     protected ItemState doResolve()
             throws NoSuchItemStateException, ItemStateException {
-        return isf.createNodeState(childId, getParent());
+        return isf.createNodeState(childId, parent);
     }
 
     /**



Mime
View raw message