2005-11-17 Anthony Balkissoon <abalkiss@redhat.com>

	* javax/swing/text/BoxView.java:
	(modelToView): New API method.

2 files changed, 23 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1348319c0..e8cb1881a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-17  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* javax/swing/text/BoxView.java:
+	(modelToView): New API method.
+
 2005-11-17  Lillian Angel  <langel@redhat.com>
 
 	Fixes PR classpath/PR24721
diff --git a/javax/swing/text/BoxView.java b/javax/swing/text/BoxView.java
index 0bdd14d0a..5c9587dfe 100644
--- a/javax/swing/text/BoxView.java
+++ b/javax/swing/text/BoxView.java
@@ -740,4 +740,22 @@ public class BoxView
       yLayoutValid = false;
     super.preferenceChanged(child, width, height);
   }
+  
+  /**
+   * Maps the document model position <code>pos</code> to a Shape
+   * in the view coordinate space.  This method overrides CompositeView's
+   * method to make sure the children are allocated properly before
+   * calling the super's behaviour.
+   */
+  public Shape modelToView(int pos, Shape a, Position.Bias bias)
+      throws BadLocationException
+  {
+    // Make sure everything is allocated properly and then call super
+    if (!isAllocationValid())
+      {
+        Rectangle bounds = a.getBounds();
+        setSize(bounds.width, bounds.height);
+      }
+    return super.modelToView(pos, a, bias);
+  }
 }