--- /home/cpdev/src/classpath/javax/swing/FocusManager.java	2005-07-07 17:32:56.000000000 +0000
+++ javax/swing/FocusManager.java	2005-06-30 05:35:08.000000000 +0000
@@ -40,7 +40,6 @@
 
 import java.awt.Component;
 import java.awt.DefaultKeyboardFocusManager;
-import java.awt.KeyboardFocusManager;
 import java.awt.event.KeyEvent;
 
 /**
@@ -48,114 +47,140 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public abstract class FocusManager
-  extends DefaultKeyboardFocusManager
+public abstract class FocusManager extends DefaultKeyboardFocusManager
 {
-  /**
-   * DisabledFocusManager
-   */
-  static class DisabledFocusManager
-    extends FocusManager
-  {
-
-    /**
-     * Constructor DisabledFocusManager
-     */
-    DisabledFocusManager()
-    {
-      // TODO
-    }
-
-    /**
-     * processKeyEvent
-     * @param component TODO
-     * @param event TODO
-     */
-    public void processKeyEvent(Component component, KeyEvent event)
-    {
-      // TODO
-    }
-
-    /**
-     * focusNextComponent
-     * @param component TODO
-     */
-    public void focusNextComponent(Component component)
-    {
-      // TODO
-    }
-
-    /**
-     * focusPreviousComponent
-     * @param value0 TODO
-     */
-    public void focusPreviousComponent(Component value0)
-    {
-      // TODO
-    }
-  }
-
-  /**
-   * FOCUS_MANAGER_CLASS_PROPERTY
-   */
-  public static final String FOCUS_MANAGER_CLASS_PROPERTY =
-    "FocusManagerClassName";
-
-  /**
-   * Constructor FocusManager
-   */
-  public FocusManager()
-  {
-    super();
-  }
-
-  /**
-   * getCurrentManager
-   * @returns FocusManager
-   */
-  public static FocusManager getCurrentManager()
-  {
-    KeyboardFocusManager fm =
-      KeyboardFocusManager.getCurrentKeyboardFocusManager();
-    if (fm instanceof FocusManager)
-      return (FocusManager) fm;
-    else
-      {
-        System.err.println("The Swing FocusManager API has been obsoleted by");
-        System.err.println("the new KeyboardFocusManager system.");
-        System.err.println("You should either not use the Swing FocusManager");
-        System.err.println("API or set the system property");
-        System.err.println
-          ("gnu.java.awt.FocusManager=javax.swing.FocusManager");
-      }
-      return null;
-  }
-
-  /**
-   * setCurrentManager
-   * @param manager TODO
-   */
-  public static void setCurrentManager(FocusManager manager)
-  {
-    KeyboardFocusManager.setCurrentKeyboardFocusManager(manager);
-  }
-
-  /**
-   * disableSwingFocusManager
-   * @deprecated 1.4
-   */
-  public static void disableSwingFocusManager()
-  {
-    // TODO
-  }
-
-  /**
-   * isFocusManagerEnabled
-   * @return boolean
-   * @deprecated 1.4
-   */
-  public static boolean isFocusManagerEnabled()
-  {
-    return false; // TODO
-  }
-}
+
+	//-------------------------------------------------------------
+	// Classes ----------------------------------------------------
+	//-------------------------------------------------------------
+
+	/**
+	 * DisabledFocusManager
+	 */
+	static class DisabledFocusManager extends FocusManager {
+
+		//-------------------------------------------------------------
+		// Initialization ---------------------------------------------
+		//-------------------------------------------------------------
+
+		/**
+		 * Constructor DisabledFocusManager
+		 */
+		DisabledFocusManager() {
+			// TODO
+		} // DisabledFocusManager()
+
+
+		//-------------------------------------------------------------
+		// Methods ----------------------------------------------------
+		//-------------------------------------------------------------
+
+		/**
+		 * processKeyEvent
+		 * @param component TODO
+		 * @param event TODO
+		 */
+		public void processKeyEvent(Component component, KeyEvent event) {
+			// TODO
+		} // processKeyEvent()
+
+		/**
+		 * focusNextComponent
+		 * @param component TODO
+		 */
+		public void focusNextComponent(Component component) {
+			// TODO
+		} // focusNextComponent()
+
+		/**
+		 * focusPreviousComponent
+		 * @param value0 TODO
+		 */
+		public void focusPreviousComponent(Component value0) {
+			// TODO
+		} // focusPreviousComponent()
+
+
+	} // DisabledFocusManager
+
+
+	//-------------------------------------------------------------
+	// Variables --------------------------------------------------
+	//-------------------------------------------------------------
+
+	/**
+	 * FOCUS_MANAGER_CLASS_PROPERTY
+	 */
+	public static final String FOCUS_MANAGER_CLASS_PROPERTY = "FocusManagerClassName";
+
+
+	//-------------------------------------------------------------
+	// Initialization ---------------------------------------------
+	//-------------------------------------------------------------
+
+	/**
+	 * Constructor FocusManager
+	 */
+	public FocusManager() {
+		// TODO
+	} // FocusManager()
+
+
+	//-------------------------------------------------------------
+	// Methods ----------------------------------------------------
+	//-------------------------------------------------------------
+
+	/**
+	 * getCurrentManager
+	 * @returns FocusManager
+	 */
+	public static FocusManager getCurrentManager() {
+		return null; // TODO
+	} // getCurrentManager()
+
+	/**
+	 * setCurrentManager
+	 * @param manager TODO
+	 */
+	public static void setCurrentManager(FocusManager manager) {
+		// TODO
+	} // setCurrentManager()
+
+	/**
+	 * disableSwingFocusManager
+	 * @deprecated 1.4
+	 */
+	public static void disableSwingFocusManager() {
+		// TODO
+	} // disableSwingFocusManager()
+
+	/**
+	 * isFocusManagerEnabled
+	 * @return boolean
+	 * @deprecated 1.4
+	 */
+	public static boolean isFocusManagerEnabled() {
+		return false; // TODO
+	} // isFocusManagerEnabled()
+
+	/**
+	 * processKeyEvent
+	 * @param component TODO
+	 * @param event TODO
+	 */
+	public abstract void processKeyEvent(Component component, KeyEvent event);
+
+	/**
+	 * focusNextComponent
+	 * @param component TODO
+	 */
+	public abstract void focusNextComponent(Component component);
+
+	/**
+	 * focusPreviousComponent
+	 * @param component TODO
+	 */
+	public abstract void focusPreviousComponent(Component component);
+
+
+} // FocusManager