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 an...@apache.org on 2013/04/05 15:57:12 UTC
svn commit: r1464978 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
Author: angela
Date: Fri Apr 5 13:57:12 2013
New Revision: 1464978
URL: http://svn.apache.org/r1464978
Log:
minor improvement, remove unused constructor
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java?rev=1464978&r1=1464977&r2=1464978&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java Fri Apr 5 13:57:12 2013
@@ -53,8 +53,7 @@ public class ModifiedNodeState extends A
if (properties.isEmpty()) {
return base;
} else {
- return new ModifiedNodeState(
- base, properties, ImmutableMap.<String, NodeState>of());
+ return new ModifiedNodeState(base, properties, ImmutableMap.<String, NodeState>of());
}
}
@@ -63,8 +62,7 @@ public class ModifiedNodeState extends A
if (nodes.isEmpty()) {
return base;
} else {
- return new ModifiedNodeState(
- base, ImmutableMap.<String, PropertyState>of(), nodes);
+ return new ModifiedNodeState(base, ImmutableMap.<String, PropertyState>of(), nodes);
}
}
@@ -84,16 +82,13 @@ public class ModifiedNodeState extends A
if (base instanceof ModifiedNodeState) {
ModifiedNodeState mbase = collapse((ModifiedNodeState) base);
- Map<String, PropertyState> properties =
- Maps.newHashMap(mbase.properties);
+ Map<String, PropertyState> properties = Maps.newHashMap(mbase.properties);
properties.putAll(state.properties);
- Map<String, NodeState> nodes =
- Maps.newHashMap(mbase.nodes);
+ Map<String, NodeState> nodes = Maps.newHashMap(mbase.nodes);
nodes.putAll(state.nodes);
- return new ModifiedNodeState(
- mbase.getBaseState(), properties, nodes);
+ return new ModifiedNodeState(mbase.getBaseState(), properties, nodes);
} else {
return state;
}
@@ -125,12 +120,6 @@ public class ModifiedNodeState extends A
this.nodes = checkNotNull(nodes);
}
- public ModifiedNodeState(
- @Nonnull NodeState base,
- @Nonnull Map<String, ? extends PropertyState> properties) {
- this(base, properties, ImmutableMap.<String, NodeState>of());
- }
-
@Nonnull
public NodeState getBaseState() {
return base;