Skip to content

Commit 8443a60

Browse files
author
zhourenjian
committed
Fixed a ClassLoader bug that SWT Java2Script Application's *.*#main is not executed.
Packed some lately added/modified classes into *.z.js
1 parent 991d671 commit 8443a60

File tree

3 files changed

+71
-2
lines changed

3 files changed

+71
-2
lines changed

‎sources/net.sf.j2s.lib/.htaccess

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
<IfModule mod_expires.c>
22
ExpiresActive on
33
ExpiresDefault "access plus 5 years"
4-
</IfModule>
4+
</IfModule>
5+
<IfModule mod_deflate.c>
6+
# Netscape 4.x or IE 5.5/6.0
7+
BrowserMatch ^Mozilla/4 no-gzip
8+
# IE 5.5 and IE 6.0 have bugs! Ignore them until IE 7.0+
9+
BrowserMatch \bMSIE\s7 !no-gzip
10+
# Sometimes Opera pretends to be IE with "Mozila/4.0"
11+
BrowserMatch \bOpera !no-gzip
12+
AddOutputFilterByType DEFLATE text/css text/javascript application/x-javascript
13+
Header append Vary User-Agent
14+
</IfModule>

‎sources/net.sf.j2s.lib/build/build.xml

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@
256256
<arg value="java/util/Map.js"/>
257257
<arg value="java/util/List.js"/>
258258
<arg value="java/util/RandomAccess.js"/>
259+
260+
<arg value="java/net/URLEncoder.js"/>
261+
<arg value="java/net/URLDecoder.js"/>
259262

260263
<arg value="net/sf/j2s/ajax/HttpRequest.js"/>
261264
<arg value="net/sf/j2s/ajax/IXHRCallback.js"/>
@@ -274,6 +277,30 @@
274277
<pathelement path="${j2s.lib.project}/bin"/>
275278
</classpath>
276279
</java>
280+
281+
<java classname="net.sf.j2s.lib.build.UTF8Concat">
282+
<arg value="false"/>
283+
<arg value="${j2s.core.bin}/org/apache/harmony/luni/util/Msg.z.js"/>
284+
<arg value="${j2s.core.bin}"/>
285+
<arg value="org/apache/harmony/luni/util/Msg.js"/>
286+
<arg value="org/apache/harmony/luni/util/MsgHelp.js"/>
287+
<classpath>
288+
<pathelement path="${j2s.lib.project}/bin"/>
289+
</classpath>
290+
</java>
291+
292+
293+
<java classname="net.sf.j2s.lib.build.UTF8Concat">
294+
<arg value="false"/>
295+
<arg value="${j2s.core.bin}/java/lang/StringBuilder.z.js"/>
296+
<arg value="${j2s.core.bin}"/>
297+
<arg value="java/lang/AbstractStringBuilder.js"/>
298+
<arg value="java/lang/StringBuilder.js"/>
299+
<classpath>
300+
<pathelement path="${j2s.lib.project}/bin"/>
301+
</classpath>
302+
</java>
303+
277304
</target>
278305

279306
<!-- - - - - - - - - - - - - - - - - -
@@ -484,11 +511,11 @@
484511
<arg value="org/eclipse/swt/graphics/ImageData.js"/>
485512
<arg value="org/eclipse/swt/graphics/ImageLoader.js"/>
486513
<arg value="org/eclipse/swt/graphics/Image.js"/>
514+
-->
487515

488516
<arg value="org/eclipse/swt/graphics/Font.js"/>
489517
<arg value="org/eclipse/swt/graphics/FontData.js"/>
490518
<arg value="org/eclipse/swt/graphics/FontMetrics.js"/>
491-
-->
492519

493520
<classpath>
494521
<pathelement path="${j2s.lib.project}/bin"/>
@@ -514,6 +541,7 @@
514541
<!--
515542
-->
516543
<arg value="org/eclipse/swt/internal/browser/OS.js"/>
544+
<arg value="org/eclipse/swt/internal/browser/Popup.js"/>
517545

518546
<arg value="org/eclipse/swt/graphics/Image.js"/>
519547
<arg value="org/eclipse/swt/graphics/ImageData.js"/>
@@ -536,6 +564,20 @@
536564
</java>
537565

538566

567+
<java classname="net.sf.j2s.lib.build.UTF8Concat">
568+
<arg value="false"/>
569+
<arg value="${j2s.swt.bin}/org/eclipse/swt/SWT.z.js"/>
570+
<arg value="${j2s.swt.bin}"/>
571+
<arg value="org/eclipse/swt/SWT.js"/>
572+
<arg value="org/eclipse/swt/SWTError.js"/>
573+
<arg value="org/eclipse/swt/SWTException.js"/>
574+
575+
<classpath>
576+
<pathelement path="${j2s.lib.project}/bin"/>
577+
</classpath>
578+
</java>
579+
580+
539581
<java classname="net.sf.j2s.lib.build.UTF8Concat">
540582
<arg value="false"/>
541583
<arg value="${j2s.swt.bin}/org/eclipse/swt/layout/GridLayout.z.js"/>
@@ -657,6 +699,22 @@
657699
</java>
658700

659701

702+
<java classname="net.sf.j2s.lib.build.UTF8Concat">
703+
<arg value="false"/>
704+
<arg value="${j2s.swt.bin}/org/eclipse/swt/widgets/Common.z.js"/>
705+
<arg value="${j2s.swt.bin}"/>
706+
<arg value="org/eclipse/swt/widgets/Label.js"/>
707+
<arg value="org/eclipse/swt/widgets/Button.js"/>
708+
<arg value="org/eclipse/swt/widgets/Text.js"/>
709+
<arg value="org/eclipse/swt/widgets/Group.js"/>
710+
<arg value="org/eclipse/swt/widgets/TabFolder.js"/>
711+
712+
<classpath>
713+
<pathelement path="${j2s.lib.project}/bin"/>
714+
</classpath>
715+
</java>
716+
717+
660718
<java classname="net.sf.j2s.lib.build.UTF8Concat">
661719
<arg value="false"/>
662720
<arg value="${j2s.swt.bin}/org/eclipse/swt/custom/SashForm.z.js"/>
@@ -820,6 +878,7 @@
820878
<arg value="org/eclipse/swt/widgets/Decorations.js"/>
821879
<arg value="org/eclipse/swt/widgets/ShellManager.js"/>
822880
<arg value="org/eclipse/swt/widgets/Shell.js"/>
881+
<arg value="org/eclipse/swt/widgets/Dialog.js"/>
823882

824883
<classpath>
825884
<pathelement path="${j2s.lib.project}/bin"/>

‎sources/net.sf.j2s.lib/j2slib.zip

27.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)