Skip to content

Commit b3db746

Browse files
BobHansonBobHanson
authored
Merge pull request #230 from BobHanson/master
omnibus pull from bobhanson/java2Script
2 parents df0959d + 76dc748 commit b3db746

35 files changed

+597
-364
lines changed

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

-244 KB
Binary file not shown.

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

36.8 KB
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-
20240114215407
1+
20240225103130

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

24.2 KB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20240114215407
1+
20240225103130

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
// TODO: superclass inheritance for JAXB XmlAccessorType
3232
// TODO: Transpiler bug allows static String name, but JavaScript function().name is read-only and will be "clazz"
3333

34+
//BH 2024.02.22 -- 3.3.1-v7 fixes long extension issue causing MutableBitInteger to miscalculate subtraction(no change in version #)
3435
//BH 2023.03.29 -- 3.3.1-v7 fixes outer static method call from within lambda expression.
3536
//BH 2023.02.09 -- 3.3.1.v6 fixes j2s.excluded.paths needing /src/xxxx
3637
//BH 2022.06.27 -- 3.3.1-v5 fixes missing method annotations
@@ -4313,11 +4314,10 @@ && boxType(exp) == NO_BOX) {
43134314
private void addExtendedOperands(List<?> extendedOperands, String op, char pre, char post, boolean isToString,
43144315
boolean isLongCall) {
43154316
buffer.append(' ');
4317+
if (isLongCall)
4318+
op = ",";
43164319
for (Iterator<?> iter = extendedOperands.iterator(); iter.hasNext();) {
43174320
Expression exp = (Expression) iter.next();
4318-
// op may be int for a while, but after that it changes to long
4319-
if (isLongCall && exp.resolveTypeBinding().getName().equals("long"))
4320-
op = ",";
43214321
buffer.append(op);
43224322
buffer.append(pre);
43234323
addOperand(exp, isToString);

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

24.1 KB
Binary file not shown.

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

372 Bytes
Binary file not shown.

‎sources/net.sf.j2s.java.core/site-resources/test-raf.txt

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

‎sources/net.sf.j2s.java.core/site-resources_4.2/jsmol/js/j2sjmol.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ Clazz.defineMethod = function (clazzThis, funName, funBody, funParams) {
894894
if (!f$.stacks || f$.claxxReference !== clazzThis) {
895895
//Generate a new delegating method for the class
896896
var id = ++SAEMid;
897-
console.log("SAEM " + clazzThis.__CLASS_NAME__ + "." + funName);
897+
//console.log("SAEM " + clazzThis.__CLASS_NAME__ + "." + funName);
898898
var delegate = function () {
899899
return searchAndExecuteMethod(id, this, arguments.callee.claxxReference, arguments.callee.methodName, arguments);
900900
};

0 commit comments

Comments
 (0)