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 al...@apache.org on 2017/06/01 08:45:00 UTC
svn commit: r1797165 -
/jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
Author: alexparvulescu
Date: Thu Jun 1 08:45:00 2017
New Revision: 1797165
URL: http://svn.apache.org/viewvc?rev=1797165&view=rev
Log:
OAK-5525 VisibleEditor should use the NodeStateUtils to determine visibility
Modified:
jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
Modified: jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java?rev=1797165&r1=1797164&r2=1797165&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java (original)
+++ jackrabbit/oak/trunk/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/VisibleEditor.java Thu Jun 1 08:45:00 2017
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.spi.commit;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.spi.state.NodeStateUtils.isHidden;
import javax.annotation.CheckForNull;
@@ -47,10 +48,6 @@ public class VisibleEditor implements Ed
this.editor = checkNotNull(editor);
}
- private boolean isVisible(String name) {
- return name.charAt(0) != ':';
- }
-
@Override
public void enter(NodeState before, NodeState after)
throws CommitFailedException {
@@ -65,7 +62,7 @@ public class VisibleEditor implements Ed
@Override
public void propertyAdded(PropertyState after) throws CommitFailedException {
- if (isVisible(after.getName())) {
+ if (!isHidden(after.getName())) {
editor.propertyAdded(after);
}
}
@@ -73,7 +70,7 @@ public class VisibleEditor implements Ed
@Override
public void propertyChanged(PropertyState before, PropertyState after)
throws CommitFailedException {
- if (isVisible(after.getName())) {
+ if (!isHidden(after.getName())) {
editor.propertyChanged(before, after);
}
}
@@ -81,7 +78,7 @@ public class VisibleEditor implements Ed
@Override
public void propertyDeleted(PropertyState before)
throws CommitFailedException {
- if (isVisible(before.getName())) {
+ if (!isHidden(before.getName())) {
editor.propertyDeleted(before);
}
}
@@ -89,7 +86,7 @@ public class VisibleEditor implements Ed
@Override @CheckForNull
public Editor childNodeAdded(String name, NodeState after)
throws CommitFailedException {
- if (isVisible(name)) {
+ if (!isHidden(name)) {
return wrap(editor.childNodeAdded(name, after));
} else {
return null;
@@ -100,7 +97,7 @@ public class VisibleEditor implements Ed
public Editor childNodeChanged(
String name, NodeState before, NodeState after)
throws CommitFailedException {
- if (isVisible(name)) {
+ if (!isHidden(name)) {
return wrap(editor.childNodeChanged(name, before, after));
} else {
return null;
@@ -110,7 +107,7 @@ public class VisibleEditor implements Ed
@Override @CheckForNull
public Editor childNodeDeleted(String name, NodeState before)
throws CommitFailedException {
- if (isVisible(name)) {
+ if (!isHidden(name)) {
return wrap(editor.childNodeDeleted(name, before));
} else {
return null;