aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/fo/flow/table/GridUnit.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/java/org/apache/fop/fo/flow/table/GridUnit.java')
-rw-r--r--src/java/org/apache/fop/fo/flow/table/GridUnit.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/java/org/apache/fop/fo/flow/table/GridUnit.java b/src/java/org/apache/fop/fo/flow/table/GridUnit.java
index ec84dd200..3d48a6836 100644
--- a/src/java/org/apache/fop/fo/flow/table/GridUnit.java
+++ b/src/java/org/apache/fop/fo/flow/table/GridUnit.java
@@ -374,6 +374,24 @@ public class GridUnit {
}
}
+ /**
+ * For the given side, integrates in the conflict resolution the given border segment.
+ *
+ * @param side the side to consider (one of CommonBorderPaddingBackground.START|END)
+ * @param segment a border specification to integrate at the given side
+ */
+ void integrateBorderSegment(int side, BorderSpecification segment) {
+ switch(side) {
+ case CommonBorderPaddingBackground.START:
+ borderStart = collapsingBorderModel.determineWinner(borderStart, segment);
+ break;
+ case CommonBorderPaddingBackground.END:
+ borderEnd = collapsingBorderModel.determineWinner(borderEnd, segment);
+ break;
+ default: assert false;
+ }
+ }
+
void integrateCompetingBorder(int side, ConditionalBorder competitor,
boolean withNormal, boolean withLeadingTrailing, boolean withRest) {
switch (side) {