CVSROOT: /cvsroot/classpath Module name: classpath Changes by: Roman Kennke <rabbit78> 06/08/05 12:13:21
Modified files: javax/swing/plaf/basic: BasicTextUI.java . : ChangeLog javax/swing/text: BoxView.java CompositeView.java FlowView.java IconView.java ParagraphView.java Log message: 2006-08-05 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. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicTextUI.java?cvsroot=classpath&r1=1.87&r2=1.88 http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.8324&r2=1.8325 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/BoxView.java?cvsroot=classpath&r1=1.19&r2=1.20 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/CompositeView.java?cvsroot=classpath&r1=1.18&r2=1.19 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/FlowView.java?cvsroot=classpath&r1=1.13&r2=1.14 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/IconView.java?cvsroot=classpath&r1=1.8&r2=1.9 http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/text/ParagraphView.java?cvsroot=classpath&r1=1.7&r2=1.8