java2script · BobHanson · Jun 17, 2020 · Jun 13, 2020 · Jun 14, 2020 · Jun 15, 2020
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/differences.txt b/sources/net.sf.j2s.core/dist/swingjs/differences.txt
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 @@
-20200602150211 
+20200617130212 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/differences.txt b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/differences.txt
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9-j11/timestamp
@@ -1 +1 @@
-20200602150211 
+20200617120936 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/differences.txt b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/differences.txt
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200601144428 
+20200617130212 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -30,6 +30,8 @@ public class CorePlugin extends Plugin {
 	// if you change the x.x.x number, be sure to also indicate that in 
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
+
+	// BH 2020.06.17 -- 3.2.9-v1j fix for functional interface this::privateMethod
 	// BH 2020.05.01 -- 3.2.9-v1i fix for nested lambda methods
 	// BH 2020.04.26 -- 3.2.9-v1h fix for inner classes of interfaces duplicated; fix for api.js inner class method names unqualified
 	// BH 2020.04.15 -- 3.2.9-v1g fix for qualified super() in inner classes using Class.super_ call (Tracker)

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
@@ -135,6 +135,7 @@
 
 // TODO: superclass inheritance for JAXB XmlAccessorType
 
+//BH 2020.06.17 -- 3.2.9-v1j fix for functional interface this::privateMethod
 //BH 2020.05.01 -- 3.2.9-v1i fix for nested lambda methods
 //BH 2020.04.26 -- 3.2.9-v1h fix for inner classes of interfaces duplicated; fix for api.js inner class method names unqualified
 //BH 2020.04.15 -- 3.2.9-v1g fix for qualified super() in inner classes using Class.super_ call (Tracker)
@@ -1614,7 +1615,7 @@ private boolean addMethodInvocation(SimpleName javaQualifier, List<?> arguments,
 						|| "java.lang.Class".equals(removeBracketsAndFixNullPackageName(declaringClassJavaClassName)) // String.class::cast
 				) // BH Added 2019.05.13
 						&& lambdaArity == mBinding.getParameterTypes().length));
-				String opening = (classIsTarget ? "$$." : "t.") + finalMethodNameWith$Params + ".apply("
+				String opening = (!classIsTarget ? "t." : isPrivate ? "" : "$$.") + finalMethodNameWith$Params + ".apply("
 						+ (isStatic ? "null" : classIsTarget ? "$$" : "t") + ",[";
 				buffer.append(opening);
 				buffer.append(getLambdaParamList(mBinding, lambdaArity));

