diff options
| author | Roman Kennke <roman@kennke.org> | 2006-02-21 14:03:18 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-02-21 14:03:18 +0000 |
| commit | 05973991448891c544f5fbcc5941ac66bec38188 (patch) | |
| tree | 886040f04c8c367946ca048b572e4a3d46be2d65 | |
| parent | 5a1955ce950c4f0aa7dd9ea9dbcd441806befda6 (diff) | |
| download | classpath-05973991448891c544f5fbcc5941ac66bec38188.tar.gz | |
2006-02-21 Roman Kennke <kennke@aicas.com>
* javax/swing/plaf/basic/BasicTextUI.java
(RootView.setView): Call setParent() on the view with this as
argument instead of null.
(setView): Don't set root view's parent here.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicTextUI.java | 5 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2006-02-21 Roman Kennke <kennke@aicas.com> + * javax/swing/plaf/basic/BasicTextUI.java + (RootView.setView): Call setParent() on the view with this as + argument instead of null. + (setView): Don't set root view's parent here. + +2006-02-21 Roman Kennke <kennke@aicas.com> + * javax/swing/text/AbstractDocument.java (AbstractElement.getAttribute): Use getResolveParent() to fetch the resolving parent. diff --git a/javax/swing/plaf/basic/BasicTextUI.java b/javax/swing/plaf/basic/BasicTextUI.java index 4d571213a..516049838 100644 --- a/javax/swing/plaf/basic/BasicTextUI.java +++ b/javax/swing/plaf/basic/BasicTextUI.java @@ -179,7 +179,7 @@ public abstract class BasicTextUI extends TextUI view.setParent(null); if (v != null) - v.setParent(null); + v.setParent(this); view = v; } @@ -964,7 +964,7 @@ public abstract class BasicTextUI extends TextUI // The reference implementation does not throw an exception, too. p0 = Math.min(p0, t.getDocument().getLength()); p1 = Math.min(p1, t.getDocument().getLength()); - + Rectangle l1 = modelToView(t, p0, firstBias); Rectangle l2 = modelToView(t, p1, secondBias); if (l1.y == l2.y) @@ -1217,7 +1217,6 @@ public abstract class BasicTextUI extends TextUI protected final void setView(View view) { rootView.setView(view); - view.setParent(rootView); textComponent.revalidate(); textComponent.repaint(); } |