You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2010/12/16 12:02:30 UTC
svn commit: r1049919 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state:
ItemStateReferenceCache.java NodeState.java SharedItemStateManager.java
Author: angela
Date: Thu Dec 16 11:02:30 2010
New Revision: 1049919
URL: http://svn.apache.org/viewvc?rev=1049919&view=rev
Log:
javadoc
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java?rev=1049919&r1=1049918&r2=1049919&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java Thu Dec 16 11:02:30 2010
@@ -111,7 +111,7 @@ public class ItemStateReferenceCache imp
* to prevent interfering with the optimal performance of the segment
* hash map.
*
- * @param id item identifer
+ * @param id item identifier
* @return reference map segment
*/
private Map<ItemId, ItemState> getSegment(ItemId id) {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java?rev=1049919&r1=1049918&r2=1049919&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java Thu Dec 16 11:02:30 2010
@@ -380,9 +380,9 @@ public class NodeState extends ItemState
* with a new entry. Note that the entry will <i>overwrite</i> the old
* entry at the same relative position within the child node entries list.
*
- * @param oldId id the entry to be replaced is refering to.
+ * @param oldId id the entry to be replaced is referring to.
* @param newName <code>Name</code> object specifying the entry's new name
- * @param newId the id the new entry is refering to.
+ * @param newId the id the new entry is referring to.
* @return <code>true</code> if the entry was successfully replaced;
* otherwise <code>false</code>
*/
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?rev=1049919&r1=1049918&r2=1049919&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Thu Dec 16 11:02:30 2010
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.core.state
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -26,7 +25,6 @@ import javax.jcr.PropertyType;
import javax.jcr.ReferentialIntegrityException;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeType;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.cluster.UpdateEventChannel;
@@ -1176,7 +1174,7 @@ public class SharedItemStateManager
// Check the old parent
NodeId oldParentId = overlayedState.getParentId();
if (changeLog.deleted(oldParentId)) {
- // parent has been deleted aswell
+ // parent has been deleted as well
} else if (changeLog.isModified(oldParentId)) {
// the modified state will be check later on
} else {
@@ -1193,7 +1191,7 @@ public class SharedItemStateManager
NodeId childId = entry.getId();
if (changeLog.deleted(childId)) {
- // child has been deleted aswell
+ // child has been deleted as well
} else if (changeLog.isModified(childId)) {
// the modified state will be check later on
@@ -1385,7 +1383,7 @@ public class SharedItemStateManager
*/
void checkParent(ChangeLog changeLog, NodeState childState, NodeId expectedParent) throws ItemStateException {
- // Check whether the the changelog contains an entry for the parent aswell.
+ // Check whether the the changelog contains an entry for the parent as well.
NodeId parentId = childState.getParentId();
if (!parentId.equals(expectedParent)) {
Set sharedSet = childState.getSharedSet();