diff --git a/sources/net.sf.j2s.java.core/build-core-applet.xml b/sources/net.sf.j2s.java.core/build-core-applet.xml
@@ -1,74 +1,77 @@
-<project name="JSmol" default="toJs" basedir=".">
-
-   <property name="site.path" value="site/swingjs" />
-
-   <target name="toJs" id="toJs">
-
-  	<!-- create a NON svn local directory only containing JS files
-
-  	<echo>Deleting the site directory.</echo>
-   	 	<delete quiet="true" dir="site" />
-    -->
-
-   	<echo>creating swingjs2.js</echo>
-   	<concat destfile="srcjs/swingjs2.js">
-	   	<filelist dir="srcjs/js" files="jquery.js,j2sJQueryExt.js,j2sApplet.js,j2sClazz.js,SwingJSApplet.js" />
-   	</concat>
-
-   	<echo>copying srcjs files into site</echo>
-    <copy todir="site/swingjs">
-      <fileset dir="srcjs"/>
-    </copy>
-
-   	<!-- make core files -->
-
-   	<echo>creating and compressing core files - warnings are OK; "does not exist" is trouble</echo>
-
-   	<loadresource property="coreclasses">
-       <file file="_j2sclasslist.txt"/>
-    </loadresource>
-
-   	<echo>copying _j2sclasslist.txt into dist/</echo>
-    <copy todir="dist" file="_j2sclasslist.txt" />
-
-    <antcall target="call-core">
-        <param name="call-core.name" value="swingjs" />
-        <param name="call-core.list" value="
-         	${coreclasses}
-        	" />
-    </antcall>
-
-   	<echo>creating dist/SwingJS-site.zip </echo>
-   	<zip destfile="dist/SwingJS-site.zip" basedir="site" >
-   		<exclude name="swingjs/j2s/test/**"/>
-   		<exclude name="*.html"/>
-   	</zip>
-
-  </target>
-
-
-	  <target name="call-core" id="call-core">
-	   	<echo>......Creating core${call-core.name}.js</echo>
-	   	<concat destfile="${site.path}/js/core/tmp.js" fixlastline="yes">
-	   		<filelist dir="${site.path}/j2s" files="${call-core.list}" />
-	   	</concat> 
-
-	  	<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz." value="Clazz_"/>
-	  	<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz__" value="Clazz._"/>
-	   	<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.js</echo> 	
-	   	<concat destfile="${site.path}/j2s/core/core${call-core.name}.js"><filelist dir="${site.path}/js" files="
-	   		core/coretop2.js
-	   		core/tmp.js
-	   		core/corebottom2.js
-	   		" />
-	   	</concat>
-	   	<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.z.js</echo> 	
-	   	<java jar="jars/closure_compiler.jar" fork="true" dir="${site.path}/j2s/core" failonerror="false">
-	   		<arg line="--js core${call-core.name}.js --js_output_file core${call-core.name}.z.js" />
-	    </java>
-	 	<delete quiet="true" file="${site.path}/js/core/tmp.js" />
-	  </target>
-
-
-
-</project>
+<project name="JSmol" default="toJs" basedir=".">
+
+   <property name="site.path" value="site/swingjs" />
+
+   <target name="toJs" id="toJs">
+
+  	<!-- create a NON svn local directory only containing JS files
+
+  	<echo>Deleting the site directory.</echo>
+   	 	<delete quiet="true" dir="site" />
+    -->
+
+   	<echo>creating swingjs2.js</echo>
+   	<concat destfile="srcjs/swingjs2.js">
+	   	<filelist dir="srcjs/js" files="jquery.js,j2sJQueryExt.js,j2sApplet.js,j2sClazz.js,SwingJSApplet.js" />
+   	</concat>
+
+   	<echo>copying srcjs files into site</echo>
+    <copy todir="${site.path}">
+      <fileset dir="srcjs"/>
+    </copy>
+
+   	<!-- make core files -->
+
+   	<echo>creating and compressing core files - warnings are OK; "does not exist" is trouble</echo>
+
+   	<loadresource property="coreclasses">
+       <file file="_j2sclasslist.txt"/>
+    </loadresource>
+
+   	<echo>copying _j2sclasslist.txt into dist/</echo>
+    <copy todir="dist" file="_j2sclasslist.txt" />
+
+   	<echo>copying differences.txt into dist/</echo>
+    <copy todir="dist" file="doc/differences.txt" />
+
+    <antcall target="call-core">
+        <param name="call-core.name" value="swingjs" />
+        <param name="call-core.list" value="
+         	${coreclasses}
+        	" />
+    </antcall>
+
+   	<echo>creating dist/SwingJS-site.zip </echo>
+   	<zip destfile="dist/SwingJS-site.zip" basedir="site" >
+   		<exclude name="swingjs/j2s/test/**"/>
+   		<exclude name="*.html"/>
+   	</zip>
+
+  </target>
+
+
+	  <target name="call-core" id="call-core">
+	   	<echo>......Creating core${call-core.name}.js</echo>
+	   	<concat destfile="${site.path}/js/core/tmp.js" fixlastline="yes">
+	   		<filelist dir="${site.path}/j2s" files="${call-core.list}" />
+	   	</concat> 
+
+	  	<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz." value="Clazz_"/>
+	  	<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz__" value="Clazz._"/>
+	   	<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.js</echo> 	
+	   	<concat destfile="${site.path}/j2s/core/core${call-core.name}.js"><filelist dir="${site.path}/js" files="
+	   		core/coretop2.js
+	   		core/tmp.js
+	   		core/corebottom2.js
+	   		" />
+	   	</concat>
+	   	<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.z.js</echo> 	
+	   	<java jar="jars/closure_compiler.jar" fork="true" dir="${site.path}/j2s/core" failonerror="false">
+	   		<arg line="--js core${call-core.name}.js --js_output_file core${call-core.name}.z.js" />
+	    </java>
+	 	<delete quiet="true" file="${site.path}/js/core/tmp.js" />
+	  </target>
+
+
+
+</project>
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip