json fixes

hansonr · hansonr · commit 87fd2f0dc252 · 2019-04-04T16:44:47.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/json/JSON.java b/sources/net.sf.j2s.java.core/src/swingjs/json/JSON.java
@@ -82,14 +82,18 @@ public static BufferedReader getJSONReader(InputStream is) {
 		return new JSONReader(is);
 	}
 
+	@SuppressWarnings("resource")
 	public static Object parse(Object o) {
 		if (o instanceof String)
 			return parse((String) o);
 		if (o instanceof InputStream)
 			return parse((InputStream) o);
 		if (o instanceof Reader)
 			return parse((Reader) o);
-		return null;
+		if (o instanceof URL) {
+			return parse((URL) o);
+		}
+		return new JSONReader(o).data;
 	}
 
 	@SuppressWarnings("resource")
@@ -109,6 +113,17 @@ public static Object parse(Reader br) {
 		return parse(is);
 	}
 
+	@SuppressWarnings("resource")
+	public static Object parse(URL url) {
+		JSUtil.setAjax(url);
+		try {
+			return new JSONReader(JSUtil.parseJSON((InputStream) url.getContent())).data;
+		} catch (IOException e) {
+			return null;
+		}
+	}
+		
+			
 	/**
 	 * Get an object in the JSON associative array.
 	 * 
@@ -169,7 +184,7 @@ public static class JSONReader extends BufferedReader {
 		public JSONReader(InputStream in) {
 			super((Reader) (Object) "");
 			// could be buffered
-			data = toObject(/** @j2sNative $in._ajaxData || $in.$in && $in.$in._ajaxData || */
+			data = toObject(/** @j2sNative $in._jsonData || $in.$in && $in.$in._jsonData || */
 					null);
 			if (data == null) {
 				String json = (/** @j2sNative $in.str || $in.$in && $in.$in.str || */null);
@@ -180,7 +195,7 @@ public JSONReader(InputStream in) {
 		public JSONReader(Reader in) {
 			super(in);
 			// could be buffered
-			data = toObject(/** @j2sNative $in._ajaxData || $in.$in && $in.$in._ajaxData || */
+			data = toObject(/** @j2sNative $in._jsonData || $in.$in && $in.$in._jsonData || */
 					null);
 		}
 
@@ -189,12 +204,17 @@ public JSONReader(String json) {
 			data = toObject(JSUtil.parseJSONRaw(json));
 		}
 
+		public JSONReader(Object jsObject) {
+			super((Reader) (Object) "");
+			data = toObject(jsObject);
+		}
+
 		@Override
 		public void close() {
 			data = null;
 			try {
 				super.close();
-			} catch (IOException e) {
+			} catch (Throwable e) {
 				// ignore, especially if we set $in to a string!
 			}
 		}
