[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: simplified AWT toolkit initialisation

[Kaffe CVS]

PatchSet 5606 
Date: 2005/02/24 12:00:04
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: simplified AWT toolkit initialisation

2005-02-24  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/gnu/classpath/Configuration.java.in
        (default_awt_peer_toolkit) Removed.

        * libraries/javalib/java/awt/Toolkit.java
        (default_awt_peer_toolkit) Set directly.

Members: 
	ChangeLog:1.3651->1.3652 
	libraries/javalib/gnu/classpath/Configuration.java.in:1.1->1.2 
	libraries/javalib/java/awt/Toolkit.java:1.23->1.24 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3651 kaffe/ChangeLog:1.3652
--- kaffe/ChangeLog:1.3651	Thu Feb 24 11:48:43 2005
+++ kaffe/ChangeLog	Thu Feb 24 12:00:04 2005
@@ -1,5 +1,13 @@
 2005-02-24  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/gnu/classpath/Configuration.java.in
+	(default_awt_peer_toolkit) Removed.
+
+	* libraries/javalib/java/awt/Toolkit.java
+	(default_awt_peer_toolkit) Set directly.
+
+2005-02-24  Dalibor Topic  <robilad at kaffe.org>
+
 	Resynced with GNU Classpath.
 
 	2005-02-24  Chris Burdess  <dog at gnu.org>
Index: kaffe/libraries/javalib/gnu/classpath/Configuration.java.in
diff -u kaffe/libraries/javalib/gnu/classpath/Configuration.java.in:1.1 kaffe/libraries/javalib/gnu/classpath/Configuration.java.in:1.2
--- kaffe/libraries/javalib/gnu/classpath/Configuration.java.in:1.1	Fri Feb 11 04:56:59 2005
+++ kaffe/libraries/javalib/gnu/classpath/Configuration.java.in	Thu Feb 24 12:00:08 2005
@@ -107,11 +107,6 @@
   boolean HAVE_NATIVE_GENERATE_PROXY_CLASS = false;
 
   /**
-   * Name of default AWT peer library.
-   */
-  String default_awt_peer_toolkit = "gnu.java.awt.peer.gtk.GtkToolkit";
-
-  /**
    * Set to true if Cairo was found and enabled during configure,
    * false otherwise.
    */
Index: kaffe/libraries/javalib/java/awt/Toolkit.java
diff -u kaffe/libraries/javalib/java/awt/Toolkit.java:1.23 kaffe/libraries/javalib/java/awt/Toolkit.java:1.24
--- kaffe/libraries/javalib/java/awt/Toolkit.java:1.23	Fri Feb 18 15:13:40 2005
+++ kaffe/libraries/javalib/java/awt/Toolkit.java	Thu Feb 24 12:00:09 2005
@@ -97,7 +97,7 @@
 {
   /** The default toolkit name. */
   private static String default_toolkit_name
-    = gnu.classpath.Configuration.default_awt_peer_toolkit;
+    = "gnu.java.awt.peer.gtk.GtkToolkit";
 
   /**
    * The toolkit in use.  Once we load it, we don't ever change it