Make JavaAdapter work with abstract base classes and protected constr…

…uctors
headius · Jun 22, 2012 · 69b177c · 69b177c
1 parent 6297a0a
commit 69b177c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/org/mozilla/javascript/JavaAdapter.java b/src/org/mozilla/javascript/JavaAdapter.java
@@ -363,9 +363,12 @@ public static byte[] createAdapterCode(ObjToIntMap functionNames,
         }
 
         String superName = superClass.getName().replace('.', '/');
-        Constructor<?>[] ctors = superClass.getConstructors();
+        Constructor<?>[] ctors = superClass.getDeclaredConstructors();
         for (Constructor<?> ctor : ctors) {
-            generateCtor(cfw, adapterName, superName, ctor);
+            int mod = ctor.getModifiers();
+            if (Modifier.isPublic(mod) || Modifier.isProtected(mod)) {
+                generateCtor(cfw, adapterName, superName, ctor);
+            }
         }
         generateSerialCtor(cfw, adapterName, superName);
         if (scriptClassName != null) {

diff --git a/testsrc/doctests/javaadapter.doctest b/testsrc/doctests/javaadapter.doctest
@@ -67,3 +67,21 @@ js> x = JavaAdapter(java.util.Vector, {test: function() {return this.elementData
 []
 js> x.test()
 20
+js> // test extending abstract base class
+js> x = new java.util.AbstractList({get: function(i) { return i + 1; }})
+[]
+js> x.get(0)
+1.0
+js> x.get(1)
+2.0
+js> x.get(2)
+3.0
+js> // test implementing an interface
+js> x = new java.util.List({get: function(i) { return i + 1; }, toString: function() { return "[]"; }})
+[]
+js> x.get(0)
+1.0
+js> x.get(1)
+2.0
+js> x.get(2)
+3.0