diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-06-10 22:59:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2003-06-10 22:59:04 +0000 |
| commit | ef836b20a0d1d777bf46bb91fa8950a5f5ab8702 (patch) | |
| tree | f6e381d00edb19c39e03e6a1f3bce92165442b60 /java | |
| parent | 0915f4a8a41ed37cda26270633e3d325075341a1 (diff) | |
| download | classpath-ef836b20a0d1d777bf46bb91fa8950a5f5ab8702.tar.gz | |
* javax/swing/JList.java (setListData): Remove gcj workaround.
* java/security/BasicPermission.java: Remove gcj workaround.
* java/lang/reflect/Proxy.java (getProperty): Remove gcj
workaround.
* java/awt/im/InputSubset.java: Remove gcj workaround.
Diffstat (limited to 'java')
| -rw-r--r-- | java/awt/im/InputSubset.java | 6 | ||||
| -rw-r--r-- | java/lang/reflect/Proxy.java | 17 | ||||
| -rw-r--r-- | java/security/BasicPermission.java | 5 |
3 files changed, 9 insertions, 19 deletions
diff --git a/java/awt/im/InputSubset.java b/java/awt/im/InputSubset.java index 10755fd49..fd03269a8 100644 --- a/java/awt/im/InputSubset.java +++ b/java/awt/im/InputSubset.java @@ -1,5 +1,5 @@ /* InputSubset.java -- subsets of Unicode important in text input - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,8 +46,8 @@ package java.awt.im; * @since 1.2 * @status updated to 1.4 */ -public final class InputSubset extends java.lang.Character.Subset -{ // XXX - FIXME Use fully qualified extends as gcj 3.1 workaround. +public final class InputSubset extends Character.Subset +{ /** * Constant for all Latin characters, including the characters in the * BASIC_LATIN, LATIN_1_SUPPLEMENT, LATIN_EXTENDED_A, LATIN_EXTENDED_B diff --git a/java/lang/reflect/Proxy.java b/java/lang/reflect/Proxy.java index e327f4466..6575217b6 100644 --- a/java/lang/reflect/Proxy.java +++ b/java/lang/reflect/Proxy.java @@ -1,5 +1,5 @@ /* Proxy.java -- build a proxy class that implements reflected interfaces - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -269,18 +269,9 @@ public class Proxy implements Serializable ? getProxyData0(loader, interfaces) : ProxyData.getProxyData(pt)); - // FIXME workaround for bug in gcj 3.0.x - // Not needed with the latest gcj from cvs - //clazz = (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS - // ? generateProxyClass0(loader, data) - // : new ClassFactory(data).generate(loader)); - if (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS) - clazz = generateProxyClass0(loader, data); - else - { - ClassFactory cf = new ClassFactory(data); - clazz = cf.generate(loader); - } + clazz = (Configuration.HAVE_NATIVE_GENERATE_PROXY_CLASS + ? generateProxyClass0(loader, data) + : new ClassFactory(data).generate(loader)); } Object check = proxyClasses.put(pt, clazz); diff --git a/java/security/BasicPermission.java b/java/security/BasicPermission.java index 25630fb79..0945f2d7f 100644 --- a/java/security/BasicPermission.java +++ b/java/security/BasicPermission.java @@ -1,5 +1,5 @@ /* BasicPermission.java -- implements a simple named permission - Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,9 +71,8 @@ import java.util.Enumeration; * @since 1.1 * @status updated to 1.4 */ -public abstract class BasicPermission extends java.security.Permission +public abstract class BasicPermission extends Permission implements Serializable - // FIXME extends with fully qualified classname is workaround for gcj 3.0.4. { /** * Compatible with JDK 1.1+. |