Obviously I forgot to commit 3 classes of this ChangeLog entry. Here comes the corresponding part of the patch.
/Roman Am Mittwoch, den 23.11.2005, 12:01 +0000 schrieb Roman Kennke: > Hi, > > For some reason the method getNextVisualPositionFrom was declared > abstract in javax.swing.text.View and also had the wrong signature. I > fixed this. I also had to fix all the other views. Some of them have > this method removed completely now (since it is no more abstract), > others only have the signatures fixed. > > 2005-11-23 Roman Kennke <[EMAIL PROTECTED]> > > * javax/swing/text/View.java > (getNextVisualPositionFrom): Fixed signature and (partly) > implemented this method. > * javax/swing/text/Utilities.java > (getPositionAbove): Fixed to use the correct signature for the > call > to above method. > (getPositionBelow): Fixed to use the correct signature for the > call > to above method. > * javax/swing/text/ComponentView.java > (getNextVisualPositionFrom): Removed method. This is not specified > to be implemented. > * javax/swing/text/CompositeView.java > (getNextVisualPositionFrom): Removed method with wrong signature. > A method with the correct signature is already in place. > * javax/swing/text/FlowView.java > (LogicalView.getNextVisualPositionFrom): Removed method with wrong > signature. > * javax/swing/text/GlyphView.java > (getNextVisualPositionFrom): Removed method with wrong signature. > A method with the correct signature is already in place. > * javax/swing/text/IconView.java > (getNextVisualPositionFrom): Removed method. This is not specified > to be implemented. > * javax/swing/text/PlainView.java > (getNextVisualPositionFrom): Removed method. This is not specified > to be implemented. > * javax/swing/text/WrappedPlainView.java > (WrappedLine.getNextVisualPositionFrom): Removed method with wrong > signature. > * javax/swing/plaf/basic/BasicTextUI.java > (RootView.getNextVisualPositionFrom): Fixed signature. > > /Roman > _______________________________________________ > Classpath-patches mailing list > [email protected] > http://lists.gnu.org/mailman/listinfo/classpath-patches
Index: javax/swing/text/CompositeView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/CompositeView.java,v
retrieving revision 1.12
diff -u -r1.12 CompositeView.java
--- javax/swing/text/CompositeView.java 17 Nov 2005 20:45:13 -0000 1.12
+++ javax/swing/text/CompositeView.java 23 Nov 2005 14:20:57 -0000
@@ -661,34 +661,4 @@
{
return false;
}
-
- /**
- * Returns the document position that is (visually) nearest to the given
- * document position <code>pos</code> in the given direction <code>d</code>.
- *
- * @param c the text component
- * @param pos the document position
- * @param b the bias for <code>pos</code>
- * @param d the direction, must be either [EMAIL PROTECTED] SwingConstants#NORTH},
- * [EMAIL PROTECTED] SwingConstants#SOUTH}, [EMAIL PROTECTED] SwingConstants#WEST} or
- * [EMAIL PROTECTED] SwingConstants#EAST}
- * @param biasRet an array of [EMAIL PROTECTED] Position.Bias} that can hold at least
- * one element, which is filled with the bias of the return position
- * on method exit
- *
- * @return the document position that is (visually) nearest to the given
- * document position <code>pos</code> in the given direction
- * <code>d</code>
- *
- * @throws BadLocationException if <code>pos</code> is not a valid offset in
- * the document model
- */
- public int getNextVisualPositionFrom(JTextComponent c, int pos,
- Position.Bias b, int d,
- Position.Bias[] biasRet)
- throws BadLocationException
- {
- // TODO: Implement this properly.
- throw new AssertionError("Not implemented yet.");
- }
}
Index: javax/swing/text/GlyphView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/GlyphView.java,v
retrieving revision 1.12
diff -u -r1.12 GlyphView.java
--- javax/swing/text/GlyphView.java 17 Nov 2005 20:45:14 -0000 1.12
+++ javax/swing/text/GlyphView.java 23 Nov 2005 14:20:57 -0000
@@ -1057,34 +1057,4 @@
return painter.getNextVisualPositionFrom(this, pos, bias, a, direction,
biasRet);
}
-
- /**
- * Returns the document position that is (visually) nearest to the given
- * document position <code>pos</code> in the given direction <code>d</code>.
- *
- * @param c the text component
- * @param pos the document position
- * @param b the bias for <code>pos</code>
- * @param d the direction, must be either [EMAIL PROTECTED] SwingConstants#NORTH},
- * [EMAIL PROTECTED] SwingConstants#SOUTH}, [EMAIL PROTECTED] SwingConstants#WEST} or
- * [EMAIL PROTECTED] SwingConstants#EAST}
- * @param biasRet an array of [EMAIL PROTECTED] Position.Bias} that can hold at least
- * one element, which is filled with the bias of the return position
- * on method exit
- *
- * @return the document position that is (visually) nearest to the given
- * document position <code>pos</code> in the given direction
- * <code>d</code>
- *
- * @throws BadLocationException if <code>pos</code> is not a valid offset in
- * the document model
- */
- public int getNextVisualPositionFrom(JTextComponent c, int pos,
- Position.Bias b, int d,
- Position.Bias[] biasRet)
- throws BadLocationException
- {
- // TODO: Implement this properly.
- throw new AssertionError("Not implemented yet.");
- }
}
Index: javax/swing/text/WrappedPlainView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/WrappedPlainView.java,v
retrieving revision 1.8
diff -u -r1.8 WrappedPlainView.java
--- javax/swing/text/WrappedPlainView.java 16 Nov 2005 18:58:51 -0000 1.8
+++ javax/swing/text/WrappedPlainView.java 23 Nov 2005 14:20:58 -0000
@@ -620,36 +620,6 @@
currLineStart = currLineEnd;
}
}
-
- /**
- * Returns the document position that is (visually) nearest to the given
- * document position <code>pos</code> in the given direction <code>d</code>.
- *
- * @param c the text component
- * @param pos the document position
- * @param b the bias for <code>pos</code>
- * @param d the direction, must be either [EMAIL PROTECTED] SwingConstants#NORTH},
- * [EMAIL PROTECTED] SwingConstants#SOUTH}, [EMAIL PROTECTED] SwingConstants#WEST} or
- * [EMAIL PROTECTED] SwingConstants#EAST}
- * @param biasRet an array of [EMAIL PROTECTED] Position.Bias} that can hold at least
- * one element, which is filled with the bias of the return position
- * on method exit
- *
- * @return the document position that is (visually) nearest to the given
- * document position <code>pos</code> in the given direction
- * <code>d</code>
- *
- * @throws BadLocationException if <code>pos</code> is not a valid offset
- * in the document model
- */
- public int getNextVisualPositionFrom(JTextComponent c, int pos,
- Position.Bias b, int d,
- Position.Bias[] biasRet)
- throws BadLocationException
- {
- // TODO: Implement this properly.
- throw new AssertionError("Not implemented yet.");
- }
/**
* This method is called from insertUpdate and removeUpdate.
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
_______________________________________________ Classpath-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/classpath-patches
