Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for Issue 178.

Browse Source
This commit is contained in:
Joel Leitch 2010-08-21 06:50:52 +00:00
parent 3fc4bcc061
commit 5bffa1f679
3 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gson/src/main/java/com/google/gson/JsonCompactFormatter.java
View File

@ -90,7 +90,7 @@ final class JsonCompactFormatter implements JsonFormatter {
writer.append(','); writer.append(',');
} }
writer.append('"'); writer.append('"');
writer.append(memberName); writer.append(escaper.escapeJsonString(memberName));
writer.append("\":"); writer.append("\":");
member.toString(writer, escaper); member.toString(writer, escaper);
} }
@ -101,7 +101,7 @@ final class JsonCompactFormatter implements JsonFormatter {
writer.append(','); writer.append(',');
} }
writer.append('"'); writer.append('"');
writer.append(memberName); writer.append(escaper.escapeJsonString(memberName));
writer.append("\":"); writer.append("\":");
} }
@ -111,7 +111,7 @@ final class JsonCompactFormatter implements JsonFormatter {
writer.append(','); writer.append(',');
} }
writer.append('"'); writer.append('"');
writer.append(memberName); writer.append(escaper.escapeJsonString(memberName));
writer.append("\":"); writer.append("\":");
} }

3
gson/src/main/java/com/google/gson/JsonObject.java
View File

@ -53,7 +53,6 @@ public final class JsonObject extends JsonElement {
*/ */
public void add(String property, JsonElement value) { public void add(String property, JsonElement value) {
Preconditions.checkArgument(property != null && !"".equals(property.trim())); Preconditions.checkArgument(property != null && !"".equals(property.trim()));
if (value == null) { if (value == null) {
value = JsonNull.createJsonNull(); value = JsonNull.createJsonNull();
} }
@ -205,7 +204,7 @@ public final class JsonObject extends JsonElement {
sb.append(','); sb.append(',');
} }
sb.append('\"'); sb.append('\"');
sb.append(entry.getKey()); sb.append(escaper.escapeJsonString(entry.getKey()));
sb.append("\":"); sb.append("\":");
entry.getValue().toString(sb, escaper); entry.getValue().toString(sb, escaper);
} }

6
gson/src/main/java/com/google/gson/JsonPrintFormatter.java
View File

@ -192,7 +192,7 @@ final class JsonPrintFormatter implements JsonFormatter {
public void visitObjectMember(JsonObject parent, String memberName, JsonPrimitive member, public void visitObjectMember(JsonObject parent, String memberName, JsonPrimitive member,
boolean isFirst) throws IOException { boolean isFirst) throws IOException {
addCommaCheckingFirst(isFirst); addCommaCheckingFirst(isFirst);
writer.key(memberName); writer.key(escaper.escapeJsonString(memberName));
writer.fieldSeparator(); writer.fieldSeparator();
writer.value(escapeJsonPrimitive(member)); writer.value(escapeJsonPrimitive(member));
} }
@ -200,14 +200,14 @@ final class JsonPrintFormatter implements JsonFormatter {
public void visitObjectMember(JsonObject parent, String memberName, JsonArray member, public void visitObjectMember(JsonObject parent, String memberName, JsonArray member,
boolean isFirst) throws IOException { boolean isFirst) throws IOException {
addCommaCheckingFirst(isFirst); addCommaCheckingFirst(isFirst);
writer.key(memberName); writer.key(escaper.escapeJsonString(memberName));
writer.fieldSeparator(); writer.fieldSeparator();
} }
public void visitObjectMember(JsonObject parent, String memberName, JsonObject member, public void visitObjectMember(JsonObject parent, String memberName, JsonObject member,
boolean isFirst) throws IOException { boolean isFirst) throws IOException {
addCommaCheckingFirst(isFirst); addCommaCheckingFirst(isFirst);
writer.key(memberName); writer.key(escaper.escapeJsonString(memberName));
writer.fieldSeparator(); writer.fieldSeparator();
} }