You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2012/03/12 11:17:04 UTC
svn commit: r1299613 - in
/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit:
NodeImpl.java state/TransientNodeState.java
Author: mduerig
Date: Mon Mar 12 10:17:03 2012
New Revision: 1299613
URL: http://svn.apache.org/viewvc?rev=1299613&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- minor refactoring
Modified:
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientNodeState.java
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java?rev=1299613&r1=1299612&r2=1299613&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java Mon Mar 12 10:17:03 2012
@@ -300,13 +300,13 @@ public class NodeImpl extends ItemImpl i
@Override
public NodeIterator getNodes() throws RepositoryException {
- Iterator<TransientNodeState> childNodeStates = state.getChildNodeStates();
+ Iterator<TransientNodeState> childNodeStates = state.getNodes();
return new NodeIteratorAdapter(nodeIterator(childNodeStates));
}
@Override
public NodeIterator getNodes(final String namePattern) throws RepositoryException {
- Iterator<TransientNodeState> childNodeStates = filter(state.getChildNodeStates(),
+ Iterator<TransientNodeState> childNodeStates = filter(state.getNodes(),
new Predicate<TransientNodeState>() {
@Override
public boolean evaluate(TransientNodeState state) {
@@ -319,7 +319,7 @@ public class NodeImpl extends ItemImpl i
@Override
public NodeIterator getNodes(final String[] nameGlobs) throws RepositoryException {
- Iterator<TransientNodeState> childNodeStates = filter(state.getChildNodeStates(),
+ Iterator<TransientNodeState> childNodeStates = filter(state.getNodes(),
new Predicate<TransientNodeState>() {
@Override
public boolean evaluate(TransientNodeState state) {
Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientNodeState.java?rev=1299613&r1=1299612&r2=1299613&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientNodeState.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientNodeState.java Mon Mar 12 10:17:03 2012
@@ -98,10 +98,10 @@ public class TransientNodeState {
}
public boolean hasChildNodeStates() {
- return getChildNodeStates().hasNext();
+ return getNodes().hasNext();
}
- public Iterator<TransientNodeState> getChildNodeStates() {
+ public Iterator<TransientNodeState> getNodes() {
BatchIterator<ChildNodeEntry> persistedEntries = new BatchIterator<ChildNodeEntry>(BATCH_SIZE) {
@Override
protected Iterator<? extends ChildNodeEntry> getBatch(long pos, long size) {