Merge pull request #224 from BobHanson/hanson1

BobHanson · web-flow · commit 8429329f6250 · 2021-07-28T17:24:58.000-05:00
StreamToBytes and StreamToString moved to javajs.util.reader
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20210728170251 
+20210728172208 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20210728170251 
+20210728172208 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/Rdr.java b/sources/net.sf.j2s.java.core/src/javajs/util/Rdr.java
@@ -90,9 +90,32 @@ public String readNextLine() throws Exception {
     return reader.readLine();
   }
 
-  public static Map<String, Object> readCifData(GenericCifDataParser parser, BufferedReader br) {
-    return parser.set(null, br, false).getAllCifData();
-  }
+	/**
+	 * Read an InputStream in its entirety as a byte array, closing the stream.
+	 * 
+	 * @param is
+	 * @return a byte array
+	 */
+	public static byte[] streamToBytes(InputStream is) throws IOException {
+		byte[] bytes = getLimitedStreamBytes(is, -1);
+		is.close();
+		return bytes;
+	}
+
+	/**
+	 * Read an InputStream in its entirety as a string, closing the stream.
+	 * 
+	 * @param is
+	 * @return a String
+	 * @throws IOException
+	 */
+	public static String streamToString(InputStream is) throws IOException {
+		return new String(streamToBytes(is));
+	}
+
+	public static Map<String, Object> readCifData(GenericCifDataParser parser, BufferedReader br) {
+		return parser.set(null, br, false).getAllCifData();
+	}
 
   ///////////
 
@@ -327,7 +350,7 @@ public static BufferedReader getBR(String string) {
 
   public static BufferedInputStream toBIS(Object o) {
     return (AU.isAB(o) ? getBIS((byte[]) o)
-        : o instanceof SB ? getBIS(Rdr.getBytesFromSB((SB) o))
+        : o instanceof SB ? getBIS(getBytesFromSB((SB) o))
             : o instanceof String ? getBIS(((String) o).getBytes()) : null);
   }
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -207,7 +207,7 @@ private static Object getFileContents(Object uriOrJSFile, boolean asBytes, JSFun
 				try {
 					URL url = new URL(uri);
 					BufferedInputStream stream = (BufferedInputStream) url.getContent();
-					return (asBytes ? streamToBytes(stream) : streamToString(stream));
+					return (asBytes ? Rdr.streamToBytes(stream) : Rdr.streamToString(stream));
 				} catch (Exception e) {
 				}
 			}
@@ -253,7 +253,7 @@ static String ensureString(Object data) {
 			return data.toString();
 		if (data instanceof InputStream)
 			try {
-				return streamToString((InputStream) data);
+				return Rdr.streamToString((InputStream) data);
 			} catch (IOException e) {
 			}
 		return null;
@@ -1270,29 +1270,6 @@ public String getJ2SPath() {
 		return (String) getAppletAttribute("_j2sFullPath");
 	}
 
-	/**
-	 * Read an InputStream in its entirety as a string, closing the stream.
-	 * 
-	 * @param is 
-	 * @return a String
-	 * @throws IOException
-	 */
-	public static String streamToString(InputStream is) throws IOException {
-		return new String(streamToBytes(is));
-	}
-
-	/**
-	 * Read an InputStream in its entirety as a byte array. Closes the stream.
-	 * 
-	 * @param is 
-	 * @return a byte array
-	 */
-	public static byte[] streamToBytes(InputStream is) throws IOException {
-			byte[] bytes = Rdr.getLimitedStreamBytes(is, -1);
-			is.close();
-			return bytes;
-	}
-
 	
 
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBClass.java b/sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBClass.java
@@ -12,7 +12,7 @@
 import javax.xml.namespace.QName;
 
 import javajs.util.PT;
-import swingjs.JSUtil;
+import javajs.util.Rdr;
 import swingjs.api.Interface;
 
 class JSJAXBClass implements Cloneable {
@@ -113,7 +113,7 @@ private static void getPackageInfo(Class<?> javaClass) {
 			if (is != null) {
 				String data;
 				try {
-					data = JSUtil.streamToString(is);
+					data = Rdr.streamToString(is);
 					packageAccessorType = parseAccessorType(data);
 					data = PT.getQuotedAttribute(data, "namespace");
 					if (data != null)
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/xml/JSSAXParser.java b/sources/net.sf.j2s.java.core/src/swingjs/xml/JSSAXParser.java
@@ -104,7 +104,7 @@ public void parse(InputSource source, DefaultHandler handler) throws SAXExceptio
 	private String getString(InputSource source) throws IOException {
 		Reader rdr = source.getCharacterStream();
 		if (rdr == null) {
-			return Rdr.fixUTF(JSUtil.streamToBytes(source.getByteStream()));
+			return Rdr.fixUTF(Rdr.streamToBytes(source.getByteStream()));
 		}
 		if (!(rdr instanceof BufferedReader))
 			rdr = new BufferedReader(rdr);
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_JSON.java b/sources/net.sf.j2s.java.core/src/test/Test_JSON.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javajs.util.Rdr;
 import swingjs.JSUtil;
 
 public class Test_JSON extends Test_ {
@@ -43,7 +44,7 @@ public static void main(String[] args) {
 			 *            data = data["1cbs"][0].title;
 			 */
 			if (data instanceof InputStream) {
-				data = JSUtil.streamToString((InputStream) data);
+				data = Rdr.streamToString((InputStream) data);
 			}
 			System.out.println(data);
 
@@ -52,7 +53,7 @@ public static void main(String[] args) {
 			JSUtil.setAjax(url);
 		    HttpURLConnection connection = (HttpURLConnection) url.openConnection();		    
 		    data = connection.getInputStream();
-			data = JSUtil.streamToString((InputStream) data);
+			data = Rdr.streamToString((InputStream) data);
 			System.out.println(data);
 		    
 		
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_URL.java b/sources/net.sf.j2s.java.core/src/test/Test_URL.java
@@ -157,7 +157,7 @@ public static void main(String[] args) {
 			connection.setReadTimeout(10000);
 
 			InputStream is = url.openStream();
-			String s = JSUtil.streamToString(is);
+			String s = Rdr.streamToString(is);
 			is.close();
 			System.out.println(s);
 			assert (s.equals("{\"ping\":1}\n"));

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public void parse(InputSource source, DefaultHandler handler) throws SAXExceptio`
`104`	`104`	`private String getString(InputSource source) throws IOException {`
`105`	`105`	`Reader rdr = source.getCharacterStream();`
`106`	`106`	`if (rdr == null) {`
`107`		`- return Rdr.fixUTF(JSUtil.streamToBytes(source.getByteStream()));`
	`107`	`+ return Rdr.fixUTF(Rdr.streamToBytes(source.getByteStream()));`
`108`	`108`	`}`
`109`	`109`	`if (!(rdr instanceof BufferedReader))`
`110`	`110`	`rdr = new BufferedReader(rdr);`