transpiler try/catch for exceptions and fix for bad package name

BobHanson · BobHanson · commit e82548c895ef · 2019-11-05T12:17:45.000-06:00
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 @@
-20191104164911 
+20191105121713 
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 @@
-20191104164911 
+20191105121713 
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
@@ -137,7 +137,7 @@ public void buildFinished(IJavaProject project) {
 			int ntotal = 0, nerror = 0;
 			for (int j = 0; j < contexts.size(); j++) {
 				BuildContext[] files = contexts.get(j);
-				System.out.println("J2S building JavaScript for " + files.length + " file"+plural(files.length));
+				System.out.println("J2S building JavaScript for " + files.length + " file" + plural(files.length));
 
 				for (int i = 0, n = files.length; i < n; i++) {
 // trying to keep the progess monitor running - didn't work
@@ -157,23 +157,29 @@ public void buildFinished(IJavaProject project) {
 						System.out.println("J2S excluded " + filePath);
 					} else {
 						System.out.println("J2S transpiling (" + (i + 1) + "/" + n + ") " + filePath);
-						if (j2sCompiler.compileToJavaScript(f)) {
-							ntotal++;
-						} else {
-							nerror++;
-							System.out.println("J2S Error processing " + filePath);
-							if (breakOnError)
-								break;
+						try {
+							if (j2sCompiler.compileToJavaScript(f)) {
+								ntotal++;
+							} else {
+								nerror++;
+								System.out.println("J2S Error processing " + filePath);
+								if (breakOnError)
+									break;
+							}
+						} catch (Exception e) {
+							System.out.println("J2S Exception " + e);
+							e.printStackTrace(System.out);
+							e.printStackTrace(System.err);
 						}
 					}
 				}
 			}
 			j2sCompiler.finalizeProject();
 			contexts = null;
-			System.out.println(
-					"J2S buildFinished " + ntotal + " file"+plural(ntotal) + " transpiled for " + project.getProject().getLocation());
+			System.out.println("J2S buildFinished " + ntotal + " file" + plural(ntotal) + " transpiled for "
+					+ project.getProject().getLocation());
 			System.out.println("J2S buildFinished nerror = " + nerror + " " + new Date());
-		}	
+		}
 		isCleanBuild = false;
 	}
 
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
@@ -390,11 +390,17 @@ boolean compileToJavaScript(IFile javaSource) {
 			if (pt >= 0)
 				packageName = packageName.substring(0, pt);
 			if (!copyResources.contains(packageName)) {
-				copyResources.add(packageName);
-				String sourceDir = sourceLocation.substring(0, sourceLocation.lastIndexOf("/" + packageName + "/"));
-				File src = new File(sourceDir, packageName);
-				File dest = new File(j2sPath, packageName);
-				copySiteResources(src, dest);
+				copyResources.add(packageName);				
+				pt = sourceLocation.lastIndexOf("/" + packageName + "/");
+				if (pt <= 0) {
+					// also don't allow "" root directory
+					System.out.println("J2S ignoring bad sourceLocation for package \"" + packageName + "\": " + sourceLocation);
+				} else {
+					String sourceDir = sourceLocation.substring(0, pt);
+					File src = new File(sourceDir, packageName);
+					File dest = new File(j2sPath, packageName);
+					copySiteResources(src, dest);
+				}
 			}
 		}
 		return true;
