Skip to content

Yadav1 #19

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 2 commits into from
May 15, 2018
Merged

Yadav1 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cb18bc
a[pt++] |= .... fix
BobHanson May 15, 2018
4245b60
a[pt++] |= .... fix for java.io.StreamTokenizer
BobHanson May 15, 2018
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/dropins/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/net.sf.j2s.core_3.1.1.jar
View file
Open in desktop
Binary file not shown.
33 changes: 18 additions & 15 deletions sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2185,7 +2185,7 @@ public boolean visit(Assignment node) {
}

/**
* We must fix
* We must fix
*
* this.ctype[low++] = (this.ctype[low++]|(4)|0);
*
Expand All @@ -2201,22 +2201,25 @@ public boolean visit(Assignment node) {
* @return
*/
private boolean fixAssignArray(int ptArray, int ptArray2, boolean wasArray) {

if (ptArray >= 0) {
trailingBuffer.addType("j");
String left = buffer.substring(ptArray, ptArray2); // zzz[xxx]
String right = buffer.substring(ptArray2);
buffer.setLength(ptArray);
String left = buffer.substring(ptArray, ptArray2); // zzz[xxx]
int ptIndex = left.indexOf("[") + 1;
String left0 = left.substring(0, ptIndex);
buffer.append(left0);
buffer.append("$j$=");
buffer.append(left.substring(ptIndex));
ptIndex = right.indexOf(left);
buffer.append(right.substring(0, ptIndex));
buffer.append(left0);
buffer.append("$j$]");
buffer.append(right.substring(ptIndex + left.length()));
if (left.length() - ptIndex >= 4) {
// at least as long as zzz[i++]
String right = buffer.substring(ptArray2);
trailingBuffer.addType("j");
buffer.setLength(ptArray);
String left0 = left.substring(0, ptIndex);
buffer.append(left0);
buffer.append("$j$=");
buffer.append(left.substring(ptIndex));
ptIndex = right.indexOf(left);
buffer.append(right.substring(0, ptIndex));
buffer.append(left0);
buffer.append("$j$]");
buffer.append(right.substring(ptIndex + left.length()));
}
isArray = wasArray;
}
return false;
Expand Down
Binary file modified sources/net.sf.j2s.java.core/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions sources/net.sf.j2s.java.core/srcjs/swingjs2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13092,6 +13092,7 @@ J2S._getResourcePath = function(path, isJavaPath) {

// Google closure compiler cannot handle Clazz.new or Clazz.super

// BH 4/16/2018 6:14:10 PM msie flag in monitor
// BH 2/22/2018 12:34:07 AM array.clone() fix
// BH 2/20/2018 12:59:28 AM adds Character.isISOControl
// BH 2/13/2018 6:24:44 AM adds String.copyValueOf (two forms)
Expand Down Expand Up @@ -15321,8 +15322,7 @@ var setAlpha = function (alpha) {
fadeOutTimer = null;
}
fadeAlpha = alpha;
var ua = navigator.userAgent.toLowerCase();
monitorEl.style.filter = "Alpha(Opacity=" + alpha + ")";
//monitorEl.style.filter = "Alpha(Opacity=" + alpha + ")";
monitorEl.style.opacity = alpha / 100.0;
};
/* private */
Expand Down