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/11 12:58:10 UTC

svn commit: r1299348 - in /jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state: PersistentNodeState.java TransientNodeState.java

Author: mduerig
Date: Sun Mar 11 11:58:09 2012
New Revision: 1299348

URL: http://svn.apache.org/viewvc?rev=1299348&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- cleanup 

Modified:
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/PersistentNodeState.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/state/PersistentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/PersistentNodeState.java?rev=1299348&r1=1299347&r2=1299348&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/PersistentNodeState.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/PersistentNodeState.java Sun Mar 11 11:58:09 2012
@@ -46,7 +46,7 @@ public class PersistentNodeState extends
     
     @Override
     public PropertyState getProperty(String name) {
-        return createPropertyState(name, properties.apply().get(name));
+        return new PropertyStateImpl(name, properties.apply().get(name));
     }
 
     @Override
@@ -60,7 +60,7 @@ public class PersistentNodeState extends
                     new Transformer<Entry<String, JsonValue>, PropertyState>() {
                         @Override
                         public PropertyState transform(Entry<String, JsonValue> entry) {
-                            return createPropertyState(entry.getKey(), entry.getValue());
+                            return new PropertyStateImpl(entry.getKey(), entry.getValue());
                         }
                     });
             }
@@ -127,10 +127,6 @@ public class PersistentNodeState extends
         return FullJsonParser.parseObject(new UnescapingJsonTokenizer(json));
     }
 
-    private static PropertyState createPropertyState(String name, JsonValue jsonObject) {
-        return new PropertyStateImpl(name, jsonObject);
-    }
-
     private ChildNodeEntry createChildNodeEntry(final String name) {
         return new AbstractChildNodeEntry() {
             @Override

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=1299348&r1=1299347&r2=1299348&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 Sun Mar 11 11:58:09 2012
@@ -95,6 +95,7 @@ public class TransientNodeState {
     }
 
     public Iterator<TransientNodeState> getChildNodeStates() {
+        // todo implement paging
         Iterable<ChildNodeEntry> persistedEntries = getPersistentNodeState().getChildNodeEntries(0, Long.MAX_VALUE);
         final NodeDelta delta = getNodeDelta();