summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2003-01-27 00:39:47 +0000
committerTom Tromey <tromey@redhat.com>2003-01-27 00:39:47 +0000
commit8a34da7d2d0a8720dd92019834b3e9a8388a4ac8 (patch)
treeeef866fd7f2de1d8e95e80a21f9c1ced1d66fb92
parent612fefc249d4c698dd22f3760f2caa513e19e2cd (diff)
downloadclasspath-8a34da7d2d0a8720dd92019834b3e9a8388a4ac8.tar.gz
* gnu/classpath/Configuration.java.in: Reverted change of
2003-01-17. * java/awt/Toolkit.java: Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--gnu/classpath/Configuration.java.in6
-rw-r--r--java/awt/Toolkit.java4
3 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ae4a3ec87..ac0c2e5e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-26 Tom Tromey <tromey@redhat.com>
+
+ * gnu/classpath/Configuration.java.in: Reverted change of
+ 2003-01-17.
+ * java/awt/Toolkit.java: Likewise.
+
2003-01-25 C. Brian Jones <cbj@gnu.org>
* java/text/CollationElementIterator.java (secondaryOrder): return
diff --git a/gnu/classpath/Configuration.java.in b/gnu/classpath/Configuration.java.in
index f6872f010..2cb74a512 100644
--- a/gnu/classpath/Configuration.java.in
+++ b/gnu/classpath/Configuration.java.in
@@ -105,10 +105,4 @@ public interface Configuration
* @see java.lang.reflect.Proxy
*/
boolean HAVE_NATIVE_GENERATE_PROXY_CLASS = false;
-
- /**
- * The name of the default AWT toolkit to use.
- * @see java.awt.Toolkit
- */
- String AWT_TOOLKIT = "gnu.java.awt.peer.gtk.GtkToolkit";
}
diff --git a/java/awt/Toolkit.java b/java/awt/Toolkit.java
index c39bc0406..2f3886230 100644
--- a/java/awt/Toolkit.java
+++ b/java/awt/Toolkit.java
@@ -1,5 +1,5 @@
/* Toolkit.java -- AWT Toolkit superclass
- Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -96,7 +96,7 @@ public abstract class Toolkit
{
/** The default toolkit name. */
private static String default_toolkit_name
- = gnu.classpath.Configuration.AWT_TOOLKIT;
+ = "gnu.java.awt.peer.gtk.GtkToolkit";
/**
* The toolkit in use. Once we load it, we don't ever change it