jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1133792 - in /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk: MicroKernelImpl.java json/DiffParser.java json/JsonBuilder.java
Date Thu, 09 Jun 2011 11:22:42 GMT
Author: thomasm
Date: Thu Jun  9 11:22:42 2011
New Revision: 1133792

URL: http://svn.apache.org/viewvc?rev=1133792&view=rev
Log:
Fix double quoting.

Modified:
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/DiffParser.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsonBuilder.java

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java?rev=1133792&r1=1133791&r2=1133792&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelImpl.java
Thu Jun  9 11:22:42 2011
@@ -408,7 +408,7 @@ public class MicroKernelImpl implements 
             builder.value(":name", name);
         }
         for (Map.Entry<String, String> prop : node.getProperties().entrySet()) {
-            builder.value(prop.getKey(), prop.getValue());
+            builder.valueEncoded(prop.getKey(), prop.getValue());
         }
 
         long childCount = node.getChildNodeCount();

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/DiffParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/DiffParser.java?rev=1133792&r1=1133791&r2=1133792&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/DiffParser.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/DiffParser.java
Thu Jun  9 11:22:42 2011
@@ -22,7 +22,6 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import org.apache.jackrabbit.mk.mem.JsopTokenizer;
 
 /** <code>DiffParser</code>...
  *

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsonBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsonBuilder.java?rev=1133792&r1=1133791&r2=1133792&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsonBuilder.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsonBuilder.java
Thu Jun  9 11:22:42 2011
@@ -20,14 +20,13 @@
 package org.apache.jackrabbit.mk.json;
 
 import java.io.IOException;
-import java.io.Writer;
 
 /**
  * Partially based on json-simple
  * Limitation: arrays can only have primitive members (i.e. no arrays nor objects)
  */
 public final class JsonBuilder {
-    private final Appendable writer;
+    final Appendable writer;
 
     private JsonBuilder(Appendable writer) {
         this.writer = writer;
@@ -46,12 +45,17 @@ public final class JsonBuilder {
             this.parent = parent;
             writer.append('{');
         }
-        
+
         public JsonObjectBuilder value(String key, String value) throws IOException {
             write(key, encode(value));
             return this;
         }
 
+        public JsonObjectBuilder valueEncoded(String key, String value) throws IOException
{
+            write(key, value);
+            return this;
+        }
+
         public JsonObjectBuilder value(String key, int value) throws IOException {
             write(key, encode(value));
             return this;



Mime
View raw message