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 kl...@apache.org on 2001/01/02 22:40:49 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow TableRow.java
klease 01/01/02 13:40:49
Modified: src/org/apache/fop/fo/flow TableRow.java
Log:
Keep is now a compound property
Revision Changes Path
1.31 +11 -5 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- TableRow.java 2000/12/21 05:20:28 1.30
+++ TableRow.java 2001/01/02 21:40:47 1.31
@@ -1,4 +1,4 @@
-/*-- $Id: TableRow.java,v 1.30 2000/12/21 05:20:28 keiron Exp $ --
+/*-- $Id: TableRow.java,v 1.31 2001/01/02 21:40:47 klease Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -314,10 +314,8 @@
this.borderRightStyle =
this.properties.get("border-right-style").getEnum();
}
- this.keepWithNext = this.properties.get(
- "keep-with-next").getNumber().intValue();
- this.keepWithPrevious = this.properties.get(
- "keep-with-previous").getNumber().intValue();
+ this.keepWithNext = getKeepValue("keep-with-next.within-column");
+ this.keepWithPrevious = getKeepValue("keep-with-previous.within-column");
this.paddingTop =
this.properties.get("padding").getLength().mvalue();
this.paddingLeft = this.paddingTop;
@@ -335,6 +333,14 @@
}
this.id = this.properties.get("id").getString();
setup = true;
+ }
+
+ private int getKeepValue(String sPropName) {
+ Property p= this.properties.get(sPropName);
+ Number n = p.getNumber();
+ if (n != null)
+ return n.intValue();
+ else return p.getEnum();
}
public Status layout(Area area) throws FOPException {