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 11:53:02 UTC
svn commit: r1049910 -
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/
Author: angela
Date: Thu Dec 16 10:53:01 2010
New Revision: 1049910
URL: http://svn.apache.org/viewvc?rev=1049910&view=rev
Log:
javadoc
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalBaselineImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreeze.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNode.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplBase.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplConfig.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSet.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalBaselineImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalBaselineImpl.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalBaselineImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalBaselineImpl.java Thu Dec 16 10:53:01 2010
@@ -34,7 +34,7 @@ class InternalBaselineImpl extends Inter
/**
* Creates a new internal baseline with the given version history and
- * persistance node. please note, that versions must be created by the
+ * persistence node. please note, that versions must be created by the
* version history.
*
* @param vh containing version history
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreeze.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreeze.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreeze.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreeze.java Thu Dec 16 10:53:01 2010
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.spi.Name;
/**
* the base interface for nodes that were versioned and turned either into
- * InternalFrozenNode or InteralFrozenVersionHistory.
+ * InternalFrozenNode or InternalFrozenVersionHistory.
*/
public interface InternalFreeze extends InternalVersionItem {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNode.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNode.java Thu Dec 16 10:53:01 2010
@@ -72,7 +72,7 @@ public interface InternalFrozenNode exte
Set<Name> getFrozenMixinTypes();
/**
- * Checks if this frozen node had the inidcated child node.
+ * Checks if this frozen node had the indicated child node.
* @param name name of the childnode
* @param idx 1-based index
* @return <code>true</code> if the child node exists
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java Thu Dec 16 10:53:01 2010
@@ -52,7 +52,7 @@ class InternalFrozenNodeImpl extends Int
private NodeId frozenUUID = null;
/**
- * the frozen primary type of the orginal node
+ * the frozen primary type of the original node
*/
private Name frozenPrimaryType = null;
@@ -62,7 +62,7 @@ class InternalFrozenNodeImpl extends Int
private Set<Name> frozenMixinTypes = null;
/**
- * Creates a new frozen node based on the given persistance node.
+ * Creates a new frozen node based on the given persistence node.
*
* @param vMgr version manager
* @param node underlying node
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java Thu Dec 16 10:53:01 2010
@@ -104,7 +104,7 @@ public interface InternalVersion extends
boolean isMoreRecent(InternalVersion v);
/**
- * returns the internal version history in wich this version lifes in.
+ * returns the internal version history in which this version lives in.
*
* @return the version history for this version.
*/
@@ -119,7 +119,7 @@ public interface InternalVersion extends
boolean isRootVersion();
/**
- * Checks, if this version has the given label assosiated
+ * Checks, if this version has the given label associated
*
* @param label the label to check.
* @return <code>true</code> if the label is assigned to this version;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java Thu Dec 16 10:53:01 2010
@@ -27,7 +27,7 @@ import javax.jcr.version.VersionExceptio
public interface InternalVersionHistory extends InternalVersionItem {
/**
- * Equivalalent to {@link javax.jcr.version.VersionHistory#getRootVersion()}.
+ * Equivalent to {@link javax.jcr.version.VersionHistory#getRootVersion()}.
*
* @return the root version
* @see javax.jcr.version.VersionHistory#getRootVersion()
@@ -63,7 +63,7 @@ public interface InternalVersionHistory
InternalVersion getVersion(NodeId id);
/**
- * Equivalalent to {@link javax.jcr.version.VersionHistory#getVersionByLabel(java.lang.String)}
+ * Equivalent to {@link javax.jcr.version.VersionHistory#getVersionByLabel(java.lang.String)}
* but returns <code>null</code> if the version does not exists.
*
* @param label the lable
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java Thu Dec 16 10:53:01 2010
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.core.id.Nod
abstract class InternalVersionItemImpl implements InternalVersionItem {
/**
- * the underlying persistance node
+ * the underlying persistence node
*/
protected final NodeStateEx node;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java Thu Dec 16 10:53:01 2010
@@ -338,7 +338,7 @@ abstract class InternalVersionManagerBas
* @param node versionable node state
* @param copiedFrom node id for the jcr:copiedFrom property
* @return identifier of the new version history node
- * @throws RepositoryException if an error occurrs
+ * @throws RepositoryException if an error occurs
* @see #getVersionHistory(Session, NodeState, NodeId)
*/
protected abstract VersionHistoryInfo createVersionHistory(Session session,
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java Thu Dec 16 10:53:01 2010
@@ -439,8 +439,8 @@ public class NodeStateEx {
* retrieves the child node with the given name and 1-base index or
* <code>null</code> if the node does not exist.
*
- * @param name name of hte child node
- * @param index index of thechild node
+ * @param name name of the child node
+ * @param index index of the child node
* @return the node state.
* @throws RepositoryException if an error occurs
*/
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateManager.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateManager.java Thu Dec 16 10:53:01 2010
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Spezialized SharedItemStateManager that filters out NodeReferences to
+ * Specialized SharedItemStateManager that filters out NodeReferences to
* non-versioning states.
*/
public class VersionItemStateManager extends SharedItemStateManager {
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java Thu Dec 16 10:53:01 2010
@@ -31,7 +31,7 @@ import java.util.NoSuchElementException;
* This Class implements a VersionIterator that iterates over a version
* graph following the successor nodes. When this iterator is created, it gathers
* the id's of the versions and returns them when iterating. please note, that
- * a version can be deleted while traversing this iterator and the 'nextVesion'
+ * a version can be deleted while traversing this iterator and the 'nextVersion'
* would produce a ConcurrentModificationException.
* <p/>
* If this iterator is initialized with a base version, it will only iterate
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplBase.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplBase.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplBase.java Thu Dec 16 10:53:01 2010
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
/**
- * The JCR Version Manager impementation is split in several classes in order to
+ * The JCR Version Manager implementation is split in several classes in order to
* group related methods together.
* </p>
* this class provides basic routines for all operations and the methods related
@@ -76,7 +76,7 @@ abstract public class VersionManagerImpl
protected final UpdatableItemStateManager stateMgr;
/**
- * hierarch manager that operates on the localte state manager
+ * hierarchy manager that operates on the locale state manager
*/
protected final HierarchyManager hierMgr;
@@ -244,7 +244,8 @@ abstract public class VersionManagerImpl
}
/**
- * Recursivly collects all base versions of this configuration tree.
+ * Recursively collects all base versions of this configuration tree.
+ *
* @param root node to traverse
* @param baseVersions set of base versions to fill
* @throws RepositoryException if an error occurs
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplConfig.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplConfig.java Thu Dec 16 10:53:01 2010
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
/**
- * The JCR Version Manager impementation is split in several classes in order to
+ * The JCR Version Manager implementation is split in several classes in order to
* group related methods together.
* <p/>
* this class provides methods for the configuration and baselines related operations.
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplMerge.java Thu Dec 16 10:53:01 2010
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The JCR Version Manager impementation is split in several classes in order to
+ * The JCR Version Manager implementation is split in several classes in order to
* group related methods together.
* </p>
* this class provides methods for the merge operations.
@@ -79,7 +79,7 @@ abstract public class VersionManagerImpl
* @param state state to merge or update
* @param srcRoot src workspace root node
* @param failedIds list of failed ids
- * @param bestEffort best effor flag
+ * @param bestEffort best effort flag
* @param shallow is shallow flag
* @throws RepositoryException if an error occurs
* @throws ItemStateException if an error occurs
@@ -119,7 +119,7 @@ abstract public class VersionManagerImpl
* @param state state to merge or update
* @param srcRoot src workspace root node
* @param failedIds list of failed ids
- * @param bestEffort best effor flag
+ * @param bestEffort best effort flag
* @param shallow is shallow flag
* @throws RepositoryException if an error occurs
* @throws ItemStateException if an error occurs
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSelector.java Thu Dec 16 10:53:01 2010
@@ -34,7 +34,7 @@ import javax.jcr.RepositoryException;
* is restored.<br/>
* The <code>Node.restoreByLabel()</code> uses the
* {@link LabelVersionSelector} which is initialized with the label of the
- * version to be restored. This selector selectes the version with the same
+ * version to be restored. This selector selects the version with the same
* label. if no such version exists, the initial one is restored.
* <p/>
*
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSet.java?rev=1049910&r1=1049909&r2=1049910&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSet.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionSet.java Thu Dec 16 10:53:01 2010
@@ -23,7 +23,7 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.core.id.NodeId;
/**
- * This Class implements a version selector that is based on a set of verions.
+ * This Class implements a version selector that is based on a set of versions.
*/
public class VersionSet implements VersionSelector {