j2sheadless should fire System.exit(0) after running main.

hansonr · hansonr · commit fb0d2866604e · 2019-10-19T08:45:13.000-05:00
moving TimerQueue to ThreadGroup
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -46,7 +46,6 @@
 import javax.swing.plaf.FontUIResource;
 import javax.swing.plaf.UIResource;
 
-import swingjs.JSAppletThread;
 import swingjs.JSAppletViewer;
 import swingjs.JSFrameViewer;
 import swingjs.JSGraphics2D;
@@ -115,7 +114,7 @@ public interface A2SWrappedComponent {
 	public JSGraphics2D 秘gtemp; // indicates that we are painting, so that g.setBackground() should also be set 
 
 	public boolean 秘isRootPane, 秘isContentPane;
-	public JSAppletViewer 秘appletViewer = ((JSAppletThread) Thread.currentThread()).秘appletViewer;
+	public JSAppletViewer 秘appletViewer = Thread.currentThread().getThreadGroup().秘appletViewer;
 	private JSFrameViewer 秘frameViewer, 秘topFrameViewer;
 	public HTML5Canvas 秘canvas;
 	public ComponentUI ui; // from JComponent
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ApplicationShutdownHooks.java b/sources/net.sf.j2s.java.core/src/java/lang/ApplicationShutdownHooks.java
@@ -101,7 +101,7 @@ static void runHooks() {
 
         for (Thread hook : threads) {
         	try {
-            hook.start();
+            hook.run(); // SwingJS was start(), but then this comes too late
         	} catch (Throwable t) {
         		// SwingJS
         		System.err.println("ApplicationShutdownHooks exception:\n" + t);
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Shutdown.java b/sources/net.sf.j2s.java.core/src/java/lang/Shutdown.java
@@ -164,14 +164,15 @@ private static void runHooks() {
      */
     static void halt(int status) {
         synchronized (haltLock) {
-            halt0(status);
+        	System.out.println("Shutdown(" + status + ") on " + Thread.currentThread().getThreadGroup().getName());
+//            halt0(status);
         }
     }
 
-    static native void halt0(int status);
+//    static native void halt0(int status);
 
     /* Wormhole for invoking java.lang.ref.Finalizer.runAllFinalizers */
-    private static native void runAllFinalizers();
+//    private static native void runAllFinalizers();
 
 
     /* The actual shutdown sequence is defined here.
@@ -193,12 +194,12 @@ private static void sequence() {
             if (state != HOOKS) return;
         }
         runHooks();
-        boolean rfoe;
+//        boolean rfoe;
         synchronized (lock) {
             state = FINALIZERS;
-            rfoe = runFinalizersOnExit;
+//            rfoe = runFinalizersOnExit;
         }
-        if (rfoe) runAllFinalizers();
+//        if (rfoe) runAllFinalizers();
     }
 
 
@@ -230,7 +231,7 @@ static void exit(int status) {
             }
         }
         if (runMoreFinalizers) {
-            runAllFinalizers();
+            //runAllFinalizers();
             halt(status);
         }
         synchronized (Shutdown.class) {
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/ThreadGroup.java b/sources/net.sf.j2s.java.core/src/java/lang/ThreadGroup.java
@@ -28,10 +28,14 @@
 
 package java.lang;
 
+import java.util.ArrayList;
 //import java.io.PrintStream;
 import java.util.Arrays;
 //import sun.misc.VM;
 
+import javax.swing.Timer;
+
+import swingjs.JSAppletViewer;
 import swingjs.api.js.HTML5Applet;
 
 /**
@@ -61,20 +65,23 @@
 public
 class ThreadGroup implements Thread.UncaughtExceptionHandler {
 	private final ThreadGroup parent;
-    String name;
-    int maxPriority = Thread.MAX_PRIORITY;  // BH
-    boolean destroyed;
-    boolean daemon;
-    boolean vmAllowSuspension;
+	private String name;
+    private int maxPriority = Thread.MAX_PRIORITY;  // BH
+    private boolean destroyed;
+    private boolean daemon;
+    private boolean vmAllowSuspension;
 
-    int nUnstartedThreads = 0;
-    int nthreads;
-    Thread threads[];
+    private int nUnstartedThreads = 0;
+    private int nthreads;
+    private Thread threads[];
 
-    int ngroups;
-    ThreadGroup groups[];
+    private int ngroups;
+    private ThreadGroup groups[];
     protected HTML5Applet 秘html5Applet;
     public boolean 秘systemExited;
+	public JSAppletViewer 秘appletViewer;
+
+	private ArrayList<Object> 秘timerQueue;
 
 //    /**
 //     * Creates an empty Thread group that is not in any Thread group.
@@ -1043,5 +1050,20 @@ public String toString() {
         return getClass().getName() + "[name=" + getName() + ",maxpri=" + maxPriority + ",html5Applet=" + 秘html5Applet + "]";
     }
 
+	public ArrayList<Object> 秘getTimerQueue() {
+		return (秘systemExited ? null : 秘timerQueue == null ? (秘timerQueue = new ArrayList<Object>()) : 秘timerQueue);
+	}
 
+	public void 秘exit() {
+		ArrayList<Object> q = 秘getTimerQueue();
+		for (int i = q.size(); --i >= 0;) {
+			Timer t = (Timer) q.get(i);
+			try {
+				t.stop();
+			} catch (Throwable e) {
+				// ignore
+			}
+		}
+		秘systemExited = true;
+	}
 }
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/JSThread.java b/sources/net.sf.j2s.java.core/src/javajs/util/JSThread.java
@@ -3,9 +3,6 @@
 import java.awt.Toolkit;
 import java.awt.event.InvocationEvent;
 
-//import javajs.J2SRequireImport;
-import javajs.api.JSFunction;
-
 
 /**
  * An abstract class that takes care of simple threading in Java or JavaScript.
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSAppletThread.java b/sources/net.sf.j2s.java.core/src/swingjs/JSAppletThread.java
@@ -17,16 +17,14 @@
  */
 public class JSAppletThread extends JSThread {
 
-	public JSAppletViewer 秘appletViewer;
-
 	public JSAppletThread(JSAppletViewer ap, ThreadGroup group, String name) {
 		super(group, name);
-		秘appletViewer = ap;
+		getThreadGroup().秘appletViewer = ap;
 	}
 
 	@Override
 	public void run1(int mode) {
-		mode = 秘appletViewer.run1(mode);
+		mode = getThreadGroup().秘appletViewer.run1(mode);
 		if (mode != DONE)
 			dispatchAndReturn(null, mode);
 	}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java
@@ -619,10 +619,6 @@ public JSFrameViewer newFrameViewer(boolean forceNew) {
 		return (haveFrames || forceNew ? new JSFrameViewer() : null);
 	}
 
-	public ArrayList<Object> getTimerQueue() {
-		return (timerQueue == null ? (timerQueue = new ArrayList<Object>()) : timerQueue);
-	}
-
 	public void exit() {
 		for (int i = allWindows.size(); --i >= 0;)
 			try {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -118,8 +118,11 @@ public static Object getPostEventQueue(boolean isPost) {
 	 * From System.exit()
 	 */
 	public static void exit(int status) {
-		Thread.currentThread().getThreadGroup().秘systemExited = true;
-		JSUtil.getAppletViewer().exit();
+		
+		Thread.currentThread().getThreadGroup().秘exit();
+		JSAppletViewer v = JSUtil.getAppletViewer();
+		if (v != null)
+			v.exit();
 		Runtime.getRuntime().exit(status);
 	}
 
@@ -222,7 +225,7 @@ public static Object getPropertyObject(Object t, String key, Object def) {
 	 */
 	public static GraphicsConfiguration getGraphicsConfiguration() {
 		JSAppletViewer ap = JSUtil.getAppletViewer();
-		GraphicsConfiguration gc = ap.graphicsConfig;
+		GraphicsConfiguration gc = (ap == null ? null : ap.graphicsConfig);
 		return (gc == null ? (gc = ap.graphicsConfig = (GraphicsConfiguration) JSUtil.getInstance("swingjs.JSGraphicsConfiguration")) : gc);
 	}
 
@@ -688,7 +691,7 @@ public static Line getAudioLine(Line.Info info) {
 	}
 
 	public static ArrayList<Object> getTimerQueue() {
-		return JSUtil.getAppletViewer().getTimerQueue();
+		return Thread.currentThread().getThreadGroup().秘getTimerQueue();
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -424,7 +424,7 @@ public static Object getInstance(String className) {
 	}
 
 	public static JSAppletViewer getAppletViewer() {
-		return ((JSAppletThread) Thread.currentThread()).秘appletViewer;
+		return Thread.currentThread().getThreadGroup().秘appletViewer;
 	}
 
 	public static void readyCallback(String aname, String fname, JSComponent applet,
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Exit.java b/sources/net.sf.j2s.java.core/src/test/Test_Exit.java
@@ -0,0 +1,65 @@
+package test;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+import javax.swing.JFrame;
+import javax.swing.Timer;
+
+public class Test_Exit extends Test_ {
+
+	public static void main(String[] args) {
+		new Test_Exit();
+	}
+
+	public Test_Exit() {
+		
+		// oddly enough, Java runs these hooks in unpredictable order, 
+		// but SwingJS will run them sequentially
+		
+		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+
+			@Override
+			public void run() {
+				System.out.println("OK Test_Exit 1");
+			}
+			
+		}));
+		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+
+			@Override
+			public void run() {
+				System.out.println("OK Test_Exit 2");
+			}
+			
+		}));
+
+		Timer t = new Timer(200, new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				// System.exit(0) should prevent this from firing
+				// but in Java, it depends upon the delay, with about 200 ms required to stop it
+				System.out.println("NO! Test_Exit");
+				assert(false);
+			}
+			
+		});
+		t.setRepeats(false);
+		t.start();
+		JFrame j = new JFrame("test");
+		j.setSize(300,300);
+		j.setVisible(true);
+		System.exit(0);
+	}
+	
+	static {
+		// to allow the frame to pop up briefly
+		j2sHeadless = false;
+	}
+}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Log.java b/sources/net.sf.j2s.java.core/src/test/Test_Log.java
@@ -38,7 +38,7 @@ public Test_Log() {
 		setLogging();
 		logger.setLevel(Level.SEVERE);
 
-		logger.info("info Test_Log");		
+		logger.info("info Test_Log");	
 		
 		System.out.println("logger.parent.parent " + logger.getParent().getHandlers()[0].getClass().getName());
 		logger.getParent().log(Level.SEVERE, "parent test");
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -2552,6 +2552,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
 				if (isApp && applet.__Info.headless) {
 					Clazz.loadClass("java.lang.Thread").currentThread$().group.html5Applet = applet;
 					cl.main$SA(applet.__Info.args || []);
+					System.exit$(0);
 				} else {
 					
 					applet.__Info.main
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -3066,8 +3066,9 @@ java.lang.System = System = {
   currentTimeMillis$ : function () {
     return new Date ().getTime ();
   },
-  exit$ : function() { 
- 	 swingjs.JSToolkit && swingjs.JSToolkit.exit$() 
+  exit$ : function(status) { 
+	 swingjs.JSToolkit || Clazz.loadClass("swingjs.JSToolkit");
+ 	 swingjs.JSToolkit.exit$I(status || 0) 
   },
   gc$ : function() {}, // bh
   getProperties$ : function () {
@@ -4597,6 +4598,7 @@ String(byte[] ascii, int hibyte, int offset, int count)
 */
 
 String.instantialize=function(){
+var x=arguments[0];
 switch (arguments.length) {
 case 0:
   return new String();
@@ -4606,7 +4608,6 @@ case 1:
   // String(StringBuffer buffer)
   // String(StringBuilder builder)
   // String(String original)
-  var x=arguments[0];
   if (x.__BYTESIZE || x instanceof Array){
     return (x.length == 0 ? "" : typeof x[0]=="number" ? Encoding.readUTF8Array(x) : x.join(''));
   }
@@ -4617,21 +4618,21 @@ case 2:
   // String(byte[] bytes, String charsetName)
 
   var hibyte=arguments[1];
-  return (typeof hibyte=="number" ? String.instantialize(arguments[0],hibyte,0,arguments[0].length) 
+  return (typeof hibyte=="number" ? String.instantialize(x,hibyte,0,x.length) 
 	: self.TextDecoder && arguments[1].toString().toUpperCase() == "UTF-8" ? new TextDecoder().decode(arguments[0])
 	: String.instantialize(x,0,x.length,hibyte));
 case 3:
   // String(byte[] bytes, int offset, int length)
   // String(char[] value, int offset, int count)
   // String(int[] codePoints, int offset, int count)
 
-  var bytes=arguments[0];
+  var bytes=x;
   var offset=arguments[1];
   var length=arguments[2];
   if(arguments[2]instanceof Array){
     // ???
     bytes=arguments[2];
-    offset=arguments[0];
+    offset=x;
     length=arguments[1];
   }
   var arr=new Array(length);
@@ -4656,7 +4657,7 @@ case 4:
   // String(byte[] bytes, int offset, int length, String charsetName)
   // String(byte[] ascii, int hibyte, int offset, int count)
 
-  var bytes=arguments[0];
+  var bytes=x;
   var cs=arguments[3];
   if(typeof cs != "number"){
     var offset=arguments[1];

Original file line number	Diff line number	Diff line change
`@@ -164,14 +164,15 @@ private static void runHooks() {`
`164`	`164`	`*/`
`165`	`165`	`static void halt(int status) {`
`166`	`166`	`synchronized (haltLock) {`
`167`		`- halt0(status);`
	`167`	`+ System.out.println("Shutdown(" + status + ") on " + Thread.currentThread().getThreadGroup().getName());`
	`168`	`+// halt0(status);`
`168`	`169`	`}`
`169`	`170`	`}`
`170`	`171`
`171`		`- static native void halt0(int status);`
	`172`	`+// static native void halt0(int status);`
`172`	`173`
`173`	`174`	`/* Wormhole for invoking java.lang.ref.Finalizer.runAllFinalizers */`
`174`		`- private static native void runAllFinalizers();`
	`175`	`+// private static native void runAllFinalizers();`
`175`	`176`
`176`	`177`
`177`	`178`	`/* The actual shutdown sequence is defined here.`
`@@ -193,12 +194,12 @@ private static void sequence() {`
`193`	`194`	`if (state != HOOKS) return;`
`194`	`195`	`}`
`195`	`196`	`runHooks();`
`196`		`- boolean rfoe;`
	`197`	`+// boolean rfoe;`
`197`	`198`	`synchronized (lock) {`
`198`	`199`	`state = FINALIZERS;`
`199`		`- rfoe = runFinalizersOnExit;`
	`200`	`+// rfoe = runFinalizersOnExit;`
`200`	`201`	`}`
`201`		`- if (rfoe) runAllFinalizers();`
	`202`	`+// if (rfoe) runAllFinalizers();`
`202`	`203`	`}`
`203`	`204`
`204`	`205`
`@@ -230,7 +231,7 @@ static void exit(int status) {`
`230`	`231`	`}`
`231`	`232`	`}`
`232`	`233`	`if (runMoreFinalizers) {`
`233`		`- runAllFinalizers();`
	`234`	`+ //runAllFinalizers();`
`234`	`235`	`halt(status);`
`235`	`236`	`}`
`236`	`237`	`synchronized (Shutdown.class) {`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ public static Object getInstance(String className) {`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`public static JSAppletViewer getAppletViewer() {`
`427`		`- return ((JSAppletThread) Thread.currentThread()).秘appletViewer;`
	`427`	`+ return Thread.currentThread().getThreadGroup().秘appletViewer;`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`public static void readyCallback(String aname, String fname, JSComponent applet,`