Skip to content

Merge pull request #249 from BobHanson/hanson1 #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BobHanson merged 1 commit into from
Mar 2, 2023
Merged

Merge pull request #249 from BobHanson/hanson1 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230216124208
20230301203155
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230216124208
20230301203155
11 changes: 7 additions & 4 deletions sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1577,10 +1577,12 @@ private boolean addMethodInvocation(SimpleName javaQualifier, List<?> arguments,
boolean isPrivateAndNotStatic = isPrivate && !isStatic;
String privateVar = (isPrivateAndNotStatic ? getPrivateVar(declaringClass, false) : null);
boolean doLogMethodCalled = (!isPrivate && global_htMethodsCalled != null);
boolean needBname = (!isStatic && lambdaArity < 0 && (expression == null
? !areEqual(declaringClass, class_typeBinding)
boolean needBname = (

!isStatic && lambdaArity < 0 && (expression == null
? !areEqual(declaringClass, class_typeBinding)
&& !class_typeBinding.isAssignmentCompatible(declaringClass)
: expression instanceof ThisExpression && ((ThisExpression) expression).getQualifier() != null));
: expression instanceof ThisExpression && ((ThisExpression) expression).getQualifier() != null) || class_localType == LAMBDA_EXPRESSION);
String bname = (needBname ? getThisRefOrSyntheticReference(javaQualifier, declaringClass, null) : null);
// add the qualifier
int pt = buffer.length();
Expand Down Expand Up @@ -4016,7 +4018,8 @@ public boolean visit(ThisExpression node) {
}
// xxxx.this.x
// xxxx.this.foo()
buffer.append(getThisRefOrSyntheticReference(node, node.resolveTypeBinding(), "this"));
String bthis = getThisRefOrSyntheticReference(node, node.resolveTypeBinding(), "this");
buffer.append(bthis);
return false;
}

Expand Down
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions sources/net.sf.j2s.java.core/src/java/io/ByteArrayOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

package java.io;

import java.nio.charset.Charset;
import java.util.Arrays;

/**
Expand Down Expand Up @@ -253,6 +254,10 @@ public synchronized String toString(String charsetName)
return new String(buf, 0, count, charsetName);
}

public synchronized String toString(Charset charset) {
return new String(buf, 0, count, charset);
}

/**
* Creates a newly allocated string. Its size is the current size of
* the output stream and the valid contents of the buffer have been
Expand Down
Loading