Author: kmorin Date: 2009-08-27 15:41:15 +0200 (Thu, 27 Aug 2009) New Revision: 1610 Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java Log: in getMethod(name) and getField(name), look also in the inherited methods or fields Modified: trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java =================================================================== --- trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java 2009-08-27 08:39:58 UTC (rev 1609) +++ trunk/guix-compiler/src/main/java/org/nuiton/guix/generator/JavaFile.java 2009-08-27 13:41:15 UTC (rev 1610) @@ -182,6 +182,27 @@ } } } + for(JavaMethod method : inheritedMethods) { + if(method.getName().equals(methodName)) { + if(method.getArguments() == null && args == null) { + return method; + } + else if (method.getArguments() != null && args != null + && method.getArguments().length == args.length) { + boolean samesame = true; + for(int i = 0 ; i < args.length ; i++) { + if(!args[i].getName().equals(method.getArguments()[i].getName()) + || !args[i].getType().equals(method.getArguments()[i].getType())) { + samesame = false; + break; + } + } + if(samesame) { + return method; + } + } + } + } return null; } @@ -270,6 +291,11 @@ return field; } } + for(JavaField field : inheritedFields) { + if(field.getName().equals(fieldName)) { + return field; + } + } return null; }