Author: angela
Date: Wed Nov 20 17:06:59 2013
New Revision: 1543883
URL: http://svn.apache.org/r1543883
Log:
minor improvement: make ImmutableTree#state private and add #unwrap() method ->
used by ImmutableRoot
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java?rev=1543883&r1=1543882&r2=1543883&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
Wed Nov 20 17:06:59 2013
@@ -18,11 +18,7 @@
*/
package org.apache.jackrabbit.oak.core;
-import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
-
import java.io.InputStream;
-
import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.Blob;
@@ -36,6 +32,9 @@ import org.apache.jackrabbit.oak.query.Q
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
+
/**
* Simple implementation of the Root interface that only supports simple read
* operations based on the {@code NodeState} (or {@code ImmutableTree})
@@ -61,7 +60,6 @@ public final class ImmutableRoot impleme
//---------------------------------------------------------------< Root
>---
-
@Nonnull
@Override
public ImmutableTree getTree(@Nonnull String path) {
@@ -114,7 +112,7 @@ public final class ImmutableRoot impleme
return new QueryEngineImpl() {
@Override
protected ExecutionContext getExecutionContext() {
- return new ExecutionContext(rootTree.state, rootTree, new
PropertyIndexProvider());
+ return new ExecutionContext(rootTree.unwrap(), rootTree, new
PropertyIndexProvider());
}
};
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java?rev=1543883&r1=1543882&r2=1543883&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
Wed Nov 20 17:06:59 2013
@@ -90,7 +90,7 @@ public final class ImmutableTree extends
/**
* Underlying node state
*/
- final NodeState state;
+ private final NodeState state;
private final ParentProvider parentProvider;
private final TreeTypeProvider typeProvider;
@@ -250,7 +250,10 @@ public final class ImmutableTree extends
return "ImmutableTree '" + getName() + "':" + state.toString();
}
- //------------------------------------------------------------< internal
>---
+
//--------------------------------------------------------------------------
+ public NodeState unwrap() {
+ return state;
+ }
public int getType() {
if (type == TreeTypeProvider.TYPE_NONE) {
