java2script · BobHanson · Nov 28, 2023 · Jun 9, 2023 · Nov 16, 2023 · Nov 17, 2023
diff --git a/sources/net.sf.j2s.core/build.properties b/sources/net.sf.j2s.core/build.properties
@@ -2,5 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
-               schema/
+               plugin.xml
+
diff --git a/sources/net.sf.j2s.core/dist/jmol/README.txt b/sources/net.sf.j2s.core/dist/jmol/README.txt
@@ -0,0 +1,2 @@
+Looking for the transpiler? It's in the dist/swingjs folder.
+
diff --git a/sources/net.sf.j2s.core/dist/swingjs/j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/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 @@
-20231115195339 
+20231128000108 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp
@@ -1 +1 @@
-20231115195339 
+20231128000108 
diff --git a/sources/net.sf.j2s.core/src/j2s/CorePlugin.java b/sources/net.sf.j2s.core/src/j2s/CorePlugin.java
@@ -26,11 +26,13 @@ public class CorePlugin extends Plugin {
 	 * the actual "x.y.z" version is specified in plugin.xml.
 	 * 
 	 */
-	public static String VERSION = "5.0.1-v1";
+	public static String VERSION = "5.0.1-v2";
 
 	// 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 2023.11.27 -- 5.0.1-v2 final refactoring and creatiton of J2SUtil
+	// BH 2023.11.21 -- 5.0.1-v2 adds Java8 syntaxes for try and switch; removes dependency for instanceOf and exception checking
 	// BH 2023.11.09 -- 5.0.1-v1 merges Jmol legacy (.j2sjmol) with Java8//11 (.j2s)
 	// BH 2023.03.29 -- 3.3.1-v7 fixes outer static method call from within lambda expression. 
 	// BH 2023.02.09 -- 3.3.1.v6 fixes j2s.excluded.paths needing /src/xxxx

diff --git a/sources/net.sf.j2s.core/src/j2s/core/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/j2s/core/Java2ScriptCompiler.java
@@ -23,7 +23,7 @@
 import org.eclipse.jdt.core.dom.ASTParser;
 
 import j2s.CorePlugin;
-import j2s.jmol.Java2ScriptLegacyCompiler;
+import j2s.jmol.J2SLegacyCompiler;
 import j2s.swingjs.Java2ScriptSwingJSCompiler;
 
 /**
@@ -84,10 +84,13 @@ public abstract class Java2ScriptCompiler {
 
 	abstract public boolean compileToJavaScript(IFile javaSource, String trailer);
 
-	abstract protected String getDefaultJ2SFile();
-
 	abstract public void finalizeProject();
 
+	/*
+	 * To save a default file with comments specific to this transpiler.
+	 */
+	abstract protected String getDefaultJ2SFileContents();
+
 	/**
 	 * The name of the J2S options file, aka as the "Dot-j2s" file. Please do not
 	 * change this value.
@@ -99,7 +102,6 @@ public abstract class Java2ScriptCompiler {
 	protected Properties props;
 
 	protected String projectFolder;
-//	protected String outputPath;
 	protected String siteFolder;
 	protected String j2sPath;
 	protected String excludedPaths;
@@ -114,6 +116,9 @@ public abstract class Java2ScriptCompiler {
 
 	protected IJavaProject project;
 
+	protected int nResources;
+
+
 	/**
 	 * This will activate @j2sDebug blocks, at least in SwingJS
 	 */
@@ -158,7 +163,7 @@ public static Java2ScriptCompiler newCompiler(IJavaProject project, BuildContext
 		File f = getJ2SConfigName(project, files[0]);
 		return ( f == null ? null 
 				: J2S_CONFIG_JMOL.equals(j2stype = f.getName()) ? 
-				new Java2ScriptLegacyCompiler(f)
+				new J2SLegacyCompiler(f)
 				: J2S_CONFIG_SWINGJS.equals(j2stype) ?
 						new Java2ScriptSwingJSCompiler(f) : null);
 	}
@@ -271,10 +276,10 @@ protected boolean initializeProject(IJavaProject project, boolean isCleanBuild,
 			return false;
 		}
 		if (getFileContents(activeJ2SFile).trim().length() == 0) {
-			writeToFile(activeJ2SFile, getDefaultJ2SFile());
+			writeToFile(activeJ2SFile, getDefaultJ2SFileContents());
 		}
 		int jslLevel = javaLanguageLevel;
-		if (jslLevel == 8) {
+		if (isSwingJS) {
 			// SwingJS allows 8 or 11
 			try {
 				String ver = getProperty(J2S_COMPILER_JAVA_VERSION, "" + jslLevel);
@@ -345,14 +350,17 @@ boolean excludeFile(IFile javaSource) {
 		return excludeFile(javaSource.getFullPath().toString());
 	}
 
-	private boolean excludeFile(String filePath) {
+	public boolean excludeFile(String filePath) {
 		if (lstExcludedPaths != null) {
+			if (filePath == null)
+				return true;
 			if (filePath.indexOf('\\') >= 0)
 				filePath = filePath.replace('\\', '/');
-			for (int i = lstExcludedPaths.size(); --i >= 0;)
+			for (int i = lstExcludedPaths.size(); --i >= 0;) {
 				if (filePath.indexOf(lstExcludedPaths.get(i)) >= 0) {
 					return true;
 				}
+			}
 		}
 		return false;
 	}
@@ -475,25 +483,24 @@ private int copyNonclassFiles(File dir, File target, int n) {
 		return n;
 	}
 
-	protected int checkCopiedResources(String packageName, String sourceLocation, String outputDir) {
+	protected void copyAllResources(String packageName, String sourceLocation) {		
 		int pt = packageName.indexOf(".");
 		if (pt >= 0)
 			packageName = packageName.substring(0, pt);
 		if (copiedResourcePackages.contains(packageName))
-			return 0;
+			return;
 		copiedResourcePackages.add(packageName);
 		pt = sourceLocation.lastIndexOf("/" + packageName + "/");
 		if (pt <= 0) {
 			// also don't allow "" root directory
 			if (!"_".equals(packageName))
 				System.out.println(
 						"J2S ignoring bad sourceLocation for package \"" + packageName + "\": " + sourceLocation);
-			return 0;
+			return;
 		}
-		String sourceDir = sourceLocation.substring(0, pt);
-		File src = new File(sourceDir, packageName);
-		File dest = new File(outputDir, packageName);
-		return copySiteResources(src, dest);
+		File src = new File(sourceLocation.substring(0, pt), packageName);
+		File dest = new File(j2sPath, packageName);
+		nResources += copySiteResources(src, dest);
 	}
 
 	protected String fixPackageName(String name) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Looking for the transpiler? It's in the dist/swingjs folder.