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 md...@apache.org on 2012/07/05 17:14:34 UTC
svn commit: r1357672 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
core/ReadOnlyTree.java plugins/lucene/LuceneIndex.java
spi/commit/EmptyObserver.java
Author: mduerig
Date: Thu Jul 5 15:14:33 2012
New Revision: 1357672
URL: http://svn.apache.org/viewvc?rev=1357672&view=rev
Log:
minor cleanup: missing @Override, final, static, private
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java?rev=1357672&r1=1357671&r2=1357672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ReadOnlyTree.java Thu Jul 5 15:14:33 2012
@@ -30,13 +30,13 @@ import org.apache.jackrabbit.oak.spi.sta
public class ReadOnlyTree implements Tree {
/** Parent of this tree, {@code null} for the root */
- private Tree parent;
+ private final Tree parent;
/** Name of this tree */
- private String name;
+ private final String name;
/** Underlying node state */
- protected NodeState state;
+ private final NodeState state;
public ReadOnlyTree(NodeState root) {
this(null, "", root);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java?rev=1357672&r1=1357671&r2=1357672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/lucene/LuceneIndex.java Thu Jul 5 15:14:33 2012
@@ -107,7 +107,7 @@ public class LuceneIndex implements Quer
}
}
- private Query getQuery(Filter filter) {
+ private static Query getQuery(Filter filter) {
List<Query> qs = new ArrayList<Query>();
String path = filter.getPath();
@@ -162,12 +162,13 @@ public class LuceneIndex implements Quer
private final Iterator<String> iterator;
- private String path = null;
+ private String path;
public PathCursor(Collection<String> paths) {
this.iterator = paths.iterator();
}
+ @Override
public boolean next() {
if (iterator.hasNext()) {
path = iterator.next();
@@ -183,6 +184,6 @@ public class LuceneIndex implements Quer
return path;
}
- };
+ }
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java?rev=1357672&r1=1357671&r2=1357672&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EmptyObserver.java Thu Jul 5 15:14:33 2012
@@ -32,6 +32,7 @@ public class EmptyObserver implements Ob
*/
public static final EmptyObserver INSTANCE = new EmptyObserver();
+ @Override
public void contentChanged(
NodeStore store, NodeState before, NodeState after) {
// do nothing