You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/06/22 09:12:34 UTC
svn commit: r1686779 - in
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr:
lock/LockManagerImpl.java version/VersionManagerImpl.java
Author: mreutegg
Date: Mon Jun 22 07:12:34 2015
New Revision: 1686779
URL: http://svn.apache.org/r1686779
Log:
OAK-98 Source code formatting, code conventions, Javadocs
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java?rev=1686779&r1=1686778&r2=1686779&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java Mon Jun 22 07:12:34 2015
@@ -71,7 +71,7 @@ public class LockManagerImpl implements
public void addLockToken(final String lockToken)
throws RepositoryException {
try {
- delegate.performVoid(new LockOperation(sessionContext, lockToken, "addLockToken") {
+ delegate.performVoid(new LockOperation<Void>(sessionContext, lockToken, "addLockToken") {
@Override
protected void performVoid(@Nonnull NodeDelegate node) throws LockException {
if (node.holdsLock(false)) { // TODO: check ownership?
@@ -169,7 +169,7 @@ public class LockManagerImpl implements
@Override
public void unlock(String absPath) throws RepositoryException {
- delegate.performVoid(new LockOperation(sessionContext, absPath, "unlock") {
+ delegate.performVoid(new LockOperation<Void>(sessionContext, absPath, "unlock") {
@Override
protected void performVoid(@Nonnull NodeDelegate node)
throws RepositoryException {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java?rev=1686779&r1=1686778&r2=1686779&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java Mon Jun 22 07:12:34 2015
@@ -78,7 +78,7 @@ public class VersionManagerImpl implemen
final boolean removeExisting)
throws RepositoryException {
final SessionDelegate sessionDelegate = sessionContext.getSessionDelegate();
- sessionDelegate.performVoid(new SessionOperation("restore", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("restore", true) {
@Override
public void performVoid() throws RepositoryException {
String oakPath = getOakPathOrThrowNotFound(absPath);
@@ -164,7 +164,7 @@ public class VersionManagerImpl implemen
throw new VersionException("Restore of root version not possible");
}
final SessionDelegate sessionDelegate = sessionContext.getSessionDelegate();
- sessionDelegate.performVoid(new SessionOperation("restore", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("restore", true) {
@Override
public void performVoid() throws RepositoryException {
// check for pending changes
@@ -325,7 +325,7 @@ public class VersionManagerImpl implemen
@Override
public void checkout(final String absPath) throws RepositoryException {
final SessionDelegate sessionDelegate = sessionContext.getSessionDelegate();
- sessionDelegate.performVoid(new SessionOperation("checkout", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("checkout", true) {
@Override
public void performVoid() throws RepositoryException {
String oakPath = getOakPathOrThrowNotFound(absPath);