svn commit: r432276 - in /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state: ChangeLog.java ItemState.java ItemStateValidator.java SessionItemStateManager.java

[an...@apache.org]

Author: angela
Date: Thu Aug 17 09:15:58 2006
New Revision: 432276

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

- remove DIFF comments
- SessionItemStateManager: remove unused IdFactory field

Modified:
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java?rev=432276&r1=432275&r2=432276&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java Thu Aug 17 09:15:58 2006
@@ -54,7 +54,6 @@
     private Set operations = new LinkedHashSet();
 
     //-----------------------------------------------< Inform the ChangeLog >---
-    // DIFF JR: method added
     /**
      * Add the given operation to the list of operations to be recorded within
      * the current update cycle of this ChangeLog.
@@ -112,12 +111,14 @@
     }
 
     //----------------------< Retrieve information present in the ChangeLog >---
-    // DIFF JR: method added
+    /**
+     *
+     * @return
+     */
     public boolean isEmpty() {
         return operations.isEmpty();
     }
 
-    // DIFF JR: method added
     /**
      *
      * @return

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java?rev=432276&r1=432275&r2=432276&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java Thu Aug 17 09:15:58 2006
@@ -90,7 +90,6 @@
      */
     final IdFactory idFactory;
 
-    // DIFF JR
     /**
      * The parent <code>NodeState</code> or <code>null</code> if this
      * instance represents the root node.

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java?rev=432276&r1=432275&r2=432276&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java Thu Aug 17 09:15:58 2006
@@ -502,7 +502,6 @@
         }
     }
 
-    // DIFF JR: copied from BatchedItemOperations
     /**
      * Checks if adding a child node called <code>nodeName</code> of node type
      * <code>nodeTypeName</code> to the given parent node is allowed in the

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=432276&r1=432275&r2=432276&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Thu Aug 17 09:15:58 2006
@@ -109,8 +109,6 @@
      */
     private final HierarchyManager hierMgr;
     private final NamespaceResolver nsResolver;
-
-    private final IdFactory idFactory;
     private final ItemStateValidator validator;
 
     /**
@@ -133,8 +131,6 @@
         this.transientStateMgr = new TransientItemStateManager(idFactory, workspaceItemStateMgr);
         // DIFF JR: validator added
         this.validator = validator;
-        // DIFF JR: idFactory added
-        this.idFactory = idFactory;
 
         this.nsResolver = nsResolver;