CVSROOT: /cvsroot/classpath
Module name: classpath
Branch: generics-branch
Changes by: Mark Wielaard <mark> 06/08/08 20:40:51
Modified files:
. : ChangeLog
javax/swing/plaf/basic: BasicTextUI.java
javax/swing/text: BoxView.java CompositeView.java
DefaultCaret.java FlowView.java IconView.java
ParagraphView.java View.java
Log message:
2006-08-08 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/plaf/basic/BasicTextUI.java
(damageRange(JTextComponent,int,int)): Call damageRange() with
correct biases, rather than null.
(damageRange(JTextComponent,int,int,Bias,Bias)): Rewritten
to use simpler modelToView() approach without much special
casing. This seems not worth the effort and actually
caused problems. Added locking of the document.
* javax/swing/text/BoxView.java
(requirementsValid): New field.
(calculateMajorAxisRequirements): Rewritten without using
SizeRequirements. The SizeRequirements algorithms are slightly
different and too inefficient.
(calculateMinorAxisRequirements): Rewritten without using
SizeRequirements. The SizeRequirements algorithms are slightly
different and too inefficient.
(getAlignment): Simply return the alignment of the cached
requirements.
(getMaximumSpan): Add insets.
(getMinimumSpan): Add insets.
(getPreferredSpan): Add insets.
(layoutMajorAxis): Rewritten without using
SizeRequirements. The SizeRequirements algorithms are slightly
different and too inefficient.
(layoutMinorAxis): Rewritten without using
SizeRequirements. The SizeRequirements algorithms are slightly
different and too inefficient.
(modelToView): Call setSize() rather than layout().
(paint): Check clip for more efficient painting.
(preferenceChanged): Invalidate requirements here.
(replace): Invalidate requirements here.
(updateRequirements): Update requirements only when requirements
are marked invalid.
* javax/swing/text/CompositeView.java
(modelToView): Added some more checks and handling of corner
cases.
* javax/swing/text/FlowView.java
(calculateMinorAxisRequirements): Set aligment to 0.5 and
maximum
span to Integer.MAX_VALUE. Limit preferredSize to minimumSize.
* javax/swing/text/IconView.java
(getAlignment): Implemented to return 1.0 for vertical
alignment.
* javax/swing/text/ParagraphView.java
(Row.getMaximumSpan): Implemented to let Rows span the whole
ParagraphView.
(getAlignment): Fixed horizontal alignment and vertical
alignment
for empty paragraphs to be 0.5.
2006-08-08 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/text/View.java
(modelToView): Added special handling for corner case at the end
of the view and for multiline views.
2006-08-08 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/plaf/basic/BasicTextUI.java
(modelToView): Read-lock the document. Set size of the
root view before fetching the model-to-view mapping.
(getViewIndex): Check of the position is inside the range and
return -1 if this is not the case.
(getViewAtPosition(int,Rectangle): Update child allocation for
valid
view index.
(getViewIndexAtPosition(int)): Delegate the index search to
the element since we have a 1:1 mapping between elements and
views here.
* javax/swing/text/DefaultCaret.java
(appear): Ignore BadLocationException.
(paint): Ignore BadLocationException.
* javax/swing/text/FlowView.java
(changedUpdate): Also notify the layoutPool view.
(removeUpdate): Also notify the layoutPool view.
* javax/swing/text/ParagraphView.java
(Row.getViewIndexAtPosition): Overridden to search linearily
through the view instead of relying on a 1:1 model to view
mapping.
* javax/swing/text/View.java
(removeUpdate): Clear ElementChange object if updateChildren
returns false.
(forwardUpdate): Special handle some boundary cases.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.323&r2=1.2386.2.324
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.10.2.25&r2=1.10.2.26
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/BoxView.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.8&r2=1.2.2.9
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/CompositeView.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.10&r2=1.2.2.11
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/DefaultCaret.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.7.2.22&r2=1.7.2.23
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/FlowView.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.8&r2=1.1.2.9
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/IconView.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.5&r2=1.2.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/ParagraphView.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/View.java?cvsroot=classpath&only_with_tag=generics-branch&r1=1.6.2.15&r2=1.6.2.16
