瀏覽代碼

Replace the array of forced breaks with a single boolean, which should be enough.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@529920 13f79535-47bb-0310-9956-ffa450edef68
pull/36/head
Vincent Hennebert 17 年之前
父節點
當前提交
69ccc430c7
共有 1 個文件被更改,包括 4 次插入12 次删除
  1. 4
    12
      src/java/org/apache/fop/layoutmgr/table/TableStepper.java

+ 4
- 12
src/java/org/apache/fop/layoutmgr/table/TableStepper.java 查看文件

@@ -85,7 +85,7 @@ public class TableStepper {
private boolean rowBacktrackForLastStep;
private boolean skippedStep;
private boolean[] keepWithNextSignals;
private boolean[] forcedBreaks;
private boolean forcedBreak;
private int lastMaxPenaltyLength;
/**
@@ -115,21 +115,15 @@ public class TableStepper {
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 @@ public class TableStepper {
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 @@ public class TableStepper {
widths[column] = 0;
startRow[column] = activeRowIndex;
keepWithNextSignals[column] = false;
forcedBreaks[column] = false;
}
}

@@ -536,7 +528,7 @@ public class TableStepper {
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

Loading…
取消
儲存