java2script · BobHanson · Aug 28, 2019 · Aug 20, 2019 · Aug 23, 2019 · Aug 23, 2019
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/_j2sclasslist.txt b/sources/net.sf.j2s.core/dist/swingjs/_j2sclasslist.txt
@@ -305,7 +305,6 @@ javax/swing/undo/UndoableEdit.js
 javax/swing/ViewportLayout.js
 javax/swing/WindowConstants.js
 sun/awt/AppContext.js
-sun/awt/AWTAccessor.js
 sun/awt/AWTAutoShutdown.js
 sun/awt/CausedFocusEvent.js
 sun/awt/ComponentFactory.js
@@ -339,10 +338,8 @@ swingjs/api/Interface.js
 swingjs/api/js/DOMNode.js
 swingjs/api/js/HTML5CanvasContext2D.js
 swingjs/api/js/JSInterface.js
-swingjs/api/JSMinimalAbstractDocument.js
 swingjs/jquery/JQueryUI.js
 swingjs/JSApp.js
-swingjs/JSApplet.js
 swingjs/JSAppletThread.js
 swingjs/JSAppletViewer.js
 swingjs/JSFocusPeer.js

diff --git a/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20190817161814 
+20190828094643 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/_j2sclasslist.txt b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/_j2sclasslist.txt
@@ -305,7 +305,6 @@ javax/swing/undo/UndoableEdit.js
 javax/swing/ViewportLayout.js
 javax/swing/WindowConstants.js
 sun/awt/AppContext.js
-sun/awt/AWTAccessor.js
 sun/awt/AWTAutoShutdown.js
 sun/awt/CausedFocusEvent.js
 sun/awt/ComponentFactory.js
@@ -339,10 +338,8 @@ swingjs/api/Interface.js
 swingjs/api/js/DOMNode.js
 swingjs/api/js/HTML5CanvasContext2D.js
 swingjs/api/js/JSInterface.js
-swingjs/api/JSMinimalAbstractDocument.js
 swingjs/jquery/JQueryUI.js
 swingjs/JSApp.js
-swingjs/JSApplet.js
 swingjs/JSAppletThread.js
 swingjs/JSAppletViewer.js
 swingjs/JSFocusPeer.js

diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1 @@
-20190817161814 
+20190828094643 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompilationParticipant.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompilationParticipant.java
@@ -102,10 +102,13 @@ public void buildStarting(BuildContext[] files, boolean isBatch) {
 	 */
 	public void buildFinished(IJavaProject project) {
 		if (javaFiles != null) {
-			System.out.println("building JavaScript " + project.getProject().getLocation());
 			Java2ScriptCompiler j2sCompiler = new Java2ScriptCompiler();
 			j2sCompiler.startBuild(isCleanBuild);
-			j2sCompiler.initializeProject(project, true);
+			if (!j2sCompiler.initializeProject(project, true)) {
+				System.out.println(".j2s disabled");
+				return;
+			}
+			System.out.println("building JavaScript " + project.getProject().getLocation());
 			for (int i = 0; i < javaFiles.length; i++) {
 				System.out.println("transpiling " + javaFiles[i]);
 // trying to keep the progess monitor running - didn't work

diff --git a/sources/net.sf.j2s.java.core/.j2s b/sources/net.sf.j2s.java.core/.j2s
@@ -1,16 +1,18 @@
-j2s.compiler.status=enable
-
-#output file name for logging methods declared - delete the file to regenerate a listing 
-#j2s.log.methods.declared=methodsDeclared.csv
-
-#output file name for logging methods called - delete the file to regenerate a listing
-#j2s.log.methods.called=methodsCalled.csv
-
-#if set, every instance of methods called will be logged
-#otherwise, only the first call to a method will be logged 
-#output will be comma-separated: called method,caller class 
-#j2s.log.all.calls=true
-
-#a semicolon-separated list of package-level file paths to be excluded
-#j2s.excluded.paths=test;testng
-
+j2s.compiler.status=enable
+
+#j2s.compiler.nonqualified.packages=org.w3c.dom
+
+#output file name for logging methods declared - delete the file to regenerate a listing 
+#j2s.log.methods.declared=methodsDeclared.csv
+
+#output file name for logging methods called - delete the file to regenerate a listing
+#j2s.log.methods.called=methodsCalled.csv
+
+#if set, every instance of methods called will be logged
+#otherwise, only the first call to a method will be logged 
+#output will be comma-separated: called method,caller class 
+#j2s.log.all.calls=true
+
+#a semicolon-separated list of package-level file paths to be excluded
+#j2s.excluded.paths=test;testng
+
diff --git a/sources/net.sf.j2s.java.core/_j2sclasslist.txt b/sources/net.sf.j2s.java.core/_j2sclasslist.txt
@@ -305,7 +305,6 @@ javax/swing/undo/UndoableEdit.js
 javax/swing/ViewportLayout.js
 javax/swing/WindowConstants.js
 sun/awt/AppContext.js
-sun/awt/AWTAccessor.js
 sun/awt/AWTAutoShutdown.js
 sun/awt/CausedFocusEvent.js
 sun/awt/ComponentFactory.js
@@ -339,10 +338,8 @@ swingjs/api/Interface.js
 swingjs/api/js/DOMNode.js
 swingjs/api/js/HTML5CanvasContext2D.js
 swingjs/api/js/JSInterface.js
-swingjs/api/JSMinimalAbstractDocument.js
 swingjs/jquery/JQueryUI.js
 swingjs/JSApp.js
-swingjs/JSApplet.js
 swingjs/JSAppletThread.js
 swingjs/JSAppletViewer.js
 swingjs/JSFocusPeer.js

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/dist/_j2sclasslist.txt b/sources/net.sf.j2s.java.core/dist/_j2sclasslist.txt
@@ -305,7 +305,6 @@ javax/swing/undo/UndoableEdit.js
 javax/swing/ViewportLayout.js
 javax/swing/WindowConstants.js
 sun/awt/AppContext.js
-sun/awt/AWTAccessor.js
 sun/awt/AWTAutoShutdown.js
 sun/awt/CausedFocusEvent.js
 sun/awt/ComponentFactory.js
@@ -339,10 +338,8 @@ swingjs/api/Interface.js
 swingjs/api/js/DOMNode.js
 swingjs/api/js/HTML5CanvasContext2D.js
 swingjs/api/js/JSInterface.js
-swingjs/api/JSMinimalAbstractDocument.js
 swingjs/jquery/JQueryUI.js
 swingjs/JSApp.js
-swingjs/JSApplet.js
 swingjs/JSAppletThread.js
 swingjs/JSAppletViewer.js
 swingjs/JSFocusPeer.js

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/DefaultKeyboardFocusManager.java b/sources/net.sf.j2s.java.core/src/java/awt/DefaultKeyboardFocusManager.java
@@ -38,8 +38,6 @@
 
 import javax.swing.JApplet;
 
-import sun.awt.AWTAccessor;
-
 //import sun.util.logging.PlatformLogger;
 
 import sun.awt.AppContext;

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/datatransfer/SystemFlavorMap.java b/sources/net.sf.j2s.java.core/src/java/awt/datatransfer/SystemFlavorMap.java
@@ -30,7 +30,7 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.lang.ref.SoftReference;
+//import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -631,15 +631,15 @@ public synchronized List<String> getNativesForFlavor(DataFlavor flav) {
         List retval = null;
 
         // Check cache, even for null flav
-        SoftReference ref = (SoftReference)getNativesForFlavorCache.get(flav);
-        if (ref != null) {
-            retval = (List)ref.get();
+        Object refval = getNativesForFlavorCache.get(flav);
+//        if (ref != null) {
+//            retval = (List)ref.get();
             if (retval != null) {
                 // Create a copy, because client code can modify the returned
                 // list.
                 return new ArrayList(retval);
             }
-        }
+ //       }
 
         if (flav == null) {
             retval = new ArrayList(nativeToFlavor.keySet());
@@ -723,7 +723,7 @@ public synchronized List<String> getNativesForFlavor(DataFlavor flav) {
             retval = flavorToNativeLookup(flav, SYNTHESIZE_IF_NOT_FOUND);
         }
 
-        getNativesForFlavorCache.put(flav, new SoftReference(retval));
+        getNativesForFlavorCache.put(flav, retval);
         // Create a copy, because client code can modify the returned list.
         return new ArrayList(retval);
     }
@@ -763,13 +763,13 @@ public synchronized List<String> getNativesForFlavor(DataFlavor flav) {
 	public synchronized List<DataFlavor> getFlavorsForNative(String nat) {
 
         // Check cache, even for null nat
-        SoftReference ref = (SoftReference)getFlavorsForNativeCache.get(nat);
-        if (ref != null) {
-            ArrayList retval = (ArrayList)ref.get();
-            if (retval != null) {
-                return (List)retval.clone();
+//        SoftReference ref = (SoftReference)getFlavorsForNativeCache.get(nat);
+//        if (ref != null) {
+            ArrayList rval = (ArrayList) getFlavorsForNativeCache.get(nat);
+            if (rval != null) {
+                return (List)rval.clone();
             }
-        }
+//        }
 
         LinkedList retval = new LinkedList();
 
@@ -903,7 +903,7 @@ public synchronized List<DataFlavor> getFlavorsForNative(String nat) {
         }
 
         ArrayList arrayList = new ArrayList(retval);
-        getFlavorsForNativeCache.put(nat, new SoftReference(arrayList));
+        getFlavorsForNativeCache.put(nat, arrayList);
         return (List)arrayList.clone();
     }
 

diff --git a/sources/net.sf.j2s.java.core/src/java/awt/event/package.html b/sources/net.sf.j2s.java.core/src/java/awt/event/package.html
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/font/package.html b/sources/net.sf.j2s.java.core/src/java/awt/font/package.html