BobHanson · BobHanson · Jan 3, 2019 · Dec 29, 2018 · Dec 29, 2018 · Dec 29, 2018
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 @@
-20181228223849 
+20190102082521 
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 @@
-20181228223849 
+20190102082521 
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
@@ -19,7 +19,8 @@ public class CorePlugin extends Plugin {
 	 * register the bundle version properly. So we use VERSION here instead.
 	 * 
 	 */
-	public static String VERSION = "3.2.4.05";
+	public static String VERSION = "3.2.4.06";
+	// BH 1/2/2019 -- 3.2.4.06 fixes try(resources) with more than one resource missing semicolon
 	// BH 12/13/2018 -- 3.2.4.05 fixes problem with OuterClass.this.foo() not using .apply()
 	// BH 11/10/2018 -- 3.2.4.04 additional support for JAXB
 	// BH 11/4/2018 -- 3.2.4.02 broad JAXB support

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
@@ -1419,6 +1419,7 @@ public boolean visit(TryStatement node) {
 				ASTNode resource = resources.get(i);
 				if (resource instanceof VariableDeclarationExpression) {
 					resource.accept(this);
+					buffer.append(";");
 				} else {
 					// Java 9 -- just a Name.
 					buffer.append("/* Java 9 resource " + resource + "*/\r\n");
@@ -4560,13 +4561,13 @@ private String getFinalInnerClassList(String javaClassName) {
 		String s = getFinalInnerClassList(javaClassName);
 		if (doCache) {
 			Integer n = package_htIncludeNames.get(s);
-			if (n != null)
-				return "$I$(" + n + ")";
-			if (!s.endsWith("Exception'")) {
+			if (n == null && !s.endsWith("Exception'")) {
 				// count starts at 1, because i$[0] is the list
 				package_htIncludeNames.put(s, n = new Integer(++package_includeCount[0]));
 				package_includes.append(package_includeCount[0] == 1 ? ",I$=[[0," : ",").append(s);
 			}
+			if (n != null)
+				return "$I$(" + n + ")";
 		}
 		return "Clazz.load(" + s + ")";
 	}

diff --git a/sources/net.sf.j2s.java.core/.gitignore b/sources/net.sf.j2s.java.core/.gitignore
@@ -1,2 +1,3 @@
 /bin/
 /site/
+/site1/
diff --git a/sources/net.sf.j2s.java.core/.settings/org.eclipse.core.resources.prefs b/sources/net.sf.j2s.java.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/test/Test_Char.java=UTF-8
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     /bin/
     /site/
+    /site1/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding//src/test/Test_Char.java=UTF-8