eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix constructor publishing in JSO

Browse Source
This commit is contained in:
Alexey Andreev 2015-10-11 19:03:15 +03:00
parent 5592862c70
commit f5b21f9455
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jso/apis/src/main/java/org/teavm/jso/typedarrays/ArrayBufferView.java
View File

@ -23,7 +23,7 @@ import org.teavm.jso.JSProperty;
* @author Alexey Andreev * @author Alexey Andreev
*/ */
public abstract class ArrayBufferView implements JSObject { public abstract class ArrayBufferView implements JSObject {
private ArrayBufferView() { protected ArrayBufferView() {
} }
@JSProperty @JSProperty

3
jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java
View File

@ -211,6 +211,9 @@ class JSClassProcessor {
} }
private MethodReader findOverridenMethod(String className, MethodReader finalMethod) { private MethodReader findOverridenMethod(String className, MethodReader finalMethod) {
if (finalMethod.getName().equals("<init>")) {
return null;
}
return classSource.getAncestors(className) return classSource.getAncestors(className)
.skip(1) .skip(1)
.map(cls -> cls.getMethod(finalMethod.getDescriptor())) .map(cls -> cls.getMethod(finalMethod.getDescriptor()))

3
jso/impl/src/main/java/org/teavm/jso/impl/JSDependencyListener.java
View File

@ -111,6 +111,9 @@ class JSDependencyListener extends AbstractDependencyListener {
} }
addInterfaces(exposedCls, cls); addInterfaces(exposedCls, cls);
for (MethodReader method : cls.getMethods()) { for (MethodReader method : cls.getMethods()) {
if (method.getName().equals("<init>")) {
continue;
}
if (exposedCls.inheritedMethods.containsKey(method.getDescriptor()) if (exposedCls.inheritedMethods.containsKey(method.getDescriptor())
|| exposedCls.methods.containsKey(method.getDescriptor())) { || exposedCls.methods.containsKey(method.getDescriptor())) {
MethodDependency methodDep = agent.linkMethod(method.getReference(), null); MethodDependency methodDep = agent.linkMethod(method.getReference(), null);