j2sApplet default file save as application/octet-stream, not text/plain

BobHanson · BobHanson · commit bb055043ba6d · 2021-09-22T05:32:47.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20210907013612 
+20210921142110 
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 @@
-20210907013612 
+20210921142110 
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/java/awt/image/BufferedImage.java b/sources/net.sf.j2s.java.core/src/java/awt/image/BufferedImage.java
@@ -913,6 +913,7 @@ public ColorModel getColorModel() {
 	 * @return the <code>WriteableRaster</code> of this <code>BufferedImage</code> .
 	 */
 	public WritableRaster getRaster() {
+		// ok, but raster.getDataBuffer().getData() is going to require a flush();
 		return raster;
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/javajs/async/Assets.java b/sources/net.sf.j2s.java.core/src/javajs/async/Assets.java
@@ -406,12 +406,11 @@ private static InputStream getAssetStream(String path, boolean zipOnly) {
 		if (url == null && !zipOnly) {
 			url = Assets.class.getClassLoader().getResource(path);
 		}
-		InputStream is = null;
 		try {
-			is = url.openStream();
+			return (url == null ? null : url.openStream());
 		} catch (Throwable t) {
 		}
-		return is;
+		return null;
 	}
 	/**
 	 * Determine the path to an asset. If not found in a zip file asset, return the
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/HTML5Video.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/HTML5Video.java
@@ -253,14 +253,15 @@ public Void apply(Object jsevent) {
 	 * Remove action listener
 	 * 
 	 * @param jsvideo   the HTML5 video element
-	 * @param listeners an array of event/listener pairs created by
+	 * @param listeners an array of event/listener epairs created by
 	 *                  addActionListener
 	 */
 	public static void removeActionListener(HTML5Video jsvideo, Object[] listeners) {
 		if (listeners == null) {
 			for (int i = 0; i < eventTypes.length; i++) {
 				jsvideo.removeEventListener(eventTypes[i]);
 			}
+			return;
 		}
 		
 		for (int i = 0; i < listeners.length; i += 2) {
diff --git a/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java b/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java
@@ -57,6 +57,8 @@
  */
 public class JalviewJSTest extends JPanel implements MenuListener, ItemListener {
 
+	// TODO:
+	// removeall and then restart 
 	public static final int SHIFT_DOWN_MASK;
 	public static final int ALT_DOWN_MASK;
 	public static final int SHORTCUT_MASK;
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -1,5 +1,6 @@
 // j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu
 
+// BH 2021.09.22 default file save as application/octet-stream, not text/plain
 // BH 2020.12.31 full 64-bit long
 // BH 2020.12.09 touch fixes for fdown and fdrag (j2sSlider)
 // BH 2020.12.03 note that relay is disabled using J2S.addDirectDatabaseCall(".")
@@ -1267,7 +1268,7 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
 			// Asynchronous output generated using an anchor tag
 			var a = document.createElement("a");
 			a.href = "data:" + mimetype + ";base64," + data;
-			a.type = mimetype || (mimetype = "text/plain;charset=utf-8");
+			a.type = mimetype || (mimetype = "application/octet-stream");//was "text/plain;charset=utf-8");
 			a.download = filename;
 			a.target = "_blank";
 			$("body").append(a);
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -2390,7 +2390,7 @@ _Loader.setClasspathFor = function(clazzes) {
   if (!(clazzes instanceof Array))
     clazzes = [clazzes];
     for (var i = clazzes.length; --i >= 0;) {
-      path = clazzes[i];
+      var path = clazzes[i];
       var jar = _Loader.getJ2SLibBase() + path.split(".")[0]+".js";
       path = path.replace(/\//g,".");
       classpathMap["#" + path] = jar;
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -10671,6 +10671,7 @@ return jQuery;
 })(jQuery,document,"click mousemove mouseup touchmove touchend", "outjsmol");
 // j2sApplet.js BH = Bob Hanson hansonr@stolaf.edu
 
+// BH 2021.09.22 default file save as application/octet-stream, not text/plain
 // BH 2020.12.31 full 64-bit long
 // BH 2020.12.09 touch fixes for fdown and fdrag (j2sSlider)
 // BH 2020.12.03 note that relay is disabled using J2S.addDirectDatabaseCall(".")
@@ -11938,7 +11939,7 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
 			// Asynchronous output generated using an anchor tag
 			var a = document.createElement("a");
 			a.href = "data:" + mimetype + ";base64," + data;
-			a.type = mimetype || (mimetype = "text/plain;charset=utf-8");
+			a.type = mimetype || (mimetype = "application/octet-stream");//was "text/plain;charset=utf-8");
 			a.download = filename;
 			a.target = "_blank";
 			$("body").append(a);
@@ -16405,7 +16406,7 @@ _Loader.setClasspathFor = function(clazzes) {
   if (!(clazzes instanceof Array))
     clazzes = [clazzes];
     for (var i = clazzes.length; --i >= 0;) {
-      path = clazzes[i];
+      var path = clazzes[i];
       var jar = _Loader.getJ2SLibBase() + path.split(".")[0]+".js";
       path = path.replace(/\//g,".");
       classpathMap["#" + path] = jar;

Original file line number	Diff line number	Diff line change
`@@ -913,6 +913,7 @@ public ColorModel getColorModel() {`
`913`	`913`	`* @return the <code>WriteableRaster</code> of this <code>BufferedImage</code> .`
`914`	`914`	`*/`
`915`	`915`	`public WritableRaster getRaster() {`
	`916`	`+ // ok, but raster.getDataBuffer().getData() is going to require a flush();`
`916`	`917`	`return raster;`
`917`	`918`	`}`
`918`	`919`
Original file line number	Diff line number	Diff line change
`@@ -406,12 +406,11 @@ private static InputStream getAssetStream(String path, boolean zipOnly) {`
`406`	`406`	`if (url == null && !zipOnly) {`
`407`	`407`	`url = Assets.class.getClassLoader().getResource(path);`
`408`	`408`	`}`
`409`		`- InputStream is = null;`
`410`	`409`	`try {`
`411`		`- is = url.openStream();`
	`410`	`+ return (url == null ? null : url.openStream());`
`412`	`411`	`} catch (Throwable t) {`
`413`	`412`	`}`
`414`		`- return is;`
	`413`	`+ return null;`
`415`	`414`	`}`
`416`	`415`	`/**`
`417`	`416`	`* Determine the path to an asset. If not found in a zip file asset, return the`
Original file line number	Diff line number	Diff line change
`@@ -253,14 +253,15 @@ public Void apply(Object jsevent) {`
`253`	`253`	`* Remove action listener`
`254`	`254`	`*`
`255`	`255`	`* @param jsvideo the HTML5 video element`
`256`		`- * @param listeners an array of event/listener pairs created by`
	`256`	`+ * @param listeners an array of event/listener epairs created by`
`257`	`257`	`* addActionListener`
`258`	`258`	`*/`
`259`	`259`	`public static void removeActionListener(HTML5Video jsvideo, Object[] listeners) {`
`260`	`260`	`if (listeners == null) {`
`261`	`261`	`for (int i = 0; i < eventTypes.length; i++) {`
`262`	`262`	`jsvideo.removeEventListener(eventTypes[i]);`
`263`	`263`	`}`
	`264`	`+ return;`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`for (int i = 0; i < listeners.length; i += 2) {`