xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r373761 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop: fo/flow/TableCell.java layoutmgr/table/TableCellLayoutManager.java
Date Tue, 31 Jan 2006 08:43:07 GMT
Author: jeremias
Date: Tue Jan 31 00:43:01 2006
New Revision: 373761

URL: http://svn.apache.org/viewcvs?rev=373761&view=rev
Log:
Here's why forcing to border-collapse="separate" on fo:table didn't work. D'oh!

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java?rev=373761&r1=373760&r2=373761&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java Tue Jan 31 00:43:01
2006
@@ -30,7 +30,6 @@
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
 import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.LengthPairProperty;
 import org.apache.fop.fo.properties.LengthRangeProperty;
 
 /**
@@ -44,8 +43,6 @@
     private CommonBorderPaddingBackground commonBorderPaddingBackground;
     private CommonRelativePosition commonRelativePosition;
     private LengthRangeProperty blockProgressionDimension;
-    private int borderCollapse; //inherited from fo:table
-    private LengthPairProperty borderSeparation; //inherited from fo:table
     private Numeric columnNumber;
     private int displayAlign;
     private int relativeAlign;
@@ -114,8 +111,6 @@
         commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
         commonRelativePosition = pList.getRelativePositionProps();
         blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
-        borderCollapse = pList.get(PR_BORDER_COLLAPSE).getEnum();
-        borderSeparation = pList.get(PR_BORDER_SEPARATION).getLengthPair();
         columnNumber = pList.get(PR_COLUMN_NUMBER).getNumeric();
         displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
         relativeAlign = pList.get(PR_RELATIVE_ALIGN).getEnum();
@@ -329,21 +324,6 @@
         return (this.emptyCells == EN_SHOW);
     }
     
-    /** @return the "border-collapse" property (inherited from fo:table). */
-    public int getBorderCollapse() {
-        return borderCollapse;
-    }
-
-    /** @return true if the separate border model is active */
-    public boolean isSeparateBorderModel() {
-        return (getBorderCollapse() == EN_SEPARATE);
-    }
-    
-    /** @return the "border-separation" property (inherited from fo:table). */
-    public LengthPairProperty getBorderSeparation() {
-        return borderSeparation;
-    }
-
     /**
      * @return the "id" property.
      */

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=373761&r1=373760&r2=373761&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
Tue Jan 31 00:43:01 2006
@@ -81,7 +81,7 @@
     }
     
     private boolean isSeparateBorderModel() {
-        return getTableCell().isSeparateBorderModel();
+        return getTable().isSeparateBorderModel();
     }
     
     /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
@@ -138,7 +138,7 @@
         cellIPD = referenceIPD;
         cellIPD -= getIPIndents();
         if (isSeparateBorderModel()) {
-            int borderSep = getTableCell().getBorderSeparation().getLengthPair()
+            int borderSep = getTable().getBorderSeparation().getLengthPair()
                     .getIPD().getLength().getValue(this);
             cellIPD -= borderSep;
         }



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


Mime
View raw message