Partly fixes PR 27220.

2006-04-28  Robert Schuster  <robertschuster@fsfe.org>

        * javax/swing/text/View.java:
        (getNextVisualPositionFrom): Call modelToView and viewToModel on parent
        view.

2 files changed, 14 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c011d3a4..7960ba2d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2006-04-28  Robert Schuster  <robertschuster@fsfe.org>
 
 	* javax/swing/text/View.java:
+	(getNextVisualPositionFrom): Call modelToView and viewToModel on parent
+	view.
+
+2006-04-28  Robert Schuster  <robertschuster@fsfe.org>
+
+	* javax/swing/text/View.java:
 	(getNextVisualPositionFrom): Rewritten.
 	* javax/swing/text/CompositeView.java:
 	(getNextEastWestVisualPositionFrom): Partly implemented.
diff --git a/javax/swing/text/View.java b/javax/swing/text/View.java
index 80b74f511..d8ad5f585 100644
--- a/javax/swing/text/View.java
+++ b/javax/swing/text/View.java
@@ -734,6 +734,7 @@ public abstract class View implements SwingConstants
   {
     int ret = pos;
     Rectangle r;
+    View parent;
 
     switch (d)
     {
@@ -749,14 +750,16 @@ public abstract class View implements SwingConstants
         ret = Math.max(pos - 1, getStartOffset());
         break;
       case NORTH:
-        // Try to find a suitable offset by examining the area above. 
-        r =  modelToView(pos, a, b).getBounds();
-        ret = viewToModel(r.x, r.y - 1, a, biasRet);
+        // Try to find a suitable offset by examining the area above.
+        parent = getParent();
+        r =  parent.modelToView(pos, a, b).getBounds();
+        ret = parent.viewToModel(r.x, r.y - 1, a, biasRet);
         break;
       case SOUTH:
         // Try to find a suitable offset by examining the area below. 
-        r =  modelToView(pos, a, b).getBounds();
-        ret = viewToModel(r.x + r.width, r.y + r.height, a, biasRet);
+        parent = getParent();
+        r =  parent.modelToView(pos, a, b).getBounds();
+        ret = parent.viewToModel(r.x + r.width, r.y + r.height, a, biasRet);
         break;
       default:
         throw new IllegalArgumentException("Illegal value for d");