* javax/swing/JEditorPane.java (getEditorKit): Call

       createDefaultEditorKit() and setEditorKit() when editorKit == null.
       * javax/swing/JTextPane.java: Call super for all methods where
       possible.

3 files changed, 18 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 6449e0534..042f04bb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-30  Mark Wielaard  <mark@klomp.org>
+
+	* javax/swing/JEditorPane.java (getEditorKit): Call
+	createDefaultEditorKit() and setEditorKit() when editorKit == null.
+	* javax/swing/JTextPane.java: Call super for all methods where
+	possible.
+
 2005-06-29  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* INSTALL: Drop GTK requirement to 2.4.
diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java
index 2b5d9e0a4..abb20a5d0 100644
--- a/javax/swing/JEditorPane.java
+++ b/javax/swing/JEditorPane.java
@@ -117,8 +117,14 @@ public class JEditorPane extends JTextComponent
     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;
   }
 
diff --git a/javax/swing/JTextPane.java b/javax/swing/JTextPane.java
index 95d2d5001..c7d2e0c4a 100644
--- a/javax/swing/JTextPane.java
+++ b/javax/swing/JTextPane.java
@@ -92,15 +92,6 @@ public class JTextPane extends JEditorPane {
 	//-------------------------------------------------------------
 
 	/**
-	 * writeObject
-	 * @param stream TODO
-	 * @exception IOException TODO
-	 */
-	private void writeObject(ObjectOutputStream stream) throws IOException {
-		// TODO
-	} // writeObject()
-
-	/**
 	 * getUIClassID
 	 * @returns String
 	 */
@@ -113,7 +104,7 @@ public class JTextPane extends JEditorPane {
 	 * @param document TODO
 	 */
 	public void setDocument(Document document) {
-		// TODO
+		super.setDocument(document); // TODO
 	} // setDocument()
 
 	/**
@@ -137,7 +128,7 @@ public class JTextPane extends JEditorPane {
 	 * @param content TODO
 	 */
 	public void replaceSelection(String content) {
-		// TODO
+		super.replaceSelection(content); // TODO
 	} // replaceSelection()
 
 	/**
@@ -256,7 +247,7 @@ public class JTextPane extends JEditorPane {
 	 * @returns EditorKit
 	 */
 	protected EditorKit createDefaultEditorKit() {
-		return null; // TODO
+		return super.createDefaultEditorKit(); // TODO
 	} // createDefaultEditorKit()
 
 	/**
@@ -264,7 +255,7 @@ public class JTextPane extends JEditorPane {
 	 * @param editor TODO
 	 */
 	public final void setEditorKit(EditorKit editor) {
-		// TODO
+		super.setEditorKit(editor); // TODO
 	} // setEditorKit()
 
 	/**
@@ -272,7 +263,7 @@ public class JTextPane extends JEditorPane {
 	 * @returns String
 	 */
 	protected String paramString() {
-		return null; // TODO
+		return super.paramString(); // TODO
 	} // paramString()