Skip to content

Commit 7bf2383

Browse files
BobHansonBobHanson
authored
Merge pull request #260 from BobHanson/hanson1
Hanson1
2 parents 40d21a4 + 6b2be11 commit 7bf2383

25 files changed

Lines changed: 1041 additions & 852 deletions

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

28.9 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/differences.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
java2script/SwingJS Notes
22
=========================
33

4+
updated 3/11/2023 -- adds support for Java Regex Matcher.start/end(groupID) and .start/end(groupName)
45
updated 12/31/2020 -- full support for 64-bit long
56
updated 12/6/2020 -- note about restrictions on long, including BitSet and Scanner
67
updated 3/21/2020 -- adds note about HashMap, Hashtable, and HashSet iterator ordering

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

105 KB
Binary file not shown.

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
20230329174944
3-
=======
4-
20230329170441
5-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script
1+
20230831104534

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

28.9 KB
Binary file not shown.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
java2script/SwingJS Notes
22
=========================
33

4+
updated 3/11/2023 -- adds support for Java Regex Matcher.start/end(groupID) and .start/end(groupName)
45
updated 12/31/2020 -- full support for 64-bit long
56
updated 12/6/2020 -- note about restrictions on long, including BitSet and Scanner
67
updated 3/21/2020 -- adds note about HashMap, Hashtable, and HashSet iterator ordering

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

105 KB
Binary file not shown.

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
20230329174944
3-
=======
4-
20230329170441
5-
>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script
1+
20230831104534

‎sources/net.sf.j2s.java.core/_j2sheadlessclasslist.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
java/lang/Class.js
2+
java/lang/Runtime.js
3+
java/lang/Shutdown.js
4+
java/lang/Thread.js
5+
java/lang/ThreadGroup.js
6+
javajs/util/JSThread.js
7+
swingjs/JSThreadGroup.js

‎sources/net.sf.j2s.java.core/build-core-headless.xml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<project name="JSmol" default="toJs" basedir=".">
2+
3+
<property name="site.path" value="site/swingjs" />
4+
5+
<target name="toJs" id="toJs">
6+
7+
8+
<property name="site.dir" value="site" />
9+
<property name="j2s.dir" value="${site.dir}/swingjs/j2s" />
10+
<!-- make core files -->
11+
12+
<echo>creating and compressing core files - warnings are OK; "does not exist" is trouble</echo>
13+
14+
<loadresource property="coreclasses">
15+
<file file="_j2sheadlessclasslist.txt"/>
16+
</loadresource>
17+
18+
<antcall target="call-core">
19+
<param name="call-core.name" value="swingjsheadless" />
20+
<param name="call-core.list" value="
21+
${coreclasses}
22+
" />
23+
</antcall>
24+
25+
26+
</target>
27+
28+
29+
<target name="call-core" id="call-core">
30+
<echo>......Creating core${call-core.name}.js</echo>
31+
<concat destfile="${site.path}/js/core/tmp.js" fixlastline="yes">
32+
<filelist dir="${site.path}/j2s" files="${call-core.list}" />
33+
</concat>
34+
35+
<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz." value="Clazz_"/>
36+
<replace dir="${site.path}/js/core" includes="tmp.js" token="Clazz__" value="Clazz._"/>
37+
<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.js</echo>
38+
<concat destfile="${site.path}/j2s/core/core${call-core.name}.js"><filelist dir="${site.path}/js" files="
39+
core/coretop2.js
40+
core/tmp.js
41+
core/corebottom2.js
42+
" />
43+
</concat>
44+
<echo>......Generating ${site.path}/j2s/core/core${call-core.name}.z.js</echo>
45+
<java jar="jars/closure_compiler.jar" fork="true" dir="${site.path}/j2s/core" failonerror="false">
46+
<arg line="--js core${call-core.name}.js --js_output_file core${call-core.name}.z.js" />
47+
</java>
48+
<delete quiet="true" file="${site.path}/js/core/tmp.js" />
49+
</target>
50+
51+
52+
53+
</project>

0 commit comments

Comments
 (0)