cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table Cell.java
jeremias2005/02/11 04:19:05
Modified:src/java/org/apache/fop/fo/flow TableCell.java
src/java/org/apache/fop/layoutmgr/table Cell.java
Log:
empty-cells implemented.
Revision ChangesPath
1.46 +5 -0 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- TableCell.java8 Feb 2005 16:16:48 - 1.45
+++ TableCell.java11 Feb 2005 12:19:04 - 1.46
@@ -298,6 +298,11 @@
return Math.max(columnNumber.getValue(), 0);
}
+/** @return true if empty-cells is show */
+public boolean showEmptyCells() {
+return (this.emptyCells == EN_SHOW);
+}
+
/**
* @return the id property.
*/
1.20 +10 -3 xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Cell.java 9 Feb 2005 11:51:30 - 1.19
+++ Cell.java 11 Feb 2005 12:19:05 - 1.20
@@ -34,7 +34,6 @@
import org.apache.fop.layoutmgr.TraitSetter;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
-import org.apache.fop.area.CTM;
import org.apache.fop.area.Trait;
import org.apache.fop.traits.MinOptMax;
@@ -61,6 +60,7 @@
private int rowHeight;
private int usedBPD;
private int borderAndPaddingBPD;
+private boolean emptyCell = true;
/**
* Create a new Cell layout manager.
@@ -168,6 +168,9 @@
}
usedBPD = stackSize.opt;
+if (usedBPD 0) {
+emptyCell = false;
+}
LengthRangeProperty specifiedBPD =
fobj.getBlockProgressionDimension();
if (specifiedBPD.getEnum() != EN_AUTO) {
@@ -249,6 +252,12 @@
addID(fobj.getId());
}
+if (!emptyCell || (getTable().getBorderCollapse() == EN_SEPARATE
+ fobj.showEmptyCells())) {
+TraitSetter.addBorders(curBlockArea,
fobj.getCommonBorderPaddingBackground());
+TraitSetter.addBackground(curBlockArea,
fobj.getCommonBorderPaddingBackground());
+}
+
//Handle display-align
if (usedBPD rowHeight) {
if (fobj.getDisplayAlign() == EN_CENTER) {
@@ -277,8 +286,6 @@
}
}
-TraitSetter.addBorders(curBlockArea,
fobj.getCommonBorderPaddingBackground());
-TraitSetter.addBackground(curBlockArea,
fobj.getCommonBorderPaddingBackground());
int contentBPD = rowHeight;
contentBPD -= borderAndPaddingBPD;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/table Cell.java TableLayoutManager.java
bckfnn 2004/09/22 01:25:16
Modified:src/java/org/apache/fop/layoutmgr/list Item.java
ListItemLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Cell.java
TableLayoutManager.java
Log:
Set content ipd/bpd instead of allocation width/height.
Revision ChangesPath
1.8 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Item.java 26 May 2004 04:22:40 - 1.7
+++ Item.java 22 Sep 2004 08:25:16 - 1.8
@@ -216,7 +216,7 @@
curBlockArea.setPositioning(Block.ABSOLUTE);
// set position
curBlockArea.setXOffset(xoffset);
-curBlockArea.setWidth(itemIPD);
+curBlockArea.setIPD(itemIPD);
//curBlockArea.setHeight();
// Set up dimensions
1.14 +1 -2
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ListItemLayoutManager.java7 Sep 2004 20:47:11 - 1.13
+++ ListItemLayoutManager.java22 Sep 2004 08:25:16 - 1.14
@@ -236,7 +236,7 @@
}
}
-curBlockArea.setHeight(listItemHeight);
+curBlockArea.setBPD(listItemHeight);
flush();
@@ -274,7 +274,6 @@
Area parentArea = parentLM.getParentArea(curBlockArea);
int referenceIPD = parentArea.getIPD();
curBlockArea.setIPD(referenceIPD);
-curBlockArea.setWidth(referenceIPD);
// Get reference IPD from parentArea
setCurrentArea(curBlockArea); // ??? for generic operations
}
1.10 +3 -3 xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cell.java 26 May 2004 04:22:40 - 1.9
+++ Cell.java 22 Sep 2004 08:25:16 - 1.10
@@ -211,7 +211,7 @@
TraitSetter.addBackground(curBlockArea, backgroundProps);
}
-curBlockArea.setHeight(height);
+curBlockArea.setBPD(height);
flush();
@@ -239,13 +239,13 @@
// set position
curBlockArea.setXOffset(xoffset);
curBlockArea.setYOffset(yoffset);
-curBlockArea.setWidth(cellIPD);
+curBlockArea.setIPD(cellIPD);
//curBlockArea.setHeight();
// Set up dimensions
Area parentArea = parentLM.getParentArea(curBlockArea);
int referenceIPD = parentArea.getIPD();
-curBlockArea.setIPD(referenceIPD);
+//curBlockArea.setIPD(referenceIPD);
// Get reference IPD from parentArea
setCurrentArea(curBlockArea); // ??? for generic operations
}
1.13 +1 -1
xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TableLayoutManager.java 12 Jun 2004 18:03:47 - 1.12
+++ TableLayoutManager.java 22 Sep 2004 08:25:16 - 1.13
@@ -330,7 +330,7 @@
}
}
-curBlockArea.setHeight(tableHeight);
+curBlockArea.setBPD(tableHeight);
if (borderProps != null) {
TraitSetter.addBorders(curBlockArea, borderProps);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
