Skip to content

Commit bac9709

Browse files
BobHansonBobHanson
authored
Merge pull request #24 from BobHanson/yadav1
Yadav1
2 parents 0c6f023 + 5ab9c43 commit bac9709

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+6478
-1351
lines changed

‎sources/net.sf.j2s.core/README.txt‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
11
The net.sf.j2s.core Eclipse project creates the Java2Script transpiler for SwingJS.
22

3-
See the dist/dropins folder for the latest distribution and installation notes.
3+
See the dist/dropins folder for the latest distribution and installation notes.
4+
5+
The seed Eclipse project site/ directory for all SwingJS projects can be found at
6+
7+
https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.java.core/SwingJS-site.zip?raw=true
8+
9+
10+
Known issues: 2/2018
11+
12+
Background and drawing using g.fill
13+
14+
Drawing to a canvas and setting background color can be incompatible. It is recommended that
15+
if the canvas is being painted using graphic calls, that the background color also be painted that way
16+
rather than using setBackground
17+
18+
19+

‎sources/net.sf.j2s.core/dist/README.txt‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
SwingJS distribution README.txt
2+
3+
SwingJS has been successfully tested in Eclipse Neon and Oxygen on Mac and Windows platforms.
4+
(No reason to believe it would not also work for Linux; just haven't tried that recently.)
5+
6+
INSTALLATION INSTRUCTIONS
7+
8+
Eclipse Neon or higher is necessary.
9+
10+
1. net.sf.j2s.core_3.1.1.jar should be copied to the eclipse/dropins
11+
directory **AS net.sf.j2s.core.jar dropping the version info**
12+
because otherwise Eclipse will not recognize an update.
13+
14+
We do not know why this is necessary, but it appears to be. If you leave
15+
the version in the name, Eclipse will not be able to replace it with a
16+
newer version later. From what we can tell.
17+
18+
On Mac systems, this directory is
19+
20+
/Applications/Eclipse.app/Contents/Eclipse/dropins
21+
22+
2. restart Eclipse and check for the presence of the plug-in at
23+
help...about Eclipse...installation details...Plug-ins...(wait several seconds for tabulation)
24+
25+
search for "j2s" to find j2s.sourceforge.net Java2Script Core
26+
27+
If that is not there, you don't have net.sf.j2s.core.jar in the proper directory.
28+
29+
3. Create an Eclipse Java project for your work, if you have not done so already.
30+
If your source code is not all already in src/, navigate to the project...properties...Java Build Path...source
31+
and add all the source directories you need.
32+
33+
4. Create in the Eclipse project the file:
34+
35+
.j2s
36+
37+
containing simply:
38+
39+
j2s.compiler.status=enable
40+
41+
5. Modify the .project file to indicate the j2s transpiler is to be used,
42+
changing the buildSpec buildCommand from
43+
44+
org.eclipse.jdt.core.javabuilder
45+
46+
to
47+
48+
net.sf.j2s.core.java2scriptbuilder
49+
50+
6. All of the JavaScript produced will be in the project site/ directory.
51+
You must prepopulate this site with all the JavaScript required by the
52+
JavaScript version of the JVM. The most recent version of site/ is at
53+
54+
https://github.com/BobHanson/java2script/blob/master/sources/net.sf.j2s.java.core/SwingJS-site.zip?raw=true
55+
56+
Occasional additions to the java.* classes are made to the above-mentioned zip file.
57+
58+
If you find you are missing a class, please contact me (Bob Hanson) at hansonr@stolaf.edu.
59+
You can try adding these yourself by **temporarily** adding one or more of the
60+
Java classes found at http://grepcode.com to the proper package. If you do that, be sure
61+
to use the OpenJDK version. Most of the code in the SwingJS project started with Java 6-b14 or 6-b27.
62+
Build your project, then delete these Java files, because you do not necessarily want your Java
63+
code using that version, just JavaScript.
64+
65+
A full site with many examples is at https://chemapps.stolaf.edu/swingjs/site
66+
67+
VARNA development is at https://github.com/BobHanson/VARNA
68+
working site is https://chemapps.stolaf.edu/swingjs/varna
69+
70+
Physlets development is at https://github.com/BobHanson/Physlets-SwingJS
71+
working site is https://chemapps.stolaf.edu/swingjs/physlets
72+
73+
As of Feb. 17, 2018, we are actively converting a variety of functioning Java applets.
74+
75+
The physlets Animator, Doppler, and Optics are working.
76+
77+
As of Jan. 2, 2018, all known Java-to-JavaScript issues have been dealt with.
78+
Efficient Google Closure Compiler compression is in place.
79+
80+
As of Dec. 17, 2017, SwingJS is fully operational in its "version 2" format,
81+
which includes fully qualified method, array, and number typing.
82+

‎sources/net.sf.j2s.core/dist/dropins/README.txt‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

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

141 Bytes
Binary file not shown.

sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core_3.1.1.jar renamed to sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar

199 KB
Binary file not shown.

‎sources/net.sf.j2s.core/site_versions/site.zip‎

-8.95 MB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,7 +1811,7 @@ private static boolean isObjectOrNull(ITypeBinding type) {
18111811

18121812
private final static String CHARCODEAT0 = ".$c()";
18131813

1814-
private final static String defaultNonQualified = "javajs.api.js;swingjs.api.js;swingjs.JSToolkit;";
1814+
private final static String defaultNonQualified = "javajs.api.js;swingjs.api.js;swingjs.JSToolkit;netscape;";
18151815

18161816
private static String[] nonQualifiedPackages;
18171817

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,10 @@ private static void writeToFile(File file, String data) {
310310
* @return default template with _NAME_, _CODE_, and _MAIN_ to fill in.
311311
*/
312312
private String getDefaultHTMLTemplate() {
313-
String ret = "<!DOCTYPE html>\n<html><title>SwingJS test _NAME_</title>\n"
314-
+"<head><meta charset=\"utf-8\" />\n"
313+
String ret = "<!DOCTYPE html>\n<html>\n"
314+
+"<head>\n"
315+
+"<title>SwingJS test _NAME_</title>"
316+
+"<meta charset=\"utf-8\" />\n"
315317
+"<script src=\"swingjs/swingjs2.js\"></script>\n"
316318
+"<script>\n"
317319
+"if (!self.SwingJS)alert('swingjs2.js was not found. It needs to be in swingjs folder in the same directory as ' + document.location.href)\n"
@@ -320,6 +322,7 @@ private String getDefaultHTMLTemplate() {
320322
+" main: _MAIN_,\n"
321323
+" width: 850,\n"
322324
+" height: 550,\n"
325+
+" readyFunction: null,\n"
323326
+" serverURL: 'https://chemapps.stolaf.edu/jmol/jsmol/php/jsmol.php',\n"
324327
+" j2sPath: 'swingjs/j2s',\n"
325328
+" console:'sysoutdiv',\n"
@@ -330,7 +333,7 @@ private String getDefaultHTMLTemplate() {
330333
+"getClassList = function(){J2S._saveFile('_j2sclasslist.txt', Clazz.ClassFilesLoaded.sort().join('\\n'))}\n"
331334
+"</script>\n"
332335
+"<div style=\"position:absolute;left:900px;top:30px;width:600px;height:300px;\">\n"
333-
+"<div id=sysoutdiv style=\"border:1px solid green;width:100%;height:95%;overflow:auto\"></div>\n"
336+
+"<div id=\"sysoutdiv\" style=\"border:1px solid green;width:100%;height:95%;overflow:auto\"></div>\n"
334337
+"This is System.out. <a href=\"javascript:testApplet._clearConsole()\">clear it</a> <br>Add ?j2snocore to URL to see full class list; ?j2sdebug to use uncompressed j2s/core files <br><a href=\"javascript:getClassList()\">get _j2sClassList.txt</a>\n"
335338
+"</div>\n"
336339
+"</body>\n"
@@ -379,6 +382,7 @@ private static void copyNonclassFiles(File dir, File target) {
379382
if (dir.equals(target))
380383
return;
381384
File[] files = dir.listFiles(filter);
385+
System.out.println("copy nonclassFiles " + dir + " to " + target + " [" + (files != null ? files.length : "") + "]");
382386
File f = null;
383387
if (files != null)
384388
try {
@@ -393,7 +397,7 @@ private static void copyNonclassFiles(File dir, File target) {
393397
} else {
394398
Files.copy(f.toPath(), new File(target, f.getName()).toPath(),
395399
StandardCopyOption.REPLACE_EXISTING);
396-
System.err.println("copied " + f + " to " + target);
400+
System. err.println("copied " + f + " to " + target);
397401
}
398402
}
399403
} catch (IOException e1) {

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

23 KB
Binary file not shown.

0 commit comments

Comments
 (0)