jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1463152 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/api/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/ oak-core/src/main/java/org/apache/jac...
Date Mon, 01 Apr 2013 14:39:22 GMT
Author: mduerig
Date: Mon Apr  1 14:39:22 2013
New Revision: 1463152

URL: http://svn.apache.org/r1463152
Log:
remove unnecessary import
missing @Override
make utitliy class final
use @code
redundant abstract modifier

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/AbstractPropertyState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TypeCodes.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RebaseDiff.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedItemImporter.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/AbstractPropertyState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/AbstractPropertyState.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/AbstractPropertyState.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/AbstractPropertyState.java
Mon Apr  1 14:39:22 2013
@@ -18,16 +18,14 @@
  */
 package org.apache.jackrabbit.oak.api;
 
-import javax.jcr.PropertyType;
-
-import com.google.common.collect.Iterables;
-import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.Type;
-
 import static org.apache.jackrabbit.oak.api.Type.BINARIES;
 import static org.apache.jackrabbit.oak.api.Type.STRING;
 import static org.apache.jackrabbit.oak.api.Type.STRINGS;
 
+import javax.jcr.PropertyType;
+
+import com.google.common.collect.Iterables;
+
 /**
  * Abstract base class for {@link PropertyState} implementations. This
  * class provides default implementations of basic {@link Object} methods,

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java
Mon Apr  1 14:39:22 2013
@@ -16,7 +16,11 @@
  */
 package org.apache.jackrabbit.oak.core;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.api.Type.STRING;
+
 import java.util.Iterator;
+
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -33,9 +37,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.jackrabbit.oak.api.Type.STRING;
-
 /**
  * ImmutableTree...
  * FIXME: merge with ReadOnlyTree
@@ -179,6 +180,7 @@ public final class ImmutableTree extends
         }
     }
 
+    @Override
     @Nonnull
     String getIdentifier() {
         PropertyState property = state.getProperty(JcrConstants.JCR_UUID);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TypeCodes.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TypeCodes.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TypeCodes.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/TypeCodes.java
Mon Apr  1 14:39:22 2013
@@ -16,19 +16,19 @@
  */
 package org.apache.jackrabbit.oak.kernel;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
 import javax.jcr.PropertyType;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * TypeCodes maps between {@code Type} and the code used to prefix
  * its json serialisation.
  */
-public class TypeCodes {
+public final class TypeCodes {
     private static final Map<Integer, String> TYPE2CODE = new HashMap<Integer, String>();
     private static final Map<String, Integer> CODE2TYPE = new HashMap<String, Integer>();
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrNameParser.java
Mon Apr  1 14:39:22 2013
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.util.XMLCha
  * In case of failure {@link Listener#error(String)} is called indicating
  * the reason.
  */
-public class JcrNameParser {
+public final class JcrNameParser {
 
     // constants for parser
     private static final int STATE_PREFIX_START = 0;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/JcrPathParser.java
Mon Apr  1 14:39:22 2013
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.namepa
 /**
  * TODO document
  */
-public class JcrPathParser {
+public final class JcrPathParser {
 
     // constants for parser
     private static final int STATE_PREFIX_START = 0;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/ReadOnlyNamespaceRegistry.java
Mon Apr  1 14:39:22 2013
@@ -40,7 +40,7 @@ public abstract class ReadOnlyNamespaceR
     /**
      * Called by the {@link NamespaceRegistry} implementation methods
      * to acquire a root {@link Tree} instance from which to read the
-     * namespace mappings (under <code>jcr:system/rep:namespaces</code>).
+     * namespace mappings (under {@code jcr:system/rep:namespaces}).
      *
      * @return root {@link Tree} for reading the namespace mappings
      */

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
Mon Apr  1 14:39:22 2013
@@ -18,16 +18,15 @@ package org.apache.jackrabbit.oak.spi.st
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.apache.jackrabbit.oak.api.PropertyState;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import org.apache.jackrabbit.oak.api.PropertyState;
+
 /**
  * Abstract base class for {@link NodeState} implementations.
  * This base class contains default implementations of the
@@ -202,7 +201,7 @@ public abstract class AbstractNodeState 
     }
 
     /**
-     * Compares the properties of <code>base</code> state with <code>this</code>
+     * Compares the properties of {@code base} state with {@code this}
      * state.
      *
      * @param base the base node state.

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RebaseDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RebaseDiff.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RebaseDiff.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/RebaseDiff.java
Mon Apr  1 14:39:22 2013
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.mk.api.Micr
 import org.apache.jackrabbit.oak.api.PropertyState;
 
 /**
- * <code>RebaseDiff</code> implements a {@link NodeStateDiff}, which performs
+ * {@code RebaseDiff} implements a {@link NodeStateDiff}, which performs
  * the conflict handling as defined in {@link MicroKernel#rebase(String, String)}
  * on the Oak SPI state level.
  * <p/>
@@ -34,10 +34,10 @@ import org.apache.jackrabbit.oak.api.Pro
  *     + base
  *     |
  * </pre>
- * The current state on the master branch is <code>head</code> and a branch
- * was created at <code>base</code>. The current state on the branch is
- * <code>branch</code>. Re-basing <code>branch</code> to the current
- * <code>head</code> works as follows:
+ * The current state on the master branch is {@code head} and a branch
+ * was created at {@code base}. The current state on the branch is
+ * {@code branch}. Re-basing {@code branch} to the current
+ * {@code head} works as follows:
  * <pre>
  *     NodeState head = ...
  *     NodeState branch = ...

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedItemImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedItemImporter.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedItemImporter.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/ProtectedItemImporter.java
Mon Apr  1 14:39:22 2013
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.namepat
 /**
  * Base interface for {@link ProtectedNodeImporter} and {@link ProtectedPropertyImporter}.
  */
-public abstract interface ProtectedItemImporter {
+public interface ProtectedItemImporter {
 
     /**
      * Initializes the importer.

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java?rev=1463152&r1=1463151&r2=1463152&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionDelegate.java
Mon Apr  1 14:39:22 2013
@@ -16,14 +16,14 @@
  */
 package org.apache.jackrabbit.oak.jcr.delegate;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import javax.annotation.Nonnull;
 
 import org.apache.jackrabbit.oak.api.Tree;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
- * <code>VersionDelegate</code>...
+ * {@code VersionDelegate}...
  */
 public class VersionDelegate extends NodeDelegate {
 



Mime
View raw message