Thanks to visit codestin.com
Credit goes to github.com

Skip to content

j2sClazz fix for getComponentType() #163

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
merged 6 commits into from
Feb 2, 2020
Merged

j2sClazz fix for getComponentType() #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cfcf8af
Merge pull request #148 from BobHanson/master
BobHanson Feb 2, 2020
4bed8f1
Merge pull request #150 from java2script/master
BobHanson Feb 2, 2020
6b15914
j2sClazz fix for getComponentType()
BobHanson Feb 2, 2020
019cfee
Merge branch 'hanson1' of https://github.com/BobHanson/java2script.gi…
BobHanson Feb 2, 2020
6846758
comments
BobHanson Feb 2, 2020
f0cd28d
Merge pull request #151 from BobHanson/hanson1
BobHanson Feb 2, 2020
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.
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 @@
20200202134002
20200202163957
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.7/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.2.7/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20200202134002
20200202163957
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
16 changes: 16 additions & 0 deletions sources/net.sf.j2s.java.core/src/test/Test_Class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,29 @@ Class C() {



public short testShort(short s) {return 0;}

public static void main(String[] args) {

try {
assert (new String().getClass().getName().equals("java.lang.String"));
assert (Class.forName("java.lang.String") == String.class);
assert (Test_Class.class.getMethod("testShort",Short.TYPE).getParameterTypes()[0] == Short.TYPE);
assert (Class.forName("java.lang.String") == String.class);
assert (new String[0].getClass().getName().equals("[Ljava.lang.String;"));
assert (Class.forName("[Ljava.lang.String;").getComponentType() == String.class);
assert (new short[0].getClass().getName().equals("[S"));
assert (Class.forName("[S").getComponentType() == Short.TYPE);
} catch (Throwable t) {
t.printStackTrace();
assert(false);
}

System.out.println("===========");
// these won't be the same, because Java declares synthetic access$n methods
showMethods(Test_Class.class.getDeclaredMethods());
System.out.println("-----------");
// these won't be the same, because SwingJS returns public and package-private methods
showMethods(Test_Class.class.getMethods());
System.out.println("===========");
showMethods(Test_Class_int.class.getDeclaredMethods());
Expand Down
36 changes: 24 additions & 12 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,12 +7,13 @@

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

// BH 2019.02.02 3.2.7-v5 fixes array.getClass().getName() and getArrayClass() for short -- should be [S, not [H, for Java
// BH 2019.12.29 3.2.6 fixes Float.parseFloat$S("NaN") [and Double]
// BH 2019.12.23 3.2.6 update of System
// BH 2019.12.19 3.2.6 revision of $clinit$
// BH 2019.12.16 3.2.5.v4 adds ClassLoader static methods for system resources (just j2s/...)
// BH 2019.12.15 3.2.5.v4 Character.prototype.valueOf() missing
// BH 2019.12.14 3.2.5.v3 Clazz._4Name initialization should be full static initialization
// BH 2019.12.16 3.2.5-v4 adds ClassLoader static methods for system resources (just j2s/...)
// BH 2019.12.15 3.2.5-v4 Character.prototype.valueOf() missing
// BH 2019.12.14 3.2.5-v3 Clazz._4Name initialization should be full static initialization

// see earlier notes at net.sf.j2s.java.core.srcjs/js/devnotes.txt

Expand Down Expand Up @@ -80,7 +81,9 @@ var getArrayClass = function(name){
var n = 0;
while (name.charAt(n) == "[") n++;
var type = name.substring(n);
var clazz = (type.length == 1 ? primTypes[type].TYPE : Clazz._4Name(type.split(";")[0].substring(1)).$clazz$);
if (type == "S")
type = "H"; // [S is short[] in Java
var clazz = (type.length == 1 ? primTypes[type].TYPE : Clazz._4Name(type.split(";")[0].substring(1),null,null,true));
return Clazz.array(clazz,-n);
}

Expand Down Expand Up @@ -1016,14 +1019,20 @@ var arrayClass = function(baseClass, ndim) {
o.__COMPONENTTYPE = (o.__NDIM == 1 ? baseClass : null);
var oclass = Clazz.getClass(o);
oclass.getComponentType$ = function() {
return o.__COMPONENTTYPE
|| (o.__COMPONENTTYPE = arrayClass(baseClass, ndim - 1));
if (!o.__COMPONENTTYPE)
o.__COMPONENTTYPE = arrayClass(baseClass, ndim - 1);
return (o.__COMPONENTTYPE.__PRIMITIVE
|| o.__COMPONENTTYPE.$clazz$ ? o.__COMPONENTTYPE
: Clazz.getClass(o.__COMPONENTTYPE));
};
oclass.getName$ = function() {return o.__NAME || (o__NAME = (function() {
oclass.getName$ = function() {return o.__NAME || (o__NAME = (function(stub) {
switch (stub) {
case "O":
stub = "Object";
break;
case "H": // SwingJS -> Java
stub = "S";
break;
case "S":
stub = "String";
break;
Expand All @@ -1037,8 +1046,8 @@ var arrayClass = function(baseClass, ndim) {
else if (stub.length > 1)
stub = "Ljava.lang." + stub + ";";
return aaa.replace(/A/g,"[") + stub;
})())};
arrayClasses[key] = oclass;
})(stub))};
arrayClasses[key] = oclass;
return oclass;
}

Expand Down Expand Up @@ -2538,8 +2547,11 @@ Clazz._initClass = function(c,clinit,status,objThis) {
}

Clazz._4Name = function(clazzName, applet, state, asClazz, initialize, isQuiet) {
if (clazzName.indexOf("[") == 0)
return getArrayClass(clazzName);
var cl;
if (clazzName.indexOf("[") == 0) {
cl = getArrayClass(clazzName);
return (asClazz ? cl.$clazz$ : cl);
}
if (clazzName.indexOf(".") < 0)
clazzName = "java.lang." + clazzName;
var isok = Clazz._isClassDefined(clazzName);
Expand Down Expand Up @@ -2570,7 +2582,7 @@ Clazz._4Name = function(clazzName, applet, state, asClazz, initialize, isQuiet)
_Loader.loadClass(clazzName);
}
}
var cl = evalType(clazzName);
cl = evalType(clazzName);
if (!cl){
if (isQuiet || Clazz._isQuietLoad)
return null;
Expand Down
36 changes: 24 additions & 12 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 @@ -13862,12 +13862,13 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {

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

// BH 2019.02.02 3.2.7-v5 fixes array.getClass().getName() and getArrayClass() for short -- should be [S, not [H, for Java
// BH 2019.12.29 3.2.6 fixes Float.parseFloat$S("NaN") [and Double]
// BH 2019.12.23 3.2.6 update of System
// BH 2019.12.19 3.2.6 revision of $clinit$
// BH 2019.12.16 3.2.5.v4 adds ClassLoader static methods for system resources (just j2s/...)
// BH 2019.12.15 3.2.5.v4 Character.prototype.valueOf() missing
// BH 2019.12.14 3.2.5.v3 Clazz._4Name initialization should be full static initialization
// BH 2019.12.16 3.2.5-v4 adds ClassLoader static methods for system resources (just j2s/...)
// BH 2019.12.15 3.2.5-v4 Character.prototype.valueOf() missing
// BH 2019.12.14 3.2.5-v3 Clazz._4Name initialization should be full static initialization

// see earlier notes at net.sf.j2s.java.core.srcjs/js/devnotes.txt

Expand Down Expand Up @@ -13935,7 +13936,9 @@ var getArrayClass = function(name){
var n = 0;
while (name.charAt(n) == "[") n++;
var type = name.substring(n);
var clazz = (type.length == 1 ? primTypes[type].TYPE : Clazz._4Name(type.split(";")[0].substring(1)).$clazz$);
if (type == "S")
type = "H"; // [S is short[] in Java
var clazz = (type.length == 1 ? primTypes[type].TYPE : Clazz._4Name(type.split(";")[0].substring(1),null,null,true));
return Clazz.array(clazz,-n);
}

Expand Down Expand Up @@ -14871,14 +14874,20 @@ var arrayClass = function(baseClass, ndim) {
o.__COMPONENTTYPE = (o.__NDIM == 1 ? baseClass : null);
var oclass = Clazz.getClass(o);
oclass.getComponentType$ = function() {
return o.__COMPONENTTYPE
|| (o.__COMPONENTTYPE = arrayClass(baseClass, ndim - 1));
if (!o.__COMPONENTTYPE)
o.__COMPONENTTYPE = arrayClass(baseClass, ndim - 1);
return (o.__COMPONENTTYPE.__PRIMITIVE
|| o.__COMPONENTTYPE.$clazz$ ? o.__COMPONENTTYPE
: Clazz.getClass(o.__COMPONENTTYPE));
};
oclass.getName$ = function() {return o.__NAME || (o__NAME = (function() {
oclass.getName$ = function() {return o.__NAME || (o__NAME = (function(stub) {
switch (stub) {
case "O":
stub = "Object";
break;
case "H": // SwingJS -> Java
stub = "S";
break;
case "S":
stub = "String";
break;
Expand All @@ -14892,8 +14901,8 @@ var arrayClass = function(baseClass, ndim) {
else if (stub.length > 1)
stub = "Ljava.lang." + stub + ";";
return aaa.replace(/A/g,"[") + stub;
})())};
arrayClasses[key] = oclass;
})(stub))};
arrayClasses[key] = oclass;
return oclass;
}

Expand Down Expand Up @@ -16393,8 +16402,11 @@ Clazz._initClass = function(c,clinit,status,objThis) {
}

Clazz._4Name = function(clazzName, applet, state, asClazz, initialize, isQuiet) {
if (clazzName.indexOf("[") == 0)
return getArrayClass(clazzName);
var cl;
if (clazzName.indexOf("[") == 0) {
cl = getArrayClass(clazzName);
return (asClazz ? cl.$clazz$ : cl);
}
if (clazzName.indexOf(".") < 0)
clazzName = "java.lang." + clazzName;
var isok = Clazz._isClassDefined(clazzName);
Expand Down Expand Up @@ -16425,7 +16437,7 @@ Clazz._4Name = function(clazzName, applet, state, asClazz, initialize, isQuiet)
_Loader.loadClass(clazzName);
}
}
var cl = evalType(clazzName);
cl = evalType(clazzName);
if (!cl){
if (isQuiet || Clazz._isQuietLoad)
return null;
Expand Down