java2script
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/j2s.core.jar‎
-264 Bytes b/‎sources/net.sf.j2s.core/dist/swingjs/j2s.core.jar‎
-264 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources/net.sf.j2s.core/src/j2s/core/Java2ScriptCompiler.java‎
Lines changed: 6 additions & 3 deletions b/‎sources/net.sf.j2s.core/src/j2s/core/Java2ScriptCompiler.java‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyCompiler.java‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.core/src/j2s/jmol/Java2ScriptLegacyCompiler.java‎
Lines changed: 1 addition & 1 deletion
@@ -1 +1 @@
-20231117083556 
+20231119163724 
@@ -1 +1 @@
-20231117083556 
+20231119163724 
@@ -274,7 +274,7 @@ protected boolean initializeProject(IJavaProject project, boolean isCleanBuild,
 			writeToFile(activeJ2SFile, getDefaultJ2SFile());
 		}
 		int jslLevel = javaLanguageLevel;
-		if (jslLevel == 8) {
+		if (isSwingJS) {
 			// SwingJS allows 8 or 11
 			try {
 				String ver = getProperty(J2S_COMPILER_JAVA_VERSION, "" + jslLevel);
@@ -345,14 +345,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;
 	}
 
@@ -40,7 +40,7 @@ public Java2ScriptLegacyCompiler(File f) {
 
 	@SuppressWarnings("deprecation")
 	public boolean initializeProject(IJavaProject project, boolean isCleanBuild) {
-		if (!super.initializeProject(project, isCleanBuild, AST.JLS4)) {
+		if (!super.initializeProject(project, isCleanBuild, AST.JLS8)) {
 			return false;
 		}		
 		String s = getProperty(J2S_STRING_FIXES, null);
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ protected boolean initializeProject(IJavaProject project, boolean isCleanBuild,`
`274`	`274`	`writeToFile(activeJ2SFile, getDefaultJ2SFile());`
`275`	`275`	`}`
`276`	`276`	`int jslLevel = javaLanguageLevel;`
`277`		`- if (jslLevel == 8) {`
	`277`	`+ if (isSwingJS) {`
`278`	`278`	`// SwingJS allows 8 or 11`
`279`	`279`	`try {`
`280`	`280`	`String ver = getProperty(J2S_COMPILER_JAVA_VERSION, "" + jslLevel);`
`@@ -345,14 +345,17 @@ boolean excludeFile(IFile javaSource) {`
`345`	`345`	`return excludeFile(javaSource.getFullPath().toString());`
`346`	`346`	`}`
`347`	`347`
`348`		`- private boolean excludeFile(String filePath) {`
	`348`	`+ public boolean excludeFile(String filePath) {`
`349`	`349`	`if (lstExcludedPaths != null) {`
	`350`	`+ if (filePath == null)`
	`351`	`+ return true;`
`350`	`352`	`if (filePath.indexOf('\\') >= 0)`
`351`	`353`	`filePath = filePath.replace('\\', '/');`
`352`		`- for (int i = lstExcludedPaths.size(); --i >= 0;)`
	`354`	`+ for (int i = lstExcludedPaths.size(); --i >= 0;) {`
`353`	`355`	`if (filePath.indexOf(lstExcludedPaths.get(i)) >= 0) {`
`354`	`356`	`return true;`
`355`	`357`	`}`
	`358`	`+ }`
`356`	`359`	`}`
`357`	`360`	`return false;`
`358`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Java2ScriptLegacyCompiler(File f) {`
`40`	`40`
`41`	`41`	`@SuppressWarnings("deprecation")`
`42`	`42`	`public boolean initializeProject(IJavaProject project, boolean isCleanBuild) {`
`43`		`- if (!super.initializeProject(project, isCleanBuild, AST.JLS4)) {`
	`43`	`+ if (!super.initializeProject(project, isCleanBuild, AST.JLS8)) {`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`	`46`	`String s = getProperty(J2S_STRING_FIXES, null);`