git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@594578 13f79535-47bb-0310-9956-ffa450edef68tags/fop-0_95beta
@@ -23,7 +23,6 @@ import java.util.Iterator; | |||
import java.util.List; | |||
import org.apache.fop.fo.properties.CommonBorderPaddingBackground; | |||
import org.apache.fop.layoutmgr.table.GridUnit; | |||
/** | |||
* A class that implements the border-collapsing model. |
@@ -17,13 +17,9 @@ | |||
/* $Id$ */ | |||
package org.apache.fop.layoutmgr.table; | |||
package org.apache.fop.fo.flow.table; | |||
import org.apache.fop.fo.Constants; | |||
import org.apache.fop.fo.flow.table.BorderSpecification; | |||
import org.apache.fop.fo.flow.table.Table; | |||
import org.apache.fop.fo.flow.table.TableBody; | |||
import org.apache.fop.fo.flow.table.TableRow; | |||
import org.apache.fop.fo.properties.CommonBorderPaddingBackground; | |||
/** |
@@ -24,9 +24,6 @@ import java.util.List; | |||
import java.util.ListIterator; | |||
import org.apache.fop.fo.ValidationException; | |||
import org.apache.fop.layoutmgr.table.EmptyGridUnit; | |||
import org.apache.fop.layoutmgr.table.GridUnit; | |||
import org.apache.fop.layoutmgr.table.PrimaryGridUnit; | |||
/** |
@@ -17,20 +17,14 @@ | |||
/* $Id$ */ | |||
package org.apache.fop.layoutmgr.table; | |||
package org.apache.fop.fo.flow.table; | |||
import org.apache.commons.logging.Log; | |||
import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.fo.FONode; | |||
import org.apache.fop.fo.flow.table.BorderSpecification; | |||
import org.apache.fop.fo.flow.table.Table; | |||
import org.apache.fop.fo.flow.table.TableBody; | |||
import org.apache.fop.fo.flow.table.TableCell; | |||
import org.apache.fop.fo.flow.table.TableColumn; | |||
import org.apache.fop.fo.flow.table.TableFObj; | |||
import org.apache.fop.fo.flow.table.TableRow; | |||
import org.apache.fop.fo.properties.CommonBorderPaddingBackground; | |||
import org.apache.fop.fo.properties.CommonBorderPaddingBackground.BorderInfo; | |||
import org.apache.fop.layoutmgr.table.CollapsingBorderModel; | |||
/** | |||
* This class represents one grid unit inside a table. |
@@ -17,15 +17,14 @@ | |||
/* $Id$ */ | |||
package org.apache.fop.layoutmgr.table; | |||
package org.apache.fop.fo.flow.table; | |||
import java.util.LinkedList; | |||
import java.util.List; | |||
import org.apache.commons.logging.Log; | |||
import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.fo.flow.table.TableCell; | |||
import org.apache.fop.fo.flow.table.TableColumn; | |||
import org.apache.fop.layoutmgr.table.TableCellLayoutManager; | |||
/** | |||
* This class represents a primary grid unit of a spanned cell. This is the "before-start" |
@@ -20,7 +20,6 @@ | |||
package org.apache.fop.fo.flow.table; | |||
import org.apache.fop.fo.ValidationException; | |||
import org.apache.fop.layoutmgr.table.GridUnit; | |||
/** | |||
* A class that creates groups of rows belonging to a same set of spans. The first row of |
@@ -22,6 +22,8 @@ package org.apache.fop.layoutmgr.table; | |||
import java.util.List; | |||
import java.util.ListIterator; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.PrimaryGridUnit; | |||
import org.apache.fop.layoutmgr.ElementListUtils; | |||
import org.apache.fop.layoutmgr.KnuthBox; | |||
import org.apache.fop.layoutmgr.KnuthElement; |
@@ -76,7 +76,7 @@ public abstract class CollapsingBorderModel { | |||
* @param side the side on the current cell | |||
* @return the adjacent side on the neighbouring cell | |||
*/ | |||
static int getOtherSide(int side) { | |||
public/*TODO*/ static int getOtherSide(int side) { | |||
switch (side) { | |||
case CommonBorderPaddingBackground.BEFORE: | |||
return CommonBorderPaddingBackground.AFTER; |
@@ -22,6 +22,7 @@ package org.apache.fop.layoutmgr.table; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.TableRow; | |||
import org.apache.fop.traits.MinOptMax; | |||
@@ -19,6 +19,9 @@ | |||
package org.apache.fop.layoutmgr.table; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.PrimaryGridUnit; | |||
/** | |||
* Represents a non-dividable part of a grid unit. Used by the table stepper. | |||
*/ |
@@ -26,6 +26,8 @@ import org.apache.commons.logging.Log; | |||
import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.fo.Constants; | |||
import org.apache.fop.fo.FONode; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.PrimaryGridUnit; | |||
import org.apache.fop.fo.flow.table.TableRow; | |||
import org.apache.fop.fo.properties.CommonBorderPaddingBackground; | |||
import org.apache.fop.fo.properties.LengthRangeProperty; |
@@ -25,6 +25,8 @@ import java.util.Map; | |||
import org.apache.commons.logging.Log; | |||
import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.PrimaryGridUnit; | |||
import org.apache.fop.fo.flow.table.TableRow; | |||
import org.apache.fop.fo.properties.LengthRangeProperty; | |||
import org.apache.fop.layoutmgr.ElementListUtils; |
@@ -25,6 +25,8 @@ import org.apache.commons.logging.Log; | |||
import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.datatypes.PercentBaseContext; | |||
import org.apache.fop.fo.FONode; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.PrimaryGridUnit; | |||
import org.apache.fop.fo.flow.table.Table; | |||
import org.apache.fop.fo.flow.table.TableCell; | |||
import org.apache.fop.fo.properties.CommonBorderPaddingBackground; |
@@ -31,6 +31,7 @@ import org.apache.fop.area.Trait; | |||
import org.apache.fop.datatypes.PercentBaseContext; | |||
import org.apache.fop.fo.Constants; | |||
import org.apache.fop.fo.FObj; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.Table; | |||
import org.apache.fop.fo.flow.table.TableBody; | |||
import org.apache.fop.fo.flow.table.TableRow; |
@@ -29,6 +29,8 @@ import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.fo.FONode; | |||
import org.apache.fop.fo.FONode.FONodeIterator; | |||
import org.apache.fop.fo.flow.Marker; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.PrimaryGridUnit; | |||
import org.apache.fop.fo.flow.table.Table; | |||
import org.apache.fop.fo.flow.table.TableBody; | |||
import org.apache.fop.fo.flow.table.TableCell; |
@@ -27,6 +27,8 @@ import org.apache.commons.logging.Log; | |||
import org.apache.commons.logging.LogFactory; | |||
import org.apache.fop.fo.Constants; | |||
import org.apache.fop.fo.FONode; | |||
import org.apache.fop.fo.flow.table.GridUnit; | |||
import org.apache.fop.fo.flow.table.PrimaryGridUnit; | |||
import org.apache.fop.fo.flow.table.TableRow; | |||
import org.apache.fop.layoutmgr.BreakElement; | |||
import org.apache.fop.layoutmgr.KnuthBox; |