java2script
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
308 Bytes b/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
308 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar‎
91 Bytes b/‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar‎
91 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/3.3.1/SwingJS-site.zip‎
308 Bytes b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip‎
308 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar‎
91 Bytes b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar‎
91 Bytes
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp‎
Lines changed: 1 addition & 1 deletion b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java‎
Lines changed: 2 additions & 1 deletion b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java‎
Lines changed: 7 additions & 2 deletions b/‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
276 Bytes b/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
276 Bytes
@@ -1 +1 @@
-20230204184318 
+20230210093656 
@@ -1 +1 @@
-20230204184318 
+20230210093656 
@@ -25,11 +25,12 @@ public class CorePlugin extends Plugin {
 	 * "net.sf.j2s.core.jar" not "net.sf.j2s.core.3.2.5"
 	 * 
 	 */
-	public static String VERSION = "3.3.1-v5";
+	public static String VERSION = "3.3.1-v6";
 
 	// 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.02.09 -- 3.3.1.v6 fixes j2s.excluded.paths needing /src/xxxx
 	// BH 2022.06.27 -- 3.3.1-v5 fixes missing method annotations
 	// BH 2022.01.17 -- 3.3.1-v4 fixes default interface methods referencing their own static fields
 	// BH 2021.01.14 -- 3.3.1-v3 fixes missing finals for nested () -> {...}
 
@@ -428,10 +428,13 @@ private void initializeUsing(File j2sFile, int level) {
 	}
 
 	boolean excludeFile(IFile javaSource) {
-		String filePath = javaSource.getFullPath().toString();
+		return excludeFile(javaSource.getFullPath().toString());
+	}
+
+	private boolean excludeFile(String filePath) {
 		if (lstExcludedPaths != null) {
 			for (int i = lstExcludedPaths.size(); --i >= 0;)
-				if (filePath.startsWith(lstExcludedPaths.get(i))) {
+				if (filePath.indexOf(lstExcludedPaths.get(i)) >= 0) {
 					return true;
 				}
 		}
@@ -746,6 +749,8 @@ private void copySiteResources(File from, File dest) {
 	private void copyNonclassFiles(File dir, File target) {
 		if (dir.equals(target))
 			return;
+		if (excludeFile(dir.getAbsolutePath().replace('\\','/') + "/"))
+			return;
 		File[] files = dir.listFiles(filter);
 		File f = null;
 		if (files != null)