Author: adelmelle
Date: Fri Sep 23 12:33:04 2005
New Revision: 291194
URL: http://svn.apache.org/viewcvs?rev=291194&view=rev
Log:
Added warning for non-applicable borders in case of separate border-model
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java?rev=291194&r1=291193&r2=291194&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableFObj.java Fri Sep 23 12:33:04 2005
@@ -77,6 +77,14 @@
borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE).getNumeric();
borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
+ //Complain if table has separate border-model and fo is not a table or cell
+ //see: Rec 6.7.4, 6.7.6 - 6.7.9
+ if (getNameId() != FO_TABLE && getNameId() != FO_TABLE_CELL
+ && getTable().isSeparateBorderModel()
+ && getCommonBorderPaddingBackground().hasBorderInfo()) {
+ getLogger().warn("Borders on " + getName()
+ + " non-applicable for table with border-collapse=\"separate\"");
+ }
}
/**
@@ -85,7 +93,7 @@
* @return the "border-precedence" value for the given side
*/
public Numeric getBorderPrecedence(int side) {
- switch( side ) {
+ switch (side) {
case CommonBorderPaddingBackground.BEFORE:
return borderBeforePrecedence;
case CommonBorderPaddingBackground.AFTER:
@@ -98,7 +106,7 @@
return null;
}
}
-
+
/**
* Returns the current column index of the given TableFObj
* (overridden for Table, TableBody, TableRow)
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java?rev=291194&r1=291193&r2=291194&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java Fri Sep 23 12:33:04 2005
@@ -366,4 +366,9 @@
+ getPaddingStart(false, context) + getPaddingEnd(false, context)) > 0);
}
+ /** @return true if there are any borders defined. */
+ public boolean hasBorderInfo() {
+ return (borderInfo[BEFORE] != null || borderInfo[AFTER] != null
+ || borderInfo[START] != null || borderInfo[END] != null);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org