diff options
author | Andreas L. Delmelle <adelmelle@apache.org> | 2005-09-24 09:38:17 +0000 |
---|---|---|
committer | Andreas L. Delmelle <adelmelle@apache.org> | 2005-09-24 09:38:17 +0000 |
commit | 7d613bf751040d66243f3c8f935b4ed6c582518f (patch) | |
tree | ba504235a3455b2ae92aaaa2dd9888b4e916a540 /src | |
parent | 85d86accdbe79182fbfdea5407e96e9d3de0be47 (diff) | |
download | xmlgraphics-fop-7d613bf751040d66243f3c8f935b4ed6c582518f.tar.gz xmlgraphics-fop-7d613bf751040d66243f3c8f935b4ed6c582518f.zip |
Added warning for padding on table with collapsing border-model
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@291267 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r-- | src/java/org/apache/fop/fo/flow/Table.java | 25 | ||||
-rwxr-xr-x | src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java | 6 |
2 files changed, 20 insertions, 11 deletions
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index 9373e6070..595852f00 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -129,17 +129,16 @@ public class Table extends TableFObj { colPList.setWritingMode(); defaultColumn.bind(colPList); - /* TODO hasPadding requires context for evaluation - need to move this to layout - if (borderCollapse != EN_SEPARATE && commonBorderPaddingBackground.hasPadding()) { + if (borderCollapse != EN_SEPARATE && commonBorderPaddingBackground.hasPaddingInfo()) { //See "17.6.2 The collapsing border model" in CSS2 - getLogger().error("Table may not have padding when using the collapsing border model."); + getLogger().warn("Table may not have padding when using the collapsing " + + "border model. Padding will be ignored."); } - */ if (borderCollapse != EN_SEPARATE) { getLogger().warn("The collapsing border model on an fo:table " + "is currently not supported by FOP"); } - if( tableLayout == EN_AUTO ) { + if (tableLayout == EN_AUTO) { getLogger().warn("table-layout=\"auto\" is currently not supported by FOP"); } } @@ -243,16 +242,16 @@ public class Table extends TableFObj { if (columns == null) { columns = new java.util.ArrayList(); } - if( columns.size() < colNumber ) { + if (columns.size() < colNumber) { //add nulls for non-occupied indices between //the last column up to and including the current one - while( columns.size() < colNumber ) { + while (columns.size() < colNumber) { columns.add(null); } } //replace the null-value with the actual column columns.set(colNumber - 1, col); - if( colRepeat > 1 ) { + if (colRepeat > 1) { //in case column is repeated: //for the time being, add the same column //(colRepeat - 1) times to the columns list @@ -261,7 +260,7 @@ public class Table extends TableFObj { // are completely independent instances (clones?) // = necessary for border-collapse="collapse" // if collapsing is handled in FOTree - for( int i = colRepeat - 1; --i >= 0; ) { + for (int i = colRepeat - 1; --i >= 0;) { columns.add(col); } } @@ -270,7 +269,7 @@ public class Table extends TableFObj { usedColumnIndices.set(i); } //set index for the next column to use - while( usedColumnIndices.get(columnIndex - 1) ) { + while (usedColumnIndices.get(columnIndex - 1)) { columnIndex++; } } @@ -431,7 +430,7 @@ public class Table extends TableFObj { * * @param newIndex the new value for column index */ - protected void setCurrentColumnIndex(int newIndex) { + public void setCurrentColumnIndex(int newIndex) { columnIndex = newIndex; } @@ -444,4 +443,8 @@ public class Table extends TableFObj { protected boolean isColumnNumberUsed(int colNr) { return usedColumnIndices.get(colNr - 1); } + + /** + * Return the usedColumnIndices BitSet + */ } diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java index 4a92280ff..931b881fd 100755 --- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java +++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java @@ -371,4 +371,10 @@ public class CommonBorderPaddingBackground implements Cloneable { return (borderInfo[BEFORE] != null || borderInfo[AFTER] != null || borderInfo[START] != null || borderInfo[END] != null); } + + /** @return true if there is any padding (no evaluation) */ + public boolean hasPaddingInfo() { + return (padding[BEFORE] != null || padding[AFTER] != null + || padding[START] != null || padding[END] != null); + } } |