From e7bfd0c97d2196047bad996b6625d3bb197aae13 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Sun, 26 Aug 2012 19:34:46 +0000 Subject: [PATCH] Promote JsonReader2 to be the main JsonReader implementation. --- .../gson/stream/{JsonReader2.java => JsonReader.java} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename gson/src/main/java/com/google/gson/stream/{JsonReader2.java => JsonReader.java} (99%) diff --git a/gson/src/main/java/com/google/gson/stream/JsonReader2.java b/gson/src/main/java/com/google/gson/stream/JsonReader.java similarity index 99% rename from gson/src/main/java/com/google/gson/stream/JsonReader2.java rename to gson/src/main/java/com/google/gson/stream/JsonReader.java index 1607d084..48ba6521 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonReader2.java +++ b/gson/src/main/java/com/google/gson/stream/JsonReader.java @@ -187,7 +187,7 @@ import java.io.Reader; * @author Jesse Wilson * @since 1.6 */ -public class JsonReader2 implements Closeable { +public class JsonReader implements Closeable { /** The only non-execute prefix this parser permits */ private static final char[] NON_EXECUTE_PREFIX = ")]}'\n".toCharArray(); @@ -257,7 +257,7 @@ public class JsonReader2 implements Closeable { /** * Creates a new instance that reads a JSON-encoded stream from {@code in}. */ - public JsonReader2(Reader in) { + public JsonReader(Reader in) { if (in == null) { throw new NullPointerException("in == null"); } @@ -1442,7 +1442,7 @@ public class JsonReader2 implements Closeable { pos += NON_EXECUTE_PREFIX.length; } - /*static { + static { JsonReaderInternalAccess.INSTANCE = new JsonReaderInternalAccess() { @Override public void promoteNameToValue(JsonReader reader) throws IOException { if (reader instanceof JsonTreeReader) { @@ -1465,5 +1465,5 @@ public class JsonReader2 implements Closeable { } } }; - }*/ + } }