Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 12:35:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wrapping a class produces a NativeJavaClass.

Browse Source
This commit is contained in:
nboyd%atg.com 2000-06-15 14:00:31 +00:00
parent 7f540ada8a
commit 4242e00f01
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/rhino/org/mozilla/javascript/NativeJavaObject.java
View File

@ -172,17 +172,19 @@ public class NativeJavaObject implements Scriptable, Wrapper {
return obj;
if (Context.useJSObject && jsObjectClass != null &&
staticType != jsObjectClass && jsObjectClass.isInstance(obj))
{
try {
return jsObjectGetScriptable.invoke(obj, ScriptRuntime.emptyArgs);
}
catch (InvocationTargetException e) {
// Just abandon conversion from JSObject
}
catch (IllegalAccessException e) {
// Just abandon conversion from JSObject
}
{
try {
return jsObjectGetScriptable.invoke(obj, ScriptRuntime.emptyArgs);
}
catch (InvocationTargetException e) {
// Just abandon conversion from JSObject
}
catch (IllegalAccessException e) {
// Just abandon conversion from JSObject
}
}
if (cls == ScriptRuntime.ClassClass)
return NativeJavaClass.wrap(scope, (Class) obj);
return new NativeJavaObject(scope, obj, staticType);
}

22
js/rhino/src/org/mozilla/javascript/NativeJavaObject.java
View File

@ -172,17 +172,19 @@ public class NativeJavaObject implements Scriptable, Wrapper {
return obj;
if (Context.useJSObject && jsObjectClass != null &&
staticType != jsObjectClass && jsObjectClass.isInstance(obj))
{
try {
return jsObjectGetScriptable.invoke(obj, ScriptRuntime.emptyArgs);
}
catch (InvocationTargetException e) {
// Just abandon conversion from JSObject
}
catch (IllegalAccessException e) {
// Just abandon conversion from JSObject
}
{
try {
return jsObjectGetScriptable.invoke(obj, ScriptRuntime.emptyArgs);
}
catch (InvocationTargetException e) {
// Just abandon conversion from JSObject
}
catch (IllegalAccessException e) {
// Just abandon conversion from JSObject
}
}
if (cls == ScriptRuntime.ClassClass)
return NativeJavaClass.wrap(scope, (Class) obj);
return new NativeJavaObject(scope, obj, staticType);
}