--- /home/cpdev/src/classpath/java/awt/KeyboardFocusManager.java	2005-07-07 17:32:52.000000000 +0000
+++ java/awt/KeyboardFocusManager.java	2005-06-30 05:34:27.000000000 +0000
@@ -38,10 +38,8 @@
 
 package java.awt;
 
-import java.applet.Applet;
 import java.awt.event.FocusEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.beans.PropertyVetoException;
@@ -287,7 +285,7 @@
     KeyboardFocusManager manager;
 
     if (m == null)
-      manager = createFocusManager();
+      manager = new DefaultKeyboardFocusManager ();
     else
       manager = m;
 
@@ -295,46 +293,6 @@
   }
 
   /**
-   * Creates a KeyboardFocusManager. The exact class is determined by the
-   * system property 'gnu.java.awt.FocusManager'. If this is not set,
-   * we default to DefaultKeyboardFocusManager.
-   */
-  private static KeyboardFocusManager createFocusManager()
-  {
-    String fmClassName = System.getProperty("gnu.java.awt.FocusManager",
-                                       "java.awt.DefaultKeyboardFocusManager");
-    try
-      {
-        Class fmClass = Class.forName(fmClassName);
-        KeyboardFocusManager fm = (KeyboardFocusManager) fmClass.newInstance();
-        return fm;
-      }
-    catch (ClassNotFoundException ex)
-      {
-        System.err.println("The class " + fmClassName + " cannot be found.");
-        System.err.println("Check the setting of the system property");
-        System.err.println("gnu.java.awt.FocusManager");
-        return null;
-      }
-    catch (InstantiationException ex)
-      {
-        System.err.println("The class " + fmClassName + " cannot be");
-        System.err.println("instantiated.");
-        System.err.println("Check the setting of the system property");
-        System.err.println("gnu.java.awt.FocusManager");
-        return null;
-      }
-    catch (IllegalAccessException ex)
-      {
-        System.err.println("The class " + fmClassName + " cannot be");
-        System.err.println("accessed.");
-        System.err.println("Check the setting of the system property");
-        System.err.println("gnu.java.awt.FocusManager");
-        return null;
-      }
-  }
-
-  /**
    * Retrieve the {@link Component} that has the keyboard focus, or
    * null if the focus owner was not set by a thread in the current
    * {@link java.lang.ThreadGroup}.
@@ -377,8 +335,8 @@
    * @param owner the Component to return from getFocusOwner and
    * getGlobalFocusOwner
    *
-   * @see Component#requestFocus()
-   * @see Component#requestFocusInWindow()
+   * @see Component.requestFocus ()
+   * @see Component.requestFocusInWindow ()
    */
   protected void setGlobalFocusOwner (Component owner)
   {
@@ -461,8 +419,8 @@
    * @param focusOwner the Component to return from
    * getPermanentFocusOwner and getGlobalPermanentFocusOwner
    *
-   * @see Component#requestFocus()
-   * @see Component#requestFocusInWindow()
+   * @see Component.requestFocus ()
+   * @see Component.requestFocusInWindow ()
    */
   protected void setGlobalPermanentFocusOwner (Component focusOwner)
   {