svn commit: r529920 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java

[vhennebert]

Author: vhennebert
Date: Wed Apr 18 01:46:58 2007
New Revision: 529920

URL: http://svn.apache.org/viewvc?view=rev&rev=529920
Log:
Replace the array of forced breaks with a single boolean, which should be 
enough.

Modified:
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java?view=diff&rev=529920&r1=529919&r2=529920
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java 
(original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java 
Wed Apr 18 01:46:58 2007
@@ -85,7 +85,7 @@
     private boolean rowBacktrackForLastStep;
     private boolean skippedStep;
     private boolean[] keepWithNextSignals;
-    private boolean[] forcedBreaks;
+    private boolean forcedBreak;
     private int lastMaxPenaltyLength;
     
     /**
@@ -115,21 +115,15 @@
         borderAfter = new int[columnCount];
         paddingAfter = new int[columnCount];
         keepWithNextSignals = new boolean[columnCount];
-        forcedBreaks = new boolean[columnCount];
         Arrays.fill(end, -1);
     }
     
     private void clearBreakCondition() {
-        Arrays.fill(forcedBreaks, false);
+        forcedBreak = false;
     }
     
     private boolean isBreakCondition() {
-        for (int i = 0; i < columnCount; i++) {
-            if (forcedBreaks[i]) {
-                return true;
-            }
-        }
-        return false;
+        return forcedBreak;
     }
     
     /**
@@ -220,7 +214,6 @@
             widths[column] = 0;
             startRow[column] = activeRowIndex;
             keepWithNextSignals[column] = false;
-            forcedBreaks[column] = false;
         } else if (gu.isPrimary()) {
             PrimaryGridUnit pgu = (PrimaryGridUnit)gu;
             boolean makeBoxForWholeRow = false;
@@ -266,7 +259,6 @@
             widths[column] = 0;
             startRow[column] = activeRowIndex;
             keepWithNextSignals[column] = false;
-            forcedBreaks[column] = false;
         }
     }
 
@@ -536,7 +528,7 @@
                     this.lastMaxPenaltyLength = 
Math.max(this.lastMaxPenaltyLength, el.getW());
                     if (el.getP() <= -KnuthElement.INFINITE) {
                         log.debug("FORCED break encountered!");
-                        forcedBreaks[i] = true;
+                        forcedBreak = true;
                         break;
                     } else if (el.getP() < KnuthElement.INFINITE) {
                         //First legal break point



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]