2005-08-17 Lillian Angel <langel@redhat.com>

        * javax/swing/plaf/basic/BasicTextUI.java
        (viewToModel): Changed to match API spec.
        * javax/swing/text/CompositeView.java
        (viewToModel): Changed to match API spec.
        * javax/swing/text/FieldView.java
        (viewToModel): Changed to match API spec.
        * javax/swing/text/GlyphView.java
        (viewToModel): Changed to match API spec.
        * javax/swing/text/IconView.java
        (viewToModel): Changed to match API spec.
        * javax/swing/text/PasswordView.java
        (viewToModel): Changed to match API spec.
        * javax/swing/text/PlainView.java
        (viewToModel): Changed to match API spec.
        * javax/swing/text/View.java
        (viewToModel): Changed to match API spec.

9 files changed, 34 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b64bc7fa9..f3e8618cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-08-17  Lillian Angel  <langel@redhat.com>
+
+	* javax/swing/plaf/basic/BasicTextUI.java
+	(viewToModel): Changed to match API spec.
+	* javax/swing/text/CompositeView.java
+	(viewToModel): Changed to match API spec.
+	* javax/swing/text/FieldView.java
+	(viewToModel): Changed to match API spec.
+	* javax/swing/text/GlyphView.java
+	(viewToModel): Changed to match API spec.
+	* javax/swing/text/IconView.java
+	(viewToModel): Changed to match API spec.
+	* javax/swing/text/PasswordView.java
+	(viewToModel): Changed to match API spec.
+	* javax/swing/text/PlainView.java
+	(viewToModel): Changed to match API spec.
+	* javax/swing/text/View.java
+	(viewToModel): Changed to match API spec.
+
 2005-08-17  Anthony Balkissoon  <abalkiss@redhat.com>
 
 	* javax/swing/JList.java:
diff --git a/javax/swing/plaf/basic/BasicTextUI.java b/javax/swing/plaf/basic/BasicTextUI.java
index 236c0ccd0..6e83f09db 100644
--- a/javax/swing/plaf/basic/BasicTextUI.java
+++ b/javax/swing/plaf/basic/BasicTextUI.java
@@ -244,7 +244,7 @@ public abstract class BasicTextUI extends TextUI
      * @return the position in the document that corresponds to the screen
      *         coordinates <code>x, y</code>
      */
-    public int viewToModel(float x, float y, Shape a, Position.Bias b)
+    public int viewToModel(float x, float y, Shape a, Position.Bias[] b)
     {
       return view.viewToModel(x, y, a, b);
     }
diff --git a/javax/swing/text/CompositeView.java b/javax/swing/text/CompositeView.java
index 60d453b9e..28675ff29 100644
--- a/javax/swing/text/CompositeView.java
+++ b/javax/swing/text/CompositeView.java
@@ -244,7 +244,7 @@ public abstract class CompositeView
    * @return the position in the document that corresponds to the screen
    *         coordinates <code>x, y</code>
    */
-  public int viewToModel(float x, float y, Shape a, Position.Bias b)
+  public int viewToModel(float x, float y, Shape a, Position.Bias[] b)
   {
     Rectangle r = getInsideAllocation(a);
     View view = getViewAtPoint((int) x, (int) y, r);
diff --git a/javax/swing/text/FieldView.java b/javax/swing/text/FieldView.java
index 4d5c51ceb..e2e04d7c4 100644
--- a/javax/swing/text/FieldView.java
+++ b/javax/swing/text/FieldView.java
@@ -173,4 +173,9 @@ public class FieldView extends PlainView
     super.removeUpdate(ev, newAlloc, vf);
   }
 
+  public int viewToModel(float fx, float fy, Shape a, Position.Bias[] bias)
+  {
+    return super.viewToModel(fx, fy, a, bias);
+  }
+  
 }
diff --git a/javax/swing/text/GlyphView.java b/javax/swing/text/GlyphView.java
index c5a89d2f0..9c9b2a4b1 100644
--- a/javax/swing/text/GlyphView.java
+++ b/javax/swing/text/GlyphView.java
@@ -121,9 +121,9 @@ public class GlyphView
    * @return the position in the document that corresponds to the screen
    *         coordinates <code>x, y</code>
    */
-  public int viewToModel(float x, float y, Shape a, Position.Bias b)
+  public int viewToModel(float x, float y, Shape a, Position.Bias[] b)
   {
-    // FIXME: Implement this properly.
+    // FIXME: not implemented
     return 0;
   }
 }
diff --git a/javax/swing/text/IconView.java b/javax/swing/text/IconView.java
index 78d91be12..a154cf1d7 100644
--- a/javax/swing/text/IconView.java
+++ b/javax/swing/text/IconView.java
@@ -120,9 +120,9 @@ public class IconView
    * @return the position in the document that corresponds to the screen
    *         coordinates <code>x, y</code>
    */
-  public int viewToModel(float x, float y, Shape a, Position.Bias b)
+  public int viewToModel(float x, float y, Shape a, Position.Bias[] b)
   {
-    // FIXME: Implement this properly.
+    // FIXME: not implemented
     return 0;
   }
 }
diff --git a/javax/swing/text/PasswordView.java b/javax/swing/text/PasswordView.java
index defbae617..c3aa66cbe 100644
--- a/javax/swing/text/PasswordView.java
+++ b/javax/swing/text/PasswordView.java
@@ -239,7 +239,6 @@ public class PasswordView
    */
   public int viewToModel(float fx, float fy, Shape a, Position.Bias[] bias)
   {
-    // FIXME: not implemented
-    return super.viewToModel(fx, fy, a, bias[0]);
+    return super.viewToModel(fx, fy, a, bias);
   }
 }
diff --git a/javax/swing/text/PlainView.java b/javax/swing/text/PlainView.java
index 35909593c..91d7547e7 100644
--- a/javax/swing/text/PlainView.java
+++ b/javax/swing/text/PlainView.java
@@ -250,9 +250,9 @@ public class PlainView extends View
    * @return the position in the document that corresponds to the screen
    *         coordinates <code>x, y</code>
    */
-  public int viewToModel(float x, float y, Shape a, Position.Bias b)
+  public int viewToModel(float x, float y, Shape a, Position.Bias[] b)
   {
-    // FIXME: Implement this properly.
+    // FIXME: not implemented
     return 0;
   }
 }
diff --git a/javax/swing/text/View.java b/javax/swing/text/View.java
index fba4e7015..f22ee9233 100644
--- a/javax/swing/text/View.java
+++ b/javax/swing/text/View.java
@@ -526,5 +526,5 @@ public abstract class View implements SwingConstants
    * @return the position in the document that corresponds to the screen
    *         coordinates <code>x, y</code>
    */
-  public abstract int viewToModel(float x, float y, Shape a, Position.Bias b);
+  public abstract int viewToModel(float x, float y, Shape a, Position.Bias[] b);
 }