Author: tchemit Date: 2008-12-28 15:44:10 +0000 (Sun, 28 Dec 2008) New Revision: 1096 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptor.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java Log: rgenerify ClassDescriptor Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptor.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptor.java 2008-12-28 12:04:05 UTC (rev 1095) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptor.java 2008-12-28 15:44:10 UTC (rev 1096) @@ -105,9 +105,11 @@ } - public MethodDescriptor getMethodDescriptor(String name, ClassDescriptor[] parameterTypes) throws NoSuchMethodException { + public MethodDescriptor getMethodDescriptor(String name, ClassDescriptor... parameterTypes) throws NoSuchMethodException { for (MethodDescriptor methodDescriptor : methodDescriptors) { - if (methodDescriptor.getName().equals(name) && Arrays.equals(methodDescriptor.getParameterTypes(), parameterTypes)) { + if (methodDescriptor.getName().equals(name) + && methodDescriptor.getParameterTypes().length == parameterTypes.length + && Arrays.equals(methodDescriptor.getParameterTypes(), parameterTypes)) { return methodDescriptor; } } @@ -115,7 +117,7 @@ } - public abstract MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor[] parameterTypes) throws NoSuchMethodException; + public abstract MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor... parameterTypes) throws NoSuchMethodException; public FieldDescriptor[] getFieldDescriptors() { @@ -147,10 +149,11 @@ return true; } ClassDescriptor[] interfaces = descriptor.getInterfaces(); - for (ClassDescriptor anInterface : interfaces) + for (ClassDescriptor anInterface : interfaces) { if (anInterface == this) { return true; } + } descriptor = descriptor.getSuperclass(); } return false; Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java 2008-12-28 12:04:05 UTC (rev 1095) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/ClassDescriptorLoader.java 2008-12-28 15:44:10 UTC (rev 1096) @@ -288,7 +288,7 @@ } - public MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor[] parameterTypes) throws NoSuchMethodException { + public MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor... parameterTypes) throws NoSuchMethodException { throw new NoSuchMethodException(name); } @@ -331,7 +331,7 @@ return createFieldDescriptor(javaClass.getDeclaredField(name), javaClass.getClassLoader()); } - public MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor[] parameterTypes) throws NoSuchMethodException { + public MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor... parameterTypes) throws NoSuchMethodException { try { Class[] parameterTypeClasses = new Class[parameterTypes.length]; for (int i = 0; i < parameterTypes.length; i++) { Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-12-28 12:04:05 UTC (rev 1095) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/reflect/JavaFileParser.java 2008-12-28 15:44:10 UTC (rev 1096) @@ -84,7 +84,7 @@ throw new NoSuchFieldException(name); } - public MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor[] parameterTypes) throws NoSuchMethodException { + public MethodDescriptor getDeclaredMethodDescriptor(String name, ClassDescriptor... parameterTypes) throws NoSuchMethodException { throw new NoSuchMethodException(name); } };