jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1330813 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk: index/ simple/ wrapper/
Date Thu, 26 Apr 2012 12:38:21 GMT
Author: thomasm
Date: Thu Apr 26 12:38:20 2012
New Revision: 1330813

URL: http://svn.apache.org/viewvc?rev=1330813&view=rev
Log:
OAK-73 JsopReader and JsopWriter lack javadocs (move token types to JsopReader)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java?rev=1330813&r1=1330812&r2=1330813&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java
Thu Apr 26 12:38:20 2012
@@ -111,7 +111,7 @@ public class IndexWrapper extends MicroK
         JsopReader t = jsonDiff;
         while (true) {
             int r = t.read();
-            if (r == JsopTokenizer.END) {
+            if (r == JsopReader.END) {
                 break;
             }
             String path;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java?rev=1330813&r1=1330812&r2=1330813&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PrefixIndex.java
Thu Apr 26 12:38:20 2012
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.mk.index;
 
 import java.util.Iterator;
+import org.apache.jackrabbit.mk.json.JsopReader;
 import org.apache.jackrabbit.mk.json.JsopTokenizer;
 import org.apache.jackrabbit.mk.simple.NodeImpl;
 
@@ -63,7 +64,7 @@ public class PrefixIndex implements Inde
     public void addOrRemoveProperty(String nodePath, String propertyName,
             String value, boolean add) {
         JsopTokenizer t = new JsopTokenizer(value);
-        if (t.matches(JsopTokenizer.STRING)) {
+        if (t.matches(JsopReader.STRING)) {
             String v = t.getToken();
             if (v.startsWith(prefix)) {
                 addOrRemove(nodePath, propertyName, v, add);
@@ -71,18 +72,18 @@ public class PrefixIndex implements Inde
         } else if (t.matches('[')) {
             if (!t.matches(']')) {
                 do {
-                    if (t.matches(JsopTokenizer.STRING)) {
+                    if (t.matches(JsopReader.STRING)) {
                         String v = t.getToken();
                         if (v.startsWith(prefix)) {
                             addOrRemove(nodePath, propertyName, v, add);
                         }
-                    } else if (t.matches(JsopTokenizer.FALSE)) {
+                    } else if (t.matches(JsopReader.FALSE)) {
                         // ignore
-                    } else if (t.matches(JsopTokenizer.TRUE)) {
+                    } else if (t.matches(JsopReader.TRUE)) {
                         // ignore
-                    } else if (t.matches(JsopTokenizer.NULL)) {
+                    } else if (t.matches(JsopReader.NULL)) {
                         // ignore
-                    } else if (t.matches(JsopTokenizer.NUMBER)) {
+                    } else if (t.matches(JsopReader.NUMBER)) {
                         // ignore
                     }
                 } while (t.matches(','));

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java?rev=1330813&r1=1330812&r2=1330813&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/PropertyIndex.java
Thu Apr 26 12:38:20 2012
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.mk.index;
 
 import java.util.Iterator;
+import org.apache.jackrabbit.mk.json.JsopReader;
 import org.apache.jackrabbit.mk.json.JsopTokenizer;
 import org.apache.jackrabbit.mk.simple.NodeImpl;
 
@@ -75,7 +76,7 @@ public class PropertyIndex implements In
 
     private void addOrRemoveRaw(String nodePath, String value, boolean add) {
         JsopTokenizer t = new JsopTokenizer(value);
-        if (t.matches(JsopTokenizer.STRING) || t.matches(JsopTokenizer.NUMBER)) {
+        if (t.matches(JsopReader.STRING) || t.matches(JsopReader.NUMBER)) {
             String v = t.getToken();
             addOrRemove(nodePath, v, add);
         }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java?rev=1330813&r1=1330812&r2=1330813&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
Thu Apr 26 12:38:20 2012
@@ -152,7 +152,7 @@ public class SimpleKernelImpl extends Mi
         JsopWriter diff = new JsopStream();
         while (true) {
             int r = t.read();
-            if (r == JsopTokenizer.END) {
+            if (r == JsopReader.END) {
                 break;
             }
             String path = PathUtils.concat(rootPath, t.readString());
@@ -188,7 +188,7 @@ public class SimpleKernelImpl extends Mi
                 t.read(':');
                 boolean isConfigChange = from.startsWith(":root/head/config/");
                 String value;
-                if (t.matches(JsopTokenizer.NULL)) {
+                if (t.matches(JsopReader.NULL)) {
                     value = null;
                     diff.tag('^').key(path).value(null);
                 } else {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java?rev=1330813&r1=1330812&r2=1330813&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
Thu Apr 26 12:38:20 2012
@@ -168,7 +168,7 @@ public class SecurityWrapper extends Mic
     private void verifyDiff(JsopReader t, String revisionId, String rootPath, JsopWriter
diff) {
         while (true) {
             int r = t.read();
-            if (r == JsopTokenizer.END) {
+            if (r == JsopReader.END) {
                 break;
             }
             String path;
@@ -209,7 +209,7 @@ public class SecurityWrapper extends Mic
             case '^':
                 t.read(':');
                 String value;
-                if (t.matches(JsopTokenizer.NULL)) {
+                if (t.matches(JsopReader.NULL)) {
                     if (checkDiff(path, diff)) {
                         if (checkPropertyRights(path)) {
                             diff.tag('^').key(path).value(null);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java?rev=1330813&r1=1330812&r2=1330813&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
Thu Apr 26 12:38:20 2012
@@ -109,7 +109,7 @@ public class VirtualRepositoryWrapper ex
     public String commitStream(String rootPath, JsopReader t, String revisionId, String message)
{
         while (true) {
             int r = t.read();
-            if (r == JsopTokenizer.END) {
+            if (r == JsopReader.END) {
                 break;
             }
             String path = PathUtils.relativize("/", PathUtils.concat(rootPath, t.readString()));
@@ -139,7 +139,7 @@ public class VirtualRepositoryWrapper ex
             case '^':
                 t.read(':');
                 String value;
-                if (t.matches(JsopTokenizer.NULL)) {
+                if (t.matches(JsopReader.NULL)) {
                     JsopWriter diff = new JsopBuilder();
                     diff.tag('^').key(path).value(null);
                     buffer(path, diff);



Mime
View raw message