Prefix class name to methods already defined in a superclass

octachoron · octachoron · commit ab0caf7568aa · 2014-08-17T17:40:42.000+02:00
This is to prevent collisions with inherited methods.
diff --git a/src/gir2java/GirParser.java b/src/gir2java/GirParser.java
@@ -9,6 +9,7 @@
 import java.io.PrintWriter;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -41,7 +42,6 @@
 import com.sun.codemodel.JDefinedClass;
 import com.sun.codemodel.JEnumConstant;
 import com.sun.codemodel.JExpr;
-import com.sun.codemodel.JExpression;
 import com.sun.codemodel.JFieldVar;
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JMethod;
@@ -836,6 +836,23 @@ private void parseMethodOrFunction(Element root, ParsingContext context) {
 				name = nativeName;
 			}
 			name = NameUtils.neutralizeKeyword(name);
+			
+			JClass klass = enclosing;
+			outer:
+			while ( (klass != null) && (klass instanceof JDefinedClass) ) {
+				JDefinedClass definedClass = (JDefinedClass) klass;
+				
+				Collection<JMethod> methods = definedClass.methods();
+				for (JMethod method : methods) {
+					if (method.name().equals(name)) {
+						name = enclosing.name().toLowerCase() + "_" + name;
+						break outer;
+					}
+				}
+				
+				klass = klass._extends();
+			}
+			
 			JMethod wrapper = enclosing.method(JMod.PUBLIC | staticModifier, returnType.getJType(), name);
 			
 			JInvocation nativeCall;
