Removed warning for padding (r291267); padding never seems to be null, so warning...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@291457 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index b97bd6713132af3196cd1e3e1dd111a2fbe57479..47047d41f1887c4b7116eebcf4c9a2e9c3f2ba47 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -129,11 +129,11 @@ public class Table extends TableFObj {
         colPList.setWritingMode();
         defaultColumn.bind(colPList);
 
-        if (borderCollapse != EN_SEPARATE && commonBorderPaddingBackground.hasPaddingInfo()) {
+        /*if (borderCollapse != EN_SEPARATE && commonBorderPaddingBackground.hasPadding()) {
             //See "17.6.2 The collapsing border model" in CSS2
             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");

diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
index 931b881fdf04c4cc780613d08a086ed9ee820a9b..4a92280ff059e3bc0d1d94e23f5636682ac86b73 100755 (executable)
--- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
+++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
@@ -371,10 +371,4 @@ 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);
-    }
 }