better headless operation -- removes exit() dependencies

BobHanson · BobHanson · commit 42510283eddf · 2020-04-17T10:10:08.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/Runtime.java b/sources/net.sf.j2s.java.core/src/java/lang/Runtime.java
@@ -104,7 +104,7 @@ private Runtime() {}
      */
     public void exit(int status) {
 		Thread.currentThread().getThreadGroup().秘exit();
-		JSAppletViewer v = JSToolkit.getAppletViewer();
+		JSAppletViewer v = /** @j2sNative !swingjs.JSToolkit ? null : */JSToolkit.getAppletViewer();
 		if (v != null)
 			v.exit();
 
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
@@ -1055,7 +1055,7 @@ public String toString() {
 	}
 
 	public void 秘exit() {
-		ArrayList<Object> q = 秘getTimerQueue();
+		ArrayList<Object> q = 秘systemExited ? null : 秘timerQueue;//秘getTimerQueue();
 		if (q != null)
 			for (int i = q.size(); --i >= 0;) {
 				Timer t = (Timer) q.get(i);
diff --git a/sources/net.sf.j2s.java.core/src/java/nio/MappedByteBuffer.java b/sources/net.sf.j2s.java.core/src/java/nio/MappedByteBuffer.java
@@ -26,7 +26,6 @@
 package java.nio;
 
 import java.io.FileDescriptor;
-import sun.misc.Unsafe;
 
 /**
  * A direct byte buffer whose content is a memory-mapped region of a file.
diff --git a/sources/net.sf.j2s.java.core/src/sun/util/resources/ParallelListResourceBundle.java b/sources/net.sf.j2s.java.core/src/sun/util/resources/ParallelListResourceBundle.java
@@ -33,9 +33,9 @@
 import java.util.NoSuchElementException;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicMarkableReference;
+import java.util.HashMap; // SwingJS was Concurrent
+import java.util.Map; // SwingJS was Concurrent
+//import java.util.concurrent.atomic.AtomicMarkableReference;
 
 /**
  * ParallelListResourceBundle is another variant of ListResourceBundle
@@ -46,11 +46,10 @@
  * @author Masayoshi Okutsu
  */
 public abstract class ParallelListResourceBundle extends ResourceBundle {
-    private volatile ConcurrentMap<String, Object> lookup;
+    private volatile Map<String, Object> lookup;
     private volatile Set<String> keyset;
-    private final AtomicMarkableReference<Object[][]> parallelContents
-            = new AtomicMarkableReference<>(null, false);
-
+    private Object[][] parallelContents;
+    private boolean done = false;
     /**
      * Sole constructor.  (For invocation by subclass constructors, typically
      * implicit.)
@@ -87,26 +86,34 @@ ResourceBundle getParent() {
      */
     public void setParallelContents(OpenListResourceBundle rb) {
         if (rb == null) {
-            parallelContents.compareAndSet(null, null, false, true);
+            compareAndSet(null, null, false, true);
         } else {
-            parallelContents.compareAndSet(null, rb.getContents(), false, false);
+            compareAndSet(null, rb.getContents(), false, false);
         }
     }
 
-    /**
+    private void compareAndSet(Object[][] orig, Object[][] val, boolean wasdone, boolean done) {
+    	if (parallelContents == orig && this.done == wasdone) {
+    		parallelContents = val; this.done = done;
+    	}
+	}
+
+	/**
      * Returns true if any parallel contents have been set or if this bundle is
      * marked as complete.
      *
      * @return true if any parallel contents have been processed
      */
     boolean areParallelContentsComplete() {
-        // Quick check for `complete'
-        if (parallelContents.isMarked()) {
-            return true;
-        }
-        boolean[] done = new boolean[1];
-        Object[][] data = parallelContents.get(done);
-        return data != null || done[0];
+    	return parallelContents != null;
+//    	return true;
+//        // Quick check for `complete'
+//        if (parallelContents.isMarked()) {
+//            return true;
+//        }
+//        boolean[] done = new boolean[1];
+//        Object[][] data = parallelContents.get(done);
+//        return data != null || done[0];
     }
 
     @Override
@@ -162,21 +169,21 @@ synchronized void resetKeySet() {
      * Loads the lookup table if they haven't been loaded already.
      */
     void loadLookupTablesIfNecessary() {
-        ConcurrentMap<String, Object> map = lookup;
+        Map<String, Object> map = lookup;
         if (map == null) {
-            map = new ConcurrentHashMap<>();
+            map = new HashMap<>();
             for (Object[] item : getContents()) {
                 map.put((String) item[0], item[1]);
             }
         }
 
         // If there's any parallel contents data, merge the data into map.
-        Object[][] data = parallelContents.getReference();
+        Object[][] data = parallelContents;
         if (data != null) {
             for (Object[] item : data) {
                 map.putIfAbsent((String) item[0], item[1]);
             }
-            parallelContents.set(null, true);
+            parallelContents = null;
         }
         if (lookup == null) {
             synchronized (this) {
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Headless.java b/sources/net.sf.j2s.java.core/src/test/Test_Headless.java
@@ -0,0 +1,25 @@
+package test;
+
+/**
+ * See also Test_HeadlessNot
+ * 
+ * Use ?j2sverbose to see the difference in adding headless:true to Info{}
+ * 
+ * @author hansonr
+ *
+ */
+class Test_Headless extends Test_ {
+
+static {
+	/**
+	 * @j2sNative J2S.thisApplet.__Info.headless=true;
+	 * 
+	 */
+}
+	public static void main(String[] args) {
+		String[] files = /** @j2sNative Clazz.ClassFilesLoaded.sort() || */null;
+		String s = /** @j2sNative  files.join('\n') || */null;
+		System.out.println("Hello, world! (headless) \n" + s + "\n\n" + files.length + " classes loaded");
+	}
+
+}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_HeadlessNot.java b/sources/net.sf.j2s.java.core/src/test/Test_HeadlessNot.java
@@ -0,0 +1,17 @@
+package test;
+
+/**
+ * See also Test_Headless
+ * 
+ * @author hansonr
+ *
+ */
+class Test_HeadlessNot extends Test_ {
+ 
+	public static void main(String[] args) {
+		String[] files = /** @j2sNative Clazz.ClassFilesLoaded.sort() || */null;
+		String s = /** @j2sNative  files.join('\n') || */null;
+		System.out.println("Hello, world! (not headless) \n" + s + "\n\n" + files.length + " classes loaded");
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -1055,7 +1055,7 @@ public String toString() {`
`1055`	`1055`	`}`
`1056`	`1056`
`1057`	`1057`	`public void 秘exit() {`
`1058`		`- ArrayList<Object> q = 秘getTimerQueue();`
	`1058`	`+ ArrayList<Object> q = 秘systemExited ? null : 秘timerQueue;//秘getTimerQueue();`
`1059`	`1059`	`if (q != null)`
`1060`	`1060`	`for (int i = q.size(); --i >= 0;) {`
`1061`	`1061`	`Timer t = (Timer) q.get(i);`