Skip to content

Yadav1 #20

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 5 commits into from
May 21, 2018
Merged

Yadav1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c83fdf6
j2sClazz - allow for new int[] a = {"c",1,2}
BobHanson May 21, 2018
c2ade06
fixes arr[pt++][p++] += ...
BobHanson May 21, 2018
d4c296e
adds applet._window
BobHanson May 21, 2018
096db21
updated j2sClazz.js, swingjs2.js
BobHanson May 21, 2018
cc84109
updated byte/short array handling
BobHanson May 21, 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.
452 changes: 289 additions & 163 deletions sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/Java2ScriptVisitor.java
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified sources/net.sf.j2s.java.core/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion sources/net.sf.j2s.java.core/srcjs/js/SwingJSApplet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SwingJSApplet.js

// generic SwingJS Applet

// BH 3/14/2018 8:42:33 PM adds applet._window for JSObject
// BH 12/18/2016 8:09:56 AM added SwingJS.Loaded and SwingJS.isLoaded
// BH 7/24/2015 9:09:39 AM allows setting Info.resourcePath
// BH 4/28/2015 10:15:32 PM adds getAppletHtml
Expand Down Expand Up @@ -37,6 +37,7 @@ if (typeof(SwingJS) == "undefined") {
this._appletType = "SwingJS._Applet" + (Info.isSigned ? " (signed)" : "");
this._isJava = true;
this._availableParams = null; // all allowed
this._window = window;
if (checkOnly)
return this;
this._isSigned = Info.isSigned;
Expand Down
9 changes: 7 additions & 2 deletions sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

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

// BH 5/19/2018 8:22:25 PM fix for new int[] {'a'}
// 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
Expand Down Expand Up @@ -853,10 +854,14 @@ var newTypedA = function(baseClass, args, nBits, ndims) {
// Clazz.newA(5 ,null, "SA") new String[5] val = null
// Clazz.newA(-1, ["A","B"], "SA") new String[] val = {"A", "B"}
// Clazz.newA(3, 5, 0, "IAA") new int[3][5] (second pass, so now args = [5, 0, "IA"])
if (val == null)
if (val == null) {
nBits = 0;
else if (nBits > 0 && dim < 0)
} else if (nBits > 0 && dim < 0) {
// make sure this is not a character
for (var i = val.length; --i >= 0;)
val[i].charAt && (val[i] = val[i].charAt(0));
dim = val; // because we can initialize an array using new Int32Array([...])
}
if (nBits > 0)
ndims = 1;
var atype;
Expand Down
Loading