X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosJson.java;fp=altoslib%2FAltosJson.java;h=52c9b41e6d7d81f8dcd5d804eacad421568d3098;hp=9191be68004d6297d4fea25ae61747669478816c;hb=c8dbcaf69cd538a31ab6e2b568237ae7c8656a9a;hpb=0cbfa444a9f9159cb509bb47ca5590fc1d709f64

diff --git a/altoslib/AltosJson.java b/altoslib/AltosJson.java
index 9191be68..52c9b41e 100644
--- a/altoslib/AltosJson.java
+++ b/altoslib/AltosJson.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
@@ -255,7 +255,7 @@ class JsonToken {
  * Lexer for json
  */
 class JsonLexer extends JsonUtil {
-	Reader			f;
+	InputStream		f;
 	int			line;
 	int			ungot = -2;
 	StringBuffer		pending_token;
@@ -445,12 +445,12 @@ class JsonLexer extends JsonUtil {
 	}
 
 	JsonLexer(String s) {
-		f = new StringReader(s);
+		f = new AltosStringInputStream(s);
 		line = 1;
 		token = null;
 	}
 
-	JsonLexer(Reader f) {
+	JsonLexer(InputStream f) {
 		this.f = f;
 		line = 1;
 		token = null;
@@ -570,7 +570,7 @@ class JsonParse {
 		lexer = new JsonLexer(s);
 	}
 
-	JsonParse(Reader f) {
+	JsonParse(InputStream f) {
 		lexer = new JsonLexer(f);
 	}
 }
@@ -670,7 +670,7 @@ public class AltosJson extends JsonUtil {
 		}
 	}
 
-	public static AltosJson fromReader(Reader f) {
+	public static AltosJson fromInputStream(InputStream f) {
 		JsonParse	parse = new JsonParse(f);
 		try {
 			return parse.parse();