Skip to content

Commit 6475f2e

Browse files
BobHansonBobHanson
authored
Merge pull request #246 from BobHanson/hanson1
Hanson1
2 parents 7678b47 + 43c90ef commit 6475f2e

File tree

20 files changed

+554
-330
lines changed

20 files changed

+554
-330
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

783 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar‎

91 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20230202011832
1+
20230216124208

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip‎

783 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar‎

91 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20230202011832
1+
20230216124208

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ public class CorePlugin extends Plugin {
2525
* "net.sf.j2s.core.jar" not "net.sf.j2s.core.3.2.5"
2626
*
2727
*/
28-
public static String VERSION = "3.3.1-v5";
28+
public static String VERSION = "3.3.1-v6";
2929

3030
// if you change the x.x.x number, be sure to also indicate that in
3131
// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
3232

33+
// BH 2023.02.09 -- 3.3.1.v6 fixes j2s.excluded.paths needing /src/xxxx
3334
// BH 2022.06.27 -- 3.3.1-v5 fixes missing method annotations
3435
// BH 2022.01.17 -- 3.3.1-v4 fixes default interface methods referencing their own static fields
3536
// BH 2021.01.14 -- 3.3.1-v3 fixes missing finals for nested () -> {...}

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,13 @@ private void initializeUsing(File j2sFile, int level) {
428428
}
429429

430430
boolean excludeFile(IFile javaSource) {
431-
String filePath = javaSource.getFullPath().toString();
431+
return excludeFile(javaSource.getFullPath().toString());
432+
}
433+
434+
private boolean excludeFile(String filePath) {
432435
if (lstExcludedPaths != null) {
433436
for (int i = lstExcludedPaths.size(); --i >= 0;)
434-
if (filePath.startsWith(lstExcludedPaths.get(i))) {
437+
if (filePath.indexOf(lstExcludedPaths.get(i)) >= 0) {
435438
return true;
436439
}
437440
}
@@ -746,6 +749,8 @@ private void copySiteResources(File from, File dest) {
746749
private void copyNonclassFiles(File dir, File target) {
747750
if (dir.equals(target))
748751
return;
752+
if (excludeFile(dir.getAbsolutePath().replace('\\','/') + "/"))
753+
return;
749754
File[] files = dir.listFiles(filter);
750755
File f = null;
751756
if (files != null)

‎sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
import org.eclipse.jdt.core.dom.WildcardType;
135135

136136
// TODO: superclass inheritance for JAXB XmlAccessorType
137+
// TODO: Transpiler bug allows static String name, but JavaScript function().name is read-only and will be "clazz"
137138

138139
//BH 2022.01.17 -- 3.3.1-v4 fixes default interface methods referencing their own static fields
139140
//BH 2021.01.14 -- 3.3.1-v3 fixes missing finals for nested () -> {...}

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

783 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)