2005-08-17 Lillian Angel <[EMAIL PROTECTED]>
* 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.
? .ChangeLog.swp
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
Index: javax/swing/plaf/basic/BasicTextUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTextUI.java,v
retrieving revision 1.30
diff -u -r1.30 BasicTextUI.java
--- javax/swing/plaf/basic/BasicTextUI.java 2 Aug 2005 09:33:36 -0000 1.30
+++ javax/swing/plaf/basic/BasicTextUI.java 17 Aug 2005 19:55:26 -0000
@@ -244,7 +244,7 @@
* @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);
}
Index: javax/swing/text/CompositeView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/CompositeView.java,v
retrieving revision 1.2
diff -u -r1.2 CompositeView.java
--- javax/swing/text/CompositeView.java 2 Aug 2005 09:33:36 -0000 1.2
+++ javax/swing/text/CompositeView.java 17 Aug 2005 19:55:26 -0000
@@ -244,7 +244,7 @@
* @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);
Index: javax/swing/text/FieldView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/FieldView.java,v
retrieving revision 1.5
diff -u -r1.5 FieldView.java
--- javax/swing/text/FieldView.java 2 Jul 2005 20:32:51 -0000 1.5
+++ javax/swing/text/FieldView.java 17 Aug 2005 19:55:26 -0000
@@ -173,4 +173,9 @@
super.removeUpdate(ev, newAlloc, vf);
}
+ public int viewToModel(float fx, float fy, Shape a, Position.Bias[] bias)
+ {
+ return super.viewToModel(fx, fy, a, bias);
+ }
+
}
Index: javax/swing/text/GlyphView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/GlyphView.java,v
retrieving revision 1.2
diff -u -r1.2 GlyphView.java
--- javax/swing/text/GlyphView.java 2 Aug 2005 09:33:36 -0000 1.2
+++ javax/swing/text/GlyphView.java 17 Aug 2005 19:55:26 -0000
@@ -121,9 +121,9 @@
* @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;
}
}
Index: javax/swing/text/IconView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/IconView.java,v
retrieving revision 1.2
diff -u -r1.2 IconView.java
--- javax/swing/text/IconView.java 2 Aug 2005 09:33:36 -0000 1.2
+++ javax/swing/text/IconView.java 17 Aug 2005 19:55:26 -0000
@@ -120,9 +120,9 @@
* @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;
}
}
Index: javax/swing/text/PasswordView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/PasswordView.java,v
retrieving revision 1.6
diff -u -r1.6 PasswordView.java
--- javax/swing/text/PasswordView.java 16 Aug 2005 19:46:01 -0000 1.6
+++ javax/swing/text/PasswordView.java 17 Aug 2005 19:55:26 -0000
@@ -239,7 +239,6 @@
*/
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);
}
}
Index: javax/swing/text/PlainView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/PlainView.java,v
retrieving revision 1.10
diff -u -r1.10 PlainView.java
--- javax/swing/text/PlainView.java 2 Aug 2005 09:33:36 -0000 1.10
+++ javax/swing/text/PlainView.java 17 Aug 2005 19:55:26 -0000
@@ -250,9 +250,9 @@
* @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;
}
}
Index: javax/swing/text/View.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/View.java,v
retrieving revision 1.15
diff -u -r1.15 View.java
--- javax/swing/text/View.java 2 Aug 2005 09:33:36 -0000 1.15
+++ javax/swing/text/View.java 17 Aug 2005 19:55:26 -0000
@@ -526,5 +526,5 @@
* @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);
}
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
