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 bc...@apache.org on 2005/08/26 09:07:12 UTC
svn commit: r240173 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo:
FOPropertyMapping.java flow/Table.java flow/TableBody.java
flow/TableCell.java flow/TableColumn.java flow/TableRow.java
Author: bckfnn
Date: Fri Aug 26 00:07:06 2005
New Revision: 240173
URL: http://svn.apache.org/viewcvs?rev=240173&view=rev
Log:
Added support for table border-*-precedence properties in the table
fo objects.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Table.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableCell.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=240173&r1=240172&r2=240173&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Fri Aug 26 00:07:06 2005
@@ -50,6 +50,7 @@
import org.apache.fop.fo.properties.SpacePropertyMaker;
import org.apache.fop.fo.properties.SpacingPropertyMaker;
import org.apache.fop.fo.properties.StringProperty;
+import org.apache.fop.fo.properties.TableBorderPrecedence;
import org.apache.fop.fo.properties.TextDecorationProperty;
import org.apache.fop.fo.properties.ToBeImplementedProperty;
@@ -2304,15 +2305,15 @@
PropertyMaker sub;
// border-after-precedence
- m = new ToBeImplementedProperty.Maker(PR_BORDER_AFTER_PRECEDENCE);
+ m = new TableBorderPrecedence(PR_BORDER_AFTER_PRECEDENCE);
m.setInherited(false);
- m.setDefault("none");
+ m.addEnum("force", getEnumProperty(EN_FORCE, "FORCE"));
addPropertyMaker("border-after-precedence", m);
// border-before-precedence
- m = new ToBeImplementedProperty.Maker(PR_BORDER_BEFORE_PRECEDENCE);
+ m = new TableBorderPrecedence(PR_BORDER_BEFORE_PRECEDENCE);
m.setInherited(false);
- m.setDefault("none");
+ m.addEnum("force", getEnumProperty(EN_FORCE, "FORCE"));
addPropertyMaker("border-before-precedence", m);
// border-collapse
@@ -2326,9 +2327,9 @@
addPropertyMaker("border-collapse", m);
// border-end-precedence
- m = new ToBeImplementedProperty.Maker(PR_BORDER_END_PRECEDENCE);
+ m = new TableBorderPrecedence(PR_BORDER_END_PRECEDENCE);
m.setInherited(false);
- m.setDefault("none");
+ m.addEnum("force", getEnumProperty(EN_FORCE, "FORCE"));
addPropertyMaker("border-end-precedence", m);
// border-separation
@@ -2346,9 +2347,9 @@
addPropertyMaker("border-separation", m);
// border-start-precedence
- m = new ToBeImplementedProperty.Maker(PR_BORDER_START_PRECEDENCE);
+ m = new TableBorderPrecedence(PR_BORDER_START_PRECEDENCE);
m.setInherited(false);
- m.setDefault("none");
+ m.addEnum("force", getEnumProperty(EN_FORCE, "FORCE"));
addPropertyMaker("border-start-precedence", m);
// caption-side
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=240173&r1=240172&r2=240173&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 Fri Aug 26 00:07:06 2005
@@ -18,11 +18,12 @@
package org.apache.fop.fo.flow;
-import org.xml.sax.Locator;
-
import java.util.List;
+import org.xml.sax.Locator;
+
import org.apache.fop.apps.FOPException;
+import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
@@ -48,12 +49,12 @@
private CommonMarginBlock commonMarginBlock;
private CommonRelativePosition commonRelativePosition;
private LengthRangeProperty blockProgressionDimension;
- // private ToBeImplementedProperty borderAfterPrecedence;
- // private ToBeImplementedProperty borderBeforePrecedence;
+ private Numeric borderAfterPrecedence;
+ private Numeric borderBeforePrecedence;
private int borderCollapse;
- // private ToBeImplementedProperty borderEndPrecedence;
+ private Numeric borderEndPrecedence;
private LengthPairProperty borderSeparation;
- // private ToBeImplementedProperty borderStartPrecedence;
+ private Numeric borderStartPrecedence;
private int breakAfter;
private int breakBefore;
private String id;
@@ -105,12 +106,12 @@
commonMarginBlock = pList.getMarginBlockProps();
commonRelativePosition = pList.getRelativePositionProps();
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
- // borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE);
- // borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE);
+ borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE).getNumeric();
+ borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE).getNumeric();
borderCollapse = pList.get(PR_BORDER_COLLAPSE).getEnum();
- // borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE);
+ borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
borderSeparation = pList.get(PR_BORDER_SEPARATION).getLengthPair();
- // borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE);
+ borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
id = pList.get(PR_ID).getString();
@@ -125,7 +126,7 @@
tableOmitHeaderAtBreak = pList.get(PR_TABLE_OMIT_HEADER_AT_BREAK).getEnum();
//width = pList.get(PR_WIDTH).getLength();
writingMode = pList.get(PR_WRITING_MODE).getEnum();
-
+
//Create default column in case no table-columns will be defined.
defaultColumn = new TableColumn(this);
PropertyList colPList = new StaticPropertyList(defaultColumn, pList);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java?rev=240173&r1=240172&r2=240173&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableBody.java Fri Aug 26 00:07:06 2005
@@ -25,6 +25,7 @@
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
@@ -44,10 +45,10 @@
private CommonAural commonAural;
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonRelativePosition commonRelativePosition;
- // private ToBeImplementedProperty borderAfterPrecedence;
- // private ToBeImplementedProperty borderBeforePrecedence;
- // private ToBeImplementedProperty borderEndPrecedence;
- // private ToBeImplementedProperty borderStartPrecedence;
+ private Numeric borderAfterPrecedence;
+ private Numeric borderBeforePrecedence;
+ private Numeric borderEndPrecedence;
+ private Numeric borderStartPrecedence;
private int visibility;
// End of property values
@@ -71,10 +72,10 @@
commonAural = pList.getAuralProps();
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
commonRelativePosition = pList.getRelativePositionProps();
- // borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE);
- // borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE);
- // borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE);
- // borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE);
+ borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE).getNumeric();
+ borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE).getNumeric();
+ borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
+ borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
visibility = pList.get(PR_VISIBILITY).getEnum();
//Used by convertCellsToRows()
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=240173&r1=240172&r2=240173&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 Fri Aug 26 00:07:06 2005
@@ -44,10 +44,10 @@
private CommonAural commonAural;
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonRelativePosition commonRelativePosition;
- // private ToBeImplementedProperty borderAfterPrecedence;
- // private ToBeImplementedProperty borderBeforePrecedence;
- // private ToBeImplementedProperty borderEndPrecedence;
- // private ToBeImplementedProperty borderStartPrecedence;
+ private Numeric borderAfterPrecedence;
+ private Numeric borderBeforePrecedence;
+ private Numeric borderEndPrecedence;
+ private Numeric borderStartPrecedence;
private LengthRangeProperty blockProgressionDimension;
private int borderCollapse; //inherited from fo:table
private LengthPairProperty borderSeparation; //inherited from fo:table
@@ -118,10 +118,10 @@
commonAural = pList.getAuralProps();
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
commonRelativePosition = pList.getRelativePositionProps();
- // borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE);
- // borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE);
- // borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE);
- // borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE);
+ borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE).getNumeric();
+ borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE).getNumeric();
+ borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
+ borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
borderCollapse = pList.get(PR_BORDER_COLLAPSE).getEnum();
borderSeparation = pList.get(PR_BORDER_SEPARATION).getLengthPair();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java?rev=240173&r1=240172&r2=240173&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableColumn.java Fri Aug 26 00:07:06 2005
@@ -37,10 +37,10 @@
public class TableColumn extends FObj {
// The value of properties relevant for fo:table-column.
private CommonBorderPaddingBackground commonBorderPaddingBackground;
- // private ToBeImplementedProperty borderAfterPrecedence;
- // private ToBeImplementedProperty borderBeforePrecedence;
- // private ToBeImplementedProperty borderEndPrecedence;
- // private ToBeImplementedProperty borderStartPrecedence;
+ private Numeric borderAfterPrecedence;
+ private Numeric borderBeforePrecedence;
+ private Numeric borderEndPrecedence;
+ private Numeric borderStartPrecedence;
private Numeric columnNumber;
private Length columnWidth;
private Numeric numberColumnsRepeated;
@@ -60,10 +60,10 @@
*/
public void bind(PropertyList pList) throws FOPException {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
- // borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE);
- // borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE);
- // borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE);
- // borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE);
+ borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE).getNumeric();
+ borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE).getNumeric();
+ borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
+ borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
columnNumber = pList.get(PR_COLUMN_NUMBER).getNumeric();
columnWidth = pList.get(PR_COLUMN_WIDTH).getLength();
numberColumnsRepeated = pList.get(PR_NUMBER_COLUMNS_REPEATED).getNumeric();
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java?rev=240173&r1=240172&r2=240173&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/TableRow.java Fri Aug 26 00:07:06 2005
@@ -22,6 +22,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
@@ -43,10 +44,10 @@
private CommonAural commonAural;
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonRelativePosition commonRelativePosition;
- // private ToBeImplementedProperty borderAfterPrecedence;
- // private ToBeImplementedProperty borderBeforePrecedence;
- // private ToBeImplementedProperty borderEndPrecedence;
- // private ToBeImplementedProperty borderStartPrecedence;
+ private Numeric borderAfterPrecedence;
+ private Numeric borderBeforePrecedence;
+ private Numeric borderEndPrecedence;
+ private Numeric borderStartPrecedence;
private int breakAfter;
private int breakBefore;
private Length height;
@@ -75,10 +76,10 @@
commonAural = pList.getAuralProps();
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
commonRelativePosition = pList.getRelativePositionProps();
- // borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE);
- // borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE);
- // borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE);
- // borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE);
+ borderAfterPrecedence = pList.get(PR_BORDER_AFTER_PRECEDENCE).getNumeric();
+ borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE).getNumeric();
+ borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE).getNumeric();
+ borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE).getNumeric();
breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
id = pList.get(PR_ID).getString();
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org