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/awt/AWTKeyStroke.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/classpath/java/awt/AWTKeyStroke.java') diff --git a/libjava/classpath/java/awt/AWTKeyStroke.java b/libjava/classpath/java/awt/AWTKeyStroke.java index 0fc4428..378e4eb 100644 --- a/libjava/classpath/java/awt/AWTKeyStroke.java +++ b/libjava/classpath/java/awt/AWTKeyStroke.java @@ -260,7 +260,7 @@ public class AWTKeyStroke implements Serializable c.setAccessible(true); // Create a new instance, to make sure that we can, and // to cause any ClassCastException. - AWTKeyStroke dummy = (AWTKeyStroke) c.newInstance(null); + AWTKeyStroke dummy = (AWTKeyStroke) c.newInstance(); return c; } }); @@ -632,7 +632,7 @@ public class AWTKeyStroke implements Serializable else try { - stroke = (AWTKeyStroke) c.newInstance(null); + stroke = (AWTKeyStroke) c.newInstance(); stroke.keyChar = keyChar; stroke.keyCode = keyCode; stroke.modifiers = modifiers; @@ -643,7 +643,7 @@ public class AWTKeyStroke implements Serializable throw (Error) new InternalError().initCause(e); } // Check level 1 cache. - AWTKeyStroke cached = (AWTKeyStroke) cache.get(stroke); + AWTKeyStroke cached = cache.get(stroke); if (cached == null) cache.put(stroke, stroke); else -- cgit v1.1