2005-11-14 Roman Kennke <kennke@aicas.com>

	* javax/swing/plaf/basic/BasicTextUI.java
	(uninstallListeners): Uninstall the document listener here.
	(getVisibleEditorRect): Fetch the textComponent via getComponent().

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f5422866c..a479a16c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-11-14  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(uninstallListeners): Uninstall the document listener here.
+	(getVisibleEditorRect): Fetch the textComponent via getComponent().
+
+2005-11-14  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/text/BoxView.java
 	(paint): Only paint child if it is inside the current clip.
 
diff --git a/javax/swing/plaf/basic/BasicTextUI.java b/javax/swing/plaf/basic/BasicTextUI.java
index e1c5564ea..b9de92640 100644
--- a/javax/swing/plaf/basic/BasicTextUI.java
+++ b/javax/swing/plaf/basic/BasicTextUI.java
@@ -748,6 +748,7 @@ public abstract class BasicTextUI extends TextUI
   protected void uninstallListeners()
   {
     textComponent.removeFocusListener(focuslistener);
+    textComponent.getDocument().removeDocumentListener(documentHandler);
   }
 
   /**
@@ -1057,6 +1058,7 @@ public abstract class BasicTextUI extends TextUI
    */
   protected Rectangle getVisibleEditorRect()
   {
+    JTextComponent textComponent = getComponent();
     int width = textComponent.getWidth();
     int height = textComponent.getHeight();