소스 검색

Added warning for non-applicable borders in case of separate border-model

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@291194 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-0_90-alpha1
Andreas L. Delmelle 19 년 전
부모
커밋
85d86accdb
2개의 변경된 파일15개의 추가작업 그리고 2개의 파일을 삭제
  1. 10
    2
      src/java/org/apache/fop/fo/flow/TableFObj.java
  2. 5
    0
      src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java

+ 10
- 2
src/java/org/apache/fop/fo/flow/TableFObj.java 파일 보기

@@ -77,6 +77,14 @@ public abstract class TableFObj extends FObj {
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 @@ public abstract class TableFObj extends FObj {
* @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 @@ public abstract class TableFObj extends FObj {
return null;
}
}
/**
* Returns the current column index of the given TableFObj
* (overridden for Table, TableBody, TableRow)

+ 5
- 0
src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java 파일 보기

@@ -366,4 +366,9 @@ public class CommonBorderPaddingBackground implements Cloneable {
+ 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);
}
}

Loading…
취소
저장