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/10 23:09:43 UTC
svn commit: r1299281 - in
/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state:
ChangeTree.java TransientNodeState.java
Author: mduerig
Date: Sat Mar 10 22:09:43 2012
New Revision: 1299281
URL: http://svn.apache.org/viewvc?rev=1299281&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- cleanup
Modified:
jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.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/ChangeTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java?rev=1299281&r1=1299280&r2=1299281&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java (original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/ChangeTree.java Sat Mar 10 22:09:43 2012
@@ -252,12 +252,12 @@ public class ChangeTree {
* @return the value of the property with the given {@code name}, JSON {@code null} if the
* property has been removed or {@code null} if if does not exist.
*/
- public JsonValue getProperty(String name) {
+ public JsonValue getPropertyValue(String name) {
return properties.get(name);
}
/**
- * @return an iterator of all added and modified properties.
+ * @return an iterator for all added and modified properties.
*/
public Iterator<PropertyState> getPropertyStates() {
Iterator<Entry<String, JsonValue>> entries =
@@ -269,7 +269,6 @@ public class ChangeTree {
}
});
- // fixme: refactor property value encoding
return Iterators.transformIterator(entries,
new Transformer<Entry<String, JsonValue>, PropertyState>() {
@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=1299281&r1=1299280&r2=1299281&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 Sat Mar 10 22:09:43 2012
@@ -169,7 +169,7 @@ public class TransientNodeState {
}
public boolean isPropertyNew(String name) {
- JsonValue value = getNodeDelta().getProperty(name);
+ JsonValue value = getNodeDelta().getPropertyValue(name);
return value != null && !value.isNull() && getPersistedPropertyValue(name) == null;
}
@@ -226,7 +226,7 @@ public class TransientNodeState {
}
private JsonValue getPropertyValueOrNull(String name) {
- JsonValue value = getNodeDelta().getProperty(name);
+ JsonValue value = getNodeDelta().getPropertyValue(name);
if (value == null) {
return getPersistedPropertyValue(name);
}