BobHanson · BobHanson · Sep 23, 2019 · Dec 16, 2018 · Dec 18, 2018 · Dec 21, 2018
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -25,13 +25,13 @@ GEM
     execjs (2.7.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
+    ffi (~> 1.9.24)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
     github-pages (180)
       activesupport (= 4.2.9)
       github-pages-health-check (= 1.4.0)
-      jekyll (= 3.7.3)
+      jekyll (~> 3.7.4)
       jekyll-avatar (= 0.5.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.5)
@@ -70,7 +70,7 @@ GEM
       listen (= 3.1.5)
       mercenary (~> 0.3)
       minima (= 2.4.0)
-      nokogiri (>= 1.8.1, < 2.0)
+      nokogiri (>= 1.8.5, < 2.0)
       rouge (= 2.2.1)
       terminal-table (~> 1.4)
     github-pages-health-check (1.4.0)
@@ -81,11 +81,11 @@ GEM
       typhoeus (~> 1.3)
     html-pipeline (2.7.1)
       activesupport (>= 2)
-      nokogiri (>= 1.4)
+      nokogiri (>= 1.8.5)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.3)
+    jekyll (~> 3.7.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -99,99 +99,99 @@ GEM
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
     jekyll-avatar (0.5.0)
-      jekyll (~> 3.0)
+      jekyll (~> 3.7.4)
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
     jekyll-commonmark (1.2.0)
       commonmarker (~> 0.14)
-      jekyll (>= 3.0, < 4.0)
+      jekyll (~> 3.7.4)
     jekyll-commonmark-ghpages (0.1.5)
       commonmarker (~> 0.17.6)
       jekyll-commonmark (~> 1)
       rouge (~> 2)
     jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
+      jekyll (~> 3.7.4)
     jekyll-feed (0.9.3)
-      jekyll (~> 3.3)
+      jekyll (~> 3.7.4)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
     jekyll-github-metadata (2.9.4)
-      jekyll (~> 3.1)
+      jekyll (~> 3.7.4)
       octokit (~> 4.0, != 4.4.0)
     jekyll-mentions (1.3.0)
       activesupport (~> 4.0)
       html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
+      jekyll (~> 3.7.4)
     jekyll-optional-front-matter (0.3.0)
-      jekyll (~> 3.0)
+      jekyll (~> 3.7.4)
     jekyll-paginate (1.1.0)
     jekyll-readme-index (0.2.0)
-      jekyll (~> 3.0)
+      jekyll (~> 3.7.4)
     jekyll-redirect-from (0.13.0)
-      jekyll (~> 3.3)
+      jekyll (~> 3.7.4)
     jekyll-relative-links (0.5.3)
-      jekyll (~> 3.3)
+      jekyll (~> 3.7.4)
     jekyll-remote-theme (0.2.3)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       rubyzip (>= 1.2.1, < 3.0)
       typhoeus (>= 0.7, < 2.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.4.0)
-      jekyll (~> 3.3)
+      jekyll (~> 3.7.4)
     jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
+      jekyll (~> 3.7.4)
     jekyll-swiss (0.4.0)
     jekyll-theme-architect (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-cayman (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-dinky (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-hacker (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-leap-day (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-merlot (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-midnight (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-minimal (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-modernist (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-primer (0.5.2)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-github-metadata (~> 2.9)
       jekyll-seo-tag (~> 2.2)
     jekyll-theme-slate (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-tactile (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-theme-time-machine (0.1.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
-      jekyll (~> 3.3)
+      jekyll (~> 3.7.4)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
     jemoji (0.9.0)
       activesupport (~> 4.0, >= 4.2.9)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
+      jekyll (~> 3.7.4)
     kramdown (1.16.2)
     liquid (4.0.0)
     listen (3.1.5)
@@ -201,13 +201,13 @@ GEM
     mercenary (0.3.6)
     mini_portile2 (2.3.0)
     minima (2.4.0)
-      jekyll (~> 3.5)
+      jekyll (~> 3.7.4)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.0.0)
     net-dns (0.8.0)
-    nokogiri (1.8.2)
+    nokogiri (>= 1.8.5)
       mini_portile2 (~> 2.3.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -221,7 +221,7 @@ GEM
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.1)
+    rubyzip (~> 1.2.2)
     safe_yaml (1.0.4)
     sass (3.5.6)
       sass-listen (~> 4.0.0)

diff --git a/docs/README b/docs/README
@@ -1,12 +1,4 @@
-This directory contains the content of the Java2Script project website, 
-implemented through GitHub Pages.
 
-For details on GitHub Pages see https://pages.github.com.
-For details on Jekyll, used by GitHub Pages, see 
-    https://jekyllrb.com and
-    https://help.github.com/articles/using-jekyll-as-a-static-site-generator-with-github-pages
-
+See https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist for installation instructions.
 
-If you want to setup site locally with Jekyll see:
-    https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/
 
diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -4,6 +4,10 @@
 
 ## Installation
 
+see https://github.com/BobHanson/java2script/tree/master/sources/net.sf.j2s.core/dist  for installation instructions. 
+
+The instructions given here are for a much earlier version.
+
 ### Prerequisites
 
 - Eclipse Neon (4.6) or higher.

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/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 @@
-20190829124003 
+20190923090813 
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/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 @@
-20190829124003 
+20190923090813 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java
@@ -79,6 +79,8 @@ class Java2ScriptCompiler {
 
 	private IJavaProject project;
 
+	private boolean isDebugging;
+
 	static boolean isActive(IJavaProject project) {
 		try {
 			return new File(project.getProject().getLocation().toOSString(), J2S_OPTIONS_FILE_NAME).exists();
@@ -152,6 +154,8 @@ boolean initializeProject(IJavaProject project, boolean isCompilationParticipant
 		siteFolder = projectFolder + "/" + siteFolder;
 		j2sPath = siteFolder + "/swingjs/j2s";
 
+		if (isDebugging)
+			System.out.println("Java2ScriptCompiler writing to " + j2sPath);
 		// method declarations and invocations are only logged
 		// when the designated files are deleted prior to building
 
@@ -199,7 +203,7 @@ boolean initializeProject(IJavaProject project, boolean isCompilationParticipant
 	    if (nonqualifiedPackages.length() == 0)
 	    	nonqualifiedPackages = null;
 		// includes @j2sDebug blocks
-		boolean isDebugging = "debug".equals(getProperty("j2s.compiler.mode"));
+		isDebugging = "debug".equals(getProperty("j2s.compiler.mode"));
 
 		String classReplacements = getProperty("j2s.class.replacements");
 
@@ -375,7 +379,10 @@ private void createJSFile(String j2sPath, String packageName, String elementName
 				}
 			}
 		}
-		writeToFile(new File(j2sPath, elementName + ".js"), js);
+		File f = new File(j2sPath, elementName + ".js");
+		if (isDebugging)
+			System.out.println("Java2ScriptCompiler creating " + f);
+		writeToFile(f, js);
 	}
 
 	private String getFileContents(File file) {

diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -134,6 +134,7 @@
 import org.eclipse.jdt.core.dom.WhileStatement;
 import org.eclipse.jdt.core.dom.WildcardType;
 
+// BH 2019.09.07 adds optimization for lambda methods that do not have finals
 // BH 2019.08.29 fix for boxing of binary representation 0b01... (Google Closure Compiler bug)
 // BH 2019.05.13 fix for Math.getExponent, ulp, nextDown, nextUp, nextAfter needing qualification
 // BH 2019.05.13 fix for Function reference in   new Foo()::test(...)
@@ -163,6 +164,12 @@ public class Java2ScriptVisitor extends ASTVisitor {
 	 */
 	private static final boolean ALLOW_NEW_LAMBDA = false;
 
+	/**
+	 * If there are no finals for a lambda method, then we can reuse the object. 
+	 * This can be huge for preventing repetitive object creation
+	 */
+	private static final boolean ALLOW_LAMBDA_OBJECT_REUSE = true;
+
 	private static final int NOT_LAMBDA = 0;
 	private static final int LAMBDA_METHOD = 1;
 	private static final int LAMBDA_CREATION = 3;
@@ -657,8 +664,10 @@ private String getClassJavaNameForType(Type type) {
 	 *                                  anonymous class names
 	 * @param isLambda
 	 * @param isClassTrulyLocal
+	 * 
+	 * @return anonymous name only if there are no finals
 	 */
-	private void processLocalInstance(ASTNode node, ASTNode anonymousClassDeclaration, ITypeBinding binding,
+	private String processLocalInstance(ASTNode node, ASTNode anonymousClassDeclaration, ITypeBinding binding,
 			ITypeBinding innerClass, String javaInnerClassName, int lambdaType, boolean isClassTrulyLocal) {
 
 		// In the case of local classes, the declaration is dissociated from the
@@ -701,6 +710,7 @@ private void processLocalInstance(ASTNode node, ASTNode anonymousClassDeclaratio
 				anonymousSuperclassName, anonName);
 		if (lambdaType != LAMBDA_METHOD && !isClassTrulyLocal)
 			buffer.append(")"); // end of line (..., ...)
+		return finals == null ? anonName : null;
 	}
 
 	/**
@@ -6808,15 +6818,19 @@ private boolean addLambdaMethodReference(MethodReference node, Expression exp) {
 	 */
 	private boolean addLambda$class$Method(MethodReference node, ITypeBinding binding, Expression exp,
 			ITypeBinding declaringClass, boolean checkFinals) {
+
+
 		allowClazzNewLambda = (ALLOW_NEW_LAMBDA && getLastCharInBuffer() != '=');
 		int pt = buffer.length();
 		buffer.append("(function($class$){");
-		processLocalInstance(node, null, binding, null, null, LAMBDA_METHOD, false);
+		String anonName = processLocalInstance(node, null, binding, null, null, LAMBDA_METHOD, false);
 		buffer.append("})(");
 		appendFinalMethodQualifier(exp, declaringClass, null, FINAL_ESCAPECACHE | FINAL_LAMBDA);
 		buffer.append(")");
 		if (checkFinals && allowClazzNewLambda)
 			buffer.setLength(pt);
+		if (anonName != null && ALLOW_LAMBDA_OBJECT_REUSE)
+			addLambdaReuse(pt, anonName);		
 		return !allowClazzNewLambda;
 
 	}
@@ -6871,12 +6885,28 @@ public boolean visit(LambdaExpression node) {
 	private boolean addLambda$class$Expr(LambdaExpression node, ITypeBinding binding, boolean checkFinals) {
 		allowClazzNewLambda = (ALLOW_NEW_LAMBDA && getLastCharInBuffer() != '=');
 		int pt = buffer.length();
-		processLocalInstance(node, null, binding, null, null, LAMBDA_EXPRESSION, false);
+		String anonName = processLocalInstance(node, null, binding, null, null, LAMBDA_EXPRESSION, false);
 		if (checkFinals && allowClazzNewLambda)
 			buffer.setLength(pt);
+		if (anonName != null && ALLOW_LAMBDA_OBJECT_REUSE)
+			addLambdaReuse(pt, anonName);		
 		return !allowClazzNewLambda;
 	}
 
+	/**
+	 * allow reuse of Lambda method and expression objects when they involve no finals
+	 *  
+	 * @param pt
+	 * @param anonName
+	 */
+	private void addLambdaReuse(int pt, String anonName) {
+		String tmp = buffer.substring(pt);
+		buffer.setLength(pt);
+		anonName = getFinalJ2SClassName(anonName, FINAL_P);
+		buffer.append("(" + anonName + "$||(" + anonName + "$=(")
+			.append(tmp).append(")))");
+	}
+
 	private char getLambdaType(ITypeBinding binding) {
 		String name = removeBracketsAndFixNullPackageName(getJavaClassNameQualified(binding));
 		if (!name.startsWith("java.util.function.") || name.indexOf("To") >= 0)

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/io/File.java b/sources/net.sf.j2s.java.core/src/java/io/File.java
@@ -803,7 +803,8 @@ public boolean isDirectory() {
 //        return ((fs.getBooleanAttributes(this) & FileSystem.BA_DIRECTORY)
 //                != 0);
 //    
-    	return true;
+    	// BH 2019.09.23 return true;
+    	return false;
     	}
 
     /**