Skip to content

Commit e4b0c37

Browse files
hansonrhansonr
authored andcommitted
into yadav1 Conflicts: sources/net.sf.j2s.java.core/dist/SwingJS-site.zip sources/net.sf.j2s.java.core/srcjs/swingjs2.js
2 parents 9fe3276 + 250212a commit e4b0c37

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed
-2.98 MB
Binary file not shown.

sources/net.sf.j2s.java.core/srcjs/swingjs2.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13440,7 +13440,11 @@ if (!J2S._version)
1344013440
// TODO: CharacterSequence does not implement Java 8 default methods chars() or codePoints()
1344113441
// It is possible that these might be loaded dynamically.
1344213442

13443+
<<<<<<< HEAD
1344313444
// BH 7/22/2018 adds System.getProperty("java.vendor") == "SwingJS/OpenJDK"
13445+
=======
13446+
// BH 7/22/2018 adds System.getProperty("java.vendor") == "OpenJDK"
13447+
>>>>>>> branch 'yadav1' of https://github.com/BobHanson/java2script.git
1344413448
// BH 7/22/2018 adds Math.IEEEremainder
1344513449
// BH 7/20/2018 removes def of Closeable, DataInput, DataOutput, Iterable, Comparator
1344613450
// BH 7/19/2018 removes Constructor, Method, and Field code here -- now in their .js files
@@ -16093,7 +16097,11 @@ java.lang.System = System = {
1609316097
v = "50";
1609416098
break;
1609516099
case "java.vendor":
16100+
<<<<<<< HEAD
1609616101
v = "SwingJS/OpenJDK";
16102+
=======
16103+
v = "OpenJDK";
16104+
>>>>>>> branch 'yadav1' of https://github.com/BobHanson/java2script.git
1609716105
case "java.version":
1609816106
v = "1.6-1.8";
1609916107
break;

0 commit comments

Comments
 (0)