Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.8.2.13
diff -u -r1.8.2.13 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java	10 Nov 2004 07:19:47 -0000	1.8.2.13
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	30 Dec 2004 16:44:53 -0000
@@ -59,12 +59,14 @@
 import java.awt.image.ImageObserver;
 import java.awt.image.ImageProducer;
 import java.awt.peer.*;
+import java.io.InputStream;
 import java.net.URL;
 import java.text.AttributedString;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Properties;
@@ -313,7 +315,7 @@
 			   "SansSerif" });
   }
 
-  private class LRUCache extends java.util.LinkedHashMap
+  private class LRUCache extends LinkedHashMap
   {    
     int max_entries;
     public LRUCache(int max)
@@ -613,15 +615,11 @@
 
   public GraphicsEnvironment getLocalGraphicsEnvironment()
   {
-    GraphicsEnvironment ge;
-    ge = new GdkGraphicsEnvironment ();  
-    return ge;
+    return new GdkGraphicsEnvironment();
   }
 
-  public Font createFont(int format, java.io.InputStream stream)
+  public Font createFont(int format, InputStream stream)
   {
-    throw new java.lang.UnsupportedOperationException ();
+    throw new UnsupportedOperationException();
   }
-
-
-} // class GtkToolkit
+}
Index: java/awt/Window.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Window.java,v
retrieving revision 1.32.12.17
diff -u -r1.32.12.17 Window.java
--- java/awt/Window.java	29 Dec 2004 04:14:27 -0000	1.32.12.17
+++ java/awt/Window.java	30 Dec 2004 16:44:53 -0000
@@ -218,12 +218,11 @@
         && gc.getDevice().getType() != GraphicsDevice.TYPE_RASTER_SCREEN)
       throw new IllegalArgumentException ("gc must be from a screen device");
 
-    // FIXME: until we implement this, it just causes AWT to crash.
-//     if (gc == null)
-//       graphicsConfiguration = GraphicsEnvironment.getLocalGraphicsEnvironment()
-//         .getDefaultScreenDevice()
-//         .getDefaultConfiguration();
-//     else
+    if (gc == null)
+      graphicsConfiguration = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                                                 .getDefaultScreenDevice()
+                                                 .getDefaultConfiguration();
+    else
       graphicsConfiguration = gc;
   }