summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Balkissoon <abalkiss@redhat.com>2005-11-02 19:07:00 +0000
committerAnthony Balkissoon <abalkiss@redhat.com>2005-11-02 19:07:00 +0000
commitfa618cf8813fec1dcee1f7f49185d80dc7c7c3bf (patch)
treeb587f9997bff14f5c36f94a5fff3422aef3f010a
parentd7846e5f0be39d107b7b31b18999602e652f249e (diff)
downloadclasspath-fa618cf8813fec1dcee1f7f49185d80dc7c7c3bf.tar.gz
2005-11-02 Anthony Balkissoon <abalkiss@redhat.com>
* javax/swing/text/WrappedPlainView.java: (calculateBreakPosition): If the component is not valid use it's preferredSize instead of getBounds().
-rw-r--r--ChangeLog6
-rw-r--r--javax/swing/text/WrappedPlainView.java3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 13b0ed177..b35b131da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-02 Anthony Balkissoon <abalkiss@redhat.com>
+
+ * javax/swing/text/WrappedPlainView.java:
+ (calculateBreakPosition): If the component is not valid use it's
+ preferredSize instead of getBounds().
+
2005-11-02 Lillian Angel <langel@redhat.com>
* java/awt/Dialog.java
diff --git a/javax/swing/text/WrappedPlainView.java b/javax/swing/text/WrappedPlainView.java
index 02200d254..5b70c9df2 100644
--- a/javax/swing/text/WrappedPlainView.java
+++ b/javax/swing/text/WrappedPlainView.java
@@ -226,7 +226,8 @@ public class WrappedPlainView extends BoxView implements TabExpander
protected int calculateBreakPosition(int p0, int p1)
{
Container c = getContainer();
- Rectangle alloc = c.getBounds();
+ Rectangle alloc = c.isValid() ? c.getBounds()
+ : new Rectangle(c.getPreferredSize());
updateMetrics();
try
{