From e0441a5bfb29083a532307ba2b1fd6d6d13944ba Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 28 Jun 2008 13:29:13 +0000 Subject: Import GNU Classpath (classpath-0_97_2-release). libjava/ 2008-06-28 Matthias Klose Import GNU Classpath (classpath-0_97_2-release). * Regenerate class and header files. * Regenerate auto* files. * gcj/javaprims.h: Define jobjectRefType. * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only). (_Jv_JNIFunctions): Initialize GetObjectRefType. * gnu/classpath/jdwp/VMVirtualMachine.java, java/security/VMSecureRandom.java: Merge from classpath. * HACKING: Fix typo. * ChangeLog-2007: New file. * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath. libjava/classpath/ 2008-06-28 Matthias Klose * m4/ac_prog_javac.m4: Disable check for JAVAC, when not configured with --enable-java-maintainer-mode. * aclocal.m4, configure: Regenerate. * native/jni/gstreamer-peer/Makefile.am: Do not link with libclasspathnative. * native/jni/gstreamer-peer/Makefile.in: Regenerate. * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting JCOMPILER, drop flags not understood by gcj. From-SVN: r137223 --- libjava/classpath/java/beans/EventHandler.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'libjava/classpath/java/beans/EventHandler.java') diff --git a/libjava/classpath/java/beans/EventHandler.java b/libjava/classpath/java/beans/EventHandler.java index 318b274898a..5efbc8dc6d7 100644 --- a/libjava/classpath/java/beans/EventHandler.java +++ b/libjava/classpath/java/beans/EventHandler.java @@ -173,19 +173,17 @@ public class EventHandler implements InvocationHandler try { // Look for boolean property getter isProperty - getter = o.getClass().getMethod("is" + capitalize(prop), - null); + getter = o.getClass().getMethod("is" + capitalize(prop)); } catch (NoSuchMethodException nsme1) { try { // Look for regular property getter getProperty - getter = o.getClass().getMethod("get" + capitalize(prop), - null); + getter = o.getClass().getMethod("get" + capitalize(prop)); } catch(NoSuchMethodException nsme2) { try { // Finally look for a method of the name prop - getter = o.getClass().getMethod(prop, null); + getter = o.getClass().getMethod(prop); } catch(NoSuchMethodException nsme3) { // Ok, give up with an intelligent hint for the user. throw new RuntimeException("Method not called: Could not find a property or method '" + prop @@ -194,7 +192,7 @@ public class EventHandler implements InvocationHandler } } try { - Object val = getter.invoke(o, null); + Object val = getter.invoke(o); if (rest != null) return getProperty(val, rest); @@ -304,7 +302,7 @@ public class EventHandler implements InvocationHandler // more specification compliant than the JDK itself because this one will fail in such a case. try { - actionMethod = targetClass.getMethod(action, null); + actionMethod = targetClass.getMethod(action); } catch(NoSuchMethodException nsme) { @@ -342,7 +340,7 @@ public class EventHandler implements InvocationHandler throw new ArrayIndexOutOfBoundsException(0); // Invoke target.action(property) - return actionMethod.invoke(target, null); + return actionMethod.invoke(target); } catch(InvocationTargetException ite) { throw new RuntimeException(ite.getCause()); } catch(IllegalAccessException iae) { -- cgit v1.2.3