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 mr...@apache.org on 2015/09/09 11:41:45 UTC

svn commit: r1701959 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java

Author: mreutegg
Date: Wed Sep  9 09:41:45 2015
New Revision: 1701959

URL: http://svn.apache.org/r1701959
Log:
OAK-98 Source code formatting, code conventions, Javadocs

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1701959&r1=1701958&r2=1701959&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Wed Sep  9 09:41:45 2015
@@ -252,7 +252,7 @@ public final class NodeDocument extends
      * into multiple types depending on the content i.e. weather it contains
      * REVISIONS, COMMIT_ROOT, property history etc
      */
-    public static enum SplitDocType {
+    public enum SplitDocType {
         /**
          * Not a split document
          */
@@ -298,7 +298,7 @@ public final class NodeDocument extends
 
         final int type;
 
-        private SplitDocType(int type){
+        SplitDocType(int type){
             this.type = type;
         }
 
@@ -483,10 +483,7 @@ public final class NodeDocument extends
 
     public boolean hasBinary() {
         Number flag = (Number) get(HAS_BINARY_FLAG);
-        if(flag == null){
-            return false;
-        }
-        return flag.intValue() == HAS_BINARY_VAL;
+        return flag != null && flag.intValue() == HAS_BINARY_VAL;
     }
 
     /**
@@ -1894,8 +1891,8 @@ public final class NodeDocument extends
     }
     
     @SuppressWarnings("unchecked")
-    private static void toJson(JsopWriter json, Map<? extends Object, Object> map) {
-        for (Entry<? extends Object, Object>e : map.entrySet()) {
+    private static void toJson(JsopWriter json, Map<?, Object> map) {
+        for (Entry<?, Object>e : map.entrySet()) {
             json.key(e.getKey().toString());
             Object value = e.getValue();
             if (value == null) {