--- /home/cpdev/src/classpath/javax/swing/JEditorPane.java	2005-07-02 21:04:00.000000000 +0000
+++ javax/swing/JEditorPane.java	2005-06-30 05:35:09.000000000 +0000
@@ -61,6 +61,7 @@
   private EditorKit editorKit;
   
   boolean focus_root;
+  boolean manages_focus;
 
   public JEditorPane()
   {
@@ -117,14 +118,8 @@
     return getEditorKit().getContentType();
   }
 
-  /**
-   * Returns the EditorKit. If there is no EditorKit set this method
-   * calls createDefaultEditorKit() and setEditorKit() first.
-   */
   public EditorKit getEditorKit()
   {
-    if (editorKit == null)
-      setEditorKit(createDefaultEditorKit());
     return editorKit;
   }
 
@@ -182,12 +177,32 @@
     return focus_root;
   }
 
+  public boolean isManagingFocus()
+  {
+    return manages_focus;
+  }
+
   protected String paramString()
   {
     return "JEditorPane";
   }
 
   /**
+   * Overridden to handle processing of tab/shift tab. 
+   */
+  protected void processComponentKeyEvent(KeyEvent e)
+  {
+  }
+
+  /**
+   * Make sure that TAB and Shift-TAB events get consumed,
+   * so that awt doesn't attempt focus traversal.  
+   */
+  protected void processKeyEvent(KeyEvent e)
+  {
+  }
+
+  /**
    * This method initializes from a stream. 
    */
   public void read(InputStream in, Object desc)