fix issue #259

Author: Mihail Slavchev

binding-generator/Generator/src/com/tns/bindings/Dump.java

@@ -389,65 +389,110 @@ private Method[] groupMethodsByName(Method[] methods)
 
 		return result.values().toArray(new Method[result.size()]);
 	}
+	
+	private String getMethodSignature(Method m)
+	{
+		String sig = m.toGenericString();
+		
+		int nameIdx = sig.indexOf("(");
+		int endSigIdx = sig.indexOf(")") + 1;
+		
+		return m.getName() + sig.substring(nameIdx, endSigIdx);
+	}
 
 	private Method[] getSupportedMethods(Class<?> clazz, HashSet<String> methodOverrides)
 	{
 		ArrayList<Method> result = new ArrayList<Method>();
-		HashMap<String, Method> finalMethods = new HashMap<String, Method>();
-		ArrayList<Class<?>> implementedInterfaces = new ArrayList<Class<?>>();
-		while (clazz != null)
+
+		if (clazz.isInterface())
 		{
-			Method[] methods = clazz.getDeclaredMethods();
-			
-			ArrayList<Method> methodz = new ArrayList<Method>();
-			
-			for (int i = 0; i < methods.length; i++)
+			Set<String> objectMethods = new HashSet<String>();
+			for (Method objMethod: java.lang.Object.class.getDeclaredMethods())
 			{
-				Method candidateMethod = methods[i];
-				if (methodOverrides != null && !methodOverrides.contains(candidateMethod.getName()))
+				if (!Modifier.isStatic(objMethod.getModifiers()))
 				{
-					continue;
+					String sig = getMethodSignature(objMethod);
+					objectMethods.add(sig);
 				}
-				
-				methodz.add(methods[i]);
 			}
-			
-			
-			Class<?>[] interfaces = clazz.getInterfaces();
-			for (int i = 0; i < interfaces.length; i++)
+			Set<Method> notImplementedObjectMethods = new HashSet<Method>();
+			Method[] ifaceMethods = clazz.getDeclaredMethods();
+			for (Method ifaceMethod: ifaceMethods)
 			{
-				implementedInterfaces.add(interfaces[i]);
+				if (!Modifier.isStatic(ifaceMethod.getModifiers()))
+				{
+					String sig = getMethodSignature(ifaceMethod);
+					if (objectMethods.contains(sig) && !methodOverrides.contains(ifaceMethod.getName()))
+					{
+						notImplementedObjectMethods.add(ifaceMethod);
+					}
+				}
 			}
-			
-			for (int i = 0; i < methodz.size(); i++)
+			for (Method ifaceMethod: ifaceMethods)
 			{
-				Method method = methodz.get(i);
-				
-				if (isMethodSupported(method, finalMethods))
+				if (!notImplementedObjectMethods.contains(ifaceMethod))
 				{
-					result.add(method);
+					result.add(ifaceMethod);
 				}
 			}
-			
-			clazz = clazz.getSuperclass();
 		}
-		
-		for (int i = 0; i < implementedInterfaces.size(); i++)
+		else
 		{
-			Class<?> implementedInterface = implementedInterfaces.get(i);
-			Method[] interfaceMethods = implementedInterface.getMethods();
-			for (int j = 0; j < interfaceMethods.length; j++)
+			HashMap<String, Method> finalMethods = new HashMap<String, Method>();
+			ArrayList<Class<?>> implementedInterfaces = new ArrayList<Class<?>>();
+			while (clazz != null)
 			{
-				Method method = interfaceMethods[j];
+				Method[] methods = clazz.getDeclaredMethods();
+				
+				ArrayList<Method> methodz = new ArrayList<Method>();
+				
+				for (int i = 0; i < methods.length; i++)
+				{
+					Method candidateMethod = methods[i];
+					if (methodOverrides != null && !methodOverrides.contains(candidateMethod.getName()))
+					{
+						continue;
+					}
+					
+					methodz.add(methods[i]);
+				}
+				
+				Class<?>[] interfaces = clazz.getInterfaces();
+				for (int i = 0; i < interfaces.length; i++)
+				{
+					implementedInterfaces.add(interfaces[i]);
+				}
 
-				if (methodOverrides != null && !methodOverrides.contains(method.getName()))
+				for (int i = 0; i < methodz.size(); i++)
 				{
-					continue;
+					Method method = methodz.get(i);
+					
+					if (isMethodSupported(method, finalMethods))
+					{
+						result.add(method);
+					}
 				}
 
-				if (!isMethodMarkedAsFinalInClassHierarchy(method, finalMethods))
+				clazz = clazz.getSuperclass();
+			}
+			
+			for (int i = 0; i < implementedInterfaces.size(); i++)
+			{
+				Class<?> implementedInterface = implementedInterfaces.get(i);
+				Method[] interfaceMethods = implementedInterface.getMethods();
+				for (int j = 0; j < interfaceMethods.length; j++)
 				{
-					result.add(method);	
+					Method method = interfaceMethods[j];
+					
+					if (methodOverrides != null && !methodOverrides.contains(method.getName()))
+					{
+						continue;
+					}
+					
+					if (!isMethodMarkedAsFinalInClassHierarchy(method, finalMethods))
+					{
+						result.add(method);	
+					}
 				}
 			}
 		}
@@ -1158,4 +1203,4 @@ private int getDexModifiers(int modifiers)
 
 		return org.ow2.asmdex.Opcodes.ACC_PROTECTED;
 	}
-}
+}

test-app/assets/app/mainpage.js

@@ -41,3 +41,4 @@ require("./tests/testNativeModules");
 require("./tests/requireExceptionTests");
 require("./tests/java-array-test");
 require("./tests/field-access-test");
+require("./tests/dex-interface-implementation");

test-app/assets/app/tests/dex-interface-implementation.js

@@ -0,0 +1,24 @@
+describe("Tests partial interface implementation", function () {
+	it("should throw an exception when call unimplemented method of a partial implemented interface", function () {
+		var exceptionCaught = false;
+		var m = new java.util.Map({
+			clear: function() {}
+		});
+		try {
+			m.size()
+		} catch (e) {
+			exceptionCaught = true;
+		}
+		expect(exceptionCaught).toBe(true);
+	});
+
+	it("should call implemented method of a partial implemented interface", function () {
+		var m = new java.util.Map({
+			hashCode: function() {
+				return 123;
+			}
+		});
+		var hash = m.hashCode();
+		expect(hash).toBe(123);
+	});
+});