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

Avoid creating multiple wrappers.

Browse Source
This commit is contained in:
nboyd%atg.com 2000-10-02 20:46:08 +00:00
parent 37770f863b
commit f294ddcb34
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/rhino/org/mozilla/javascript/JavaAdapter.java
View File

@ -74,11 +74,18 @@ public class JavaAdapter extends ScriptableObject {
return res; return res;
} }
public static Object getAdapterSelf(Class adapterClass, Object adapter)
throws NoSuchFieldException, IllegalAccessException
{
Field self = adapterClass.getDeclaredField("self");
return self.get(adapter);
}
public static Object js_JavaAdapter(Context cx, Object[] args, public static Object js_JavaAdapter(Context cx, Object[] args,
Function ctorObj, boolean inNewExpr) Function ctorObj, boolean inNewExpr)
throws InstantiationException, NoSuchMethodException, throws InstantiationException, NoSuchMethodException,
IllegalAccessException, InvocationTargetException, IllegalAccessException, InvocationTargetException,
ClassNotFoundException ClassNotFoundException, NoSuchFieldException
{ {
Class superClass = Object.class; Class superClass = Object.class;
Class[] intfs = new Class[args.length-1]; Class[] intfs = new Class[args.length-1];
@ -112,8 +119,8 @@ public class JavaAdapter extends ScriptableObject {
Class[] ctorParms = { Scriptable.class }; Class[] ctorParms = { Scriptable.class };
Object[] ctorArgs = { obj }; Object[] ctorArgs = { obj };
Object v = adapterClass.getConstructor(ctorParms).newInstance(ctorArgs); Object adapter = adapterClass.getConstructor(ctorParms).newInstance(ctorArgs);
return setAdapterProto(obj,v); return getAdapterSelf(adapterClass, adapter);
} }
public static Class createAdapterClass(Context cx, Scriptable jsObj, public static Class createAdapterClass(Context cx, Scriptable jsObj,

13
js/rhino/src/org/mozilla/javascript/JavaAdapter.java
View File

@ -74,11 +74,18 @@ public class JavaAdapter extends ScriptableObject {
return res; return res;
} }
public static Object getAdapterSelf(Class adapterClass, Object adapter)
throws NoSuchFieldException, IllegalAccessException
{
Field self = adapterClass.getDeclaredField("self");
return self.get(adapter);
}
public static Object js_JavaAdapter(Context cx, Object[] args, public static Object js_JavaAdapter(Context cx, Object[] args,
Function ctorObj, boolean inNewExpr) Function ctorObj, boolean inNewExpr)
throws InstantiationException, NoSuchMethodException, throws InstantiationException, NoSuchMethodException,
IllegalAccessException, InvocationTargetException, IllegalAccessException, InvocationTargetException,
ClassNotFoundException ClassNotFoundException, NoSuchFieldException
{ {
Class superClass = Object.class; Class superClass = Object.class;
Class[] intfs = new Class[args.length-1]; Class[] intfs = new Class[args.length-1];
@ -112,8 +119,8 @@ public class JavaAdapter extends ScriptableObject {
Class[] ctorParms = { Scriptable.class }; Class[] ctorParms = { Scriptable.class };
Object[] ctorArgs = { obj }; Object[] ctorArgs = { obj };
Object v = adapterClass.getConstructor(ctorParms).newInstance(ctorArgs); Object adapter = adapterClass.getConstructor(ctorParms).newInstance(ctorArgs);
return setAdapterProto(obj,v); return getAdapterSelf(adapterClass, adapter);
} }
public static Class createAdapterClass(Context cx, Scriptable jsObj, public static Class createAdapterClass(Context cx, Scriptable jsObj,