Author: mduerig
Date: Thu Jan 9 10:47:43 2014
New Revision: 1556785
URL: http://svn.apache.org/r1556785
Log:
fix Javadoc, remove unused imports
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java?rev=1556785&r1=1556784&r2=1556785&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ContentSession.java
Thu Jan 9 10:47:43 2014
@@ -67,9 +67,8 @@ public interface ContentSession extends
/**
* The current head root as seen by this content session. Use
- * {@link Root#commit(org.apache.jackrabbit.oak.spi.commit.CommitHook...)}
- * to atomically apply the changes made in that subtree the underlying
- * Microkernel.
+ * {@link Root#commit()} to atomically apply the changes made in that
+ * subtree the underlying Microkernel.
* <p>
* The root instance gives you a stable view of the tree at the time the
* root is acquired. In certain setups (i.e. clusters) changes committed
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java?rev=1556785&r1=1556784&r2=1556785&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Descriptors.java
Thu Jan 9 10:47:43 2014
@@ -45,7 +45,7 @@ public interface Descriptors {
* if it is either a valid implementation-specific key or not a valid key.
*
* @param key a descriptor key.
- * @return whether <code>key</code> is a standard descriptor.
+ * @return whether {@code key} is a standard descriptor.
*/
boolean isStandardDescriptor(@Nonnull String key);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java?rev=1556785&r1=1556784&r2=1556785&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
Thu Jan 9 10:47:43 2014
@@ -24,8 +24,6 @@ import java.io.InputStream;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.apache.jackrabbit.oak.spi.commit.CommitHook;
-
/**
* A {@code Root} instance serves as a container for a {@link Tree}. It is
* obtained from a {@link ContentSession}, which governs accessibility and
@@ -36,7 +34,7 @@ import org.apache.jackrabbit.oak.spi.com
* will throw an {@code InvalidStateException}.
* <p>
* {@link Tree} instances may become non existing after a call to
- * {@link #refresh()}, {@link #rebase()} or {@link #commit(CommitHook...
hooks)}.
+ * {@link #refresh()}, {@link #rebase()} or {@link #commit()}.
* Any write access to non existing {@code Tree} instances will cause an
* {@code InvalidStateException}.
* @see Tree Existence and iterability of trees
@@ -56,7 +54,7 @@ public interface Root {
* </ul>
* If a tree at {@code destinationPath} exists but is not accessible to the
* editing content session this method succeeds but a subsequent
- * {@link #commit(CommitHook... hooks)} will detect the violation and fail.
+ * {@link #commit()} will detect the violation and fail.
*
* @param sourcePath The source path
* @param destPath The destination path
@@ -76,7 +74,7 @@ public interface Root {
* </ul>
* If a tree at {@code destinationPath} exists but is not accessible to the
* editing content session this method succeeds but a subsequent
- * {@link #commit(CommitHook... hooks)} will detect the violation and fail.
+ * {@link #commit()} will detect the violation and fail.
*
* @param sourcePath source path
* @param destPath destination path
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java?rev=1556785&r1=1556784&r2=1556785&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Tree.java
Thu Jan 9 10:47:43 2014
@@ -52,8 +52,7 @@ import com.google.common.base.Function;
* will throw an {@code InvalidStateException}.
* <p>
* {@link Tree} instances may become non existing after a call to
- * {@link Root#refresh()}, {@link Root#rebase()} or
- * {@link Root#commit(org.apache.jackrabbit.oak.spi.commit.CommitHook...)}.
+ * {@link Root#refresh()}, {@link Root#rebase()} or {@link Root#commit()}.
* Any write access to non existing {@code Tree} instances will cause an
* {@code InvalidStateException}.
*
