From 202bbfeef0a7829ddac75f28b8077e2f1534c461 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 2 Sep 2010 09:29:26 +0000 Subject: [PATCH] Fixing the Java 1.5 build. --- gson/src/main/java/com/google/gson/stream/JsonReader.java | 4 ++-- gson/src/main/java/com/google/gson/stream/JsonWriter.java | 2 +- gson/src/test/java/com/google/gson/stream/JsonWriterTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gson/src/main/java/com/google/gson/stream/JsonReader.java b/gson/src/main/java/com/google/gson/stream/JsonReader.java index 0f626b3b..ab11f26a 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonReader.java +++ b/gson/src/main/java/com/google/gson/stream/JsonReader.java @@ -748,7 +748,7 @@ public final class JsonReader implements Closeable { checkLenient(); pos--; name = nextLiteral(); - if (name.isEmpty()) { + if (name.length() == 0) { throw syntaxError("Expected name"); } } @@ -1071,7 +1071,7 @@ public final class JsonReader implements Closeable { */ private JsonToken readLiteral() throws IOException { String literal = nextLiteral(); - if (literal.isEmpty()) { + if (literal.length() == 0) { throw syntaxError("Expected literal value"); } value = literal; diff --git a/gson/src/main/java/com/google/gson/stream/JsonWriter.java b/gson/src/main/java/com/google/gson/stream/JsonWriter.java index 3c773119..bace4399 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonWriter.java +++ b/gson/src/main/java/com/google/gson/stream/JsonWriter.java @@ -165,7 +165,7 @@ public final class JsonWriter implements Closeable { * @param indent a string containing only whitespace. */ public void setIndent(String indent) { - if (indent.isEmpty()) { + if (indent.length() == 0) { this.indent = null; this.separator = ":"; } else { diff --git a/gson/src/test/java/com/google/gson/stream/JsonWriterTest.java b/gson/src/test/java/com/google/gson/stream/JsonWriterTest.java index 490a3853..3b60b184 100644 --- a/gson/src/test/java/com/google/gson/stream/JsonWriterTest.java +++ b/gson/src/test/java/com/google/gson/stream/JsonWriterTest.java @@ -178,7 +178,7 @@ public final class JsonWriterTest extends TestCase { jsonWriter.value(Double.MIN_VALUE); jsonWriter.value(0.0); jsonWriter.value(-0.5); - jsonWriter.value(Double.MIN_NORMAL); + jsonWriter.value(2.2250738585072014E-308); jsonWriter.value(Math.PI); jsonWriter.value(Math.E); jsonWriter.endArray();