You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/08/24 11:34:17 UTC

svn commit: r569313 - /harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java

Author: apetrenko
Date: Fri Aug 24 02:34:16 2007
New Revision: 569313

URL: http://svn.apache.org/viewvc?rev=569313&view=rev
Log:
Patch for HARMONY-4607 "[classlib][swing][html] <br> tag behaves incorrectly"

Modified:
    harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java

Modified: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java?rev=569313&r1=569312&r2=569313&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/text/FlowView.java Fri Aug 24 02:34:16 2007
@@ -121,6 +121,7 @@
             int span = 0;
             int offset = pos;
             int weight = BadBreakWeight;
+            int fix=0;
             View view;
 
             do {
@@ -134,6 +135,7 @@
                     if (weight >= ForcedBreakWeight) {
                         final View broken = view.breakView(flowAxis, offset, x, rowSpan);
                         if (view == broken && row.getViewCount() > 0) {
+                            fix=1;
                             break;
                         }
                         view = broken;
@@ -148,7 +150,7 @@
                 adjustRow(fv, rowIndex, flowSpan, flowStart);
             }
 
-            return row.getEndOffset();
+            return row.getEndOffset()+fix;
         }
 
         protected View getLogicalView(final FlowView fv) {