You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ad...@apache.org on 2005/09/25 20:15:31 UTC

svn commit: r291457 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo: flow/Table.java properties/CommonBorderPaddingBackground.java

Author: adelmelle
Date: Sun Sep 25 11:15:21 2005
New Revision: 291457

URL: http://svn.apache.org/viewcvs?rev=291457&view=rev
Log:
Removed warning for padding (r291267); padding never seems to be null, so warning was given for all tables...

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java?rev=291457&r1=291456&r2=291457&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java Sun Sep 25 11:15:21 2005
@@ -129,11 +129,11 @@
         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");

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=291457&r1=291456&r2=291457&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 Sun Sep 25 11:15:21 2005
@@ -371,10 +371,4 @@
         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);
-    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org