arved 02/04/23 15:24:45
Modified: src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java BlockContainer.java ListBlock.java
Table.java TableBody.java TableCell.java
TableColumn.java TableRow.java
Log:
support for background-image (all renderers)
author: Michael Gratton
Revision Changes Path
No revision
No revision
1.41.2.4 +2 -5 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -r1.41.2.3 -r1.41.2.4
--- Block.java 9 Jan 2002 11:32:57 -0000 1.41.2.3
+++ Block.java 23 Apr 2002 22:24:44 -0000 1.41.2.4
@@ -1,5 +1,5 @@
/*
- * $Id: Block.java,v 1.41.2.3 2002/01/09 11:32:57 keiron Exp $
+ * $Id: Block.java,v 1.41.2.4 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -53,7 +53,6 @@
int spaceAfter;
int textIndent;
int keepWithNext;
- ColorType backgroundColor;
int blockWidows;
int blockOrphans;
@@ -154,8 +153,6 @@
this.properties.get("text-indent").getLength().mvalue();
this.keepWithNext =
this.properties.get("keep-with-next").getEnum();
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
this.blockWidows =
this.properties.get("widows").getNumber().intValue();
@@ -245,7 +242,7 @@
blockArea.setParent(area); // BasicLink needs it
blockArea.setPage(area.getPage());
- blockArea.setBackgroundColor(backgroundColor);
+ blockArea.setBackground(propMgr.getBackgroundProps());
blockArea.setBorderAndPadding(propMgr.getBorderAndPadding());
blockArea.setHyphenation(propMgr.getHyphenationProps());
blockArea.start();
1.11.2.1 +2 -6 xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- BlockContainer.java 6 Aug 2001 09:12:59 -0000 1.11
+++ BlockContainer.java 23 Apr 2002 22:24:44 -0000 1.11.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: BlockContainer.java,v 1.11 2001/08/06 09:12:59 keiron Exp $
+ * $Id: BlockContainer.java,v 1.11.2.1 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -21,7 +21,6 @@
public class BlockContainer extends FObj {
- ColorType backgroundColor;
int position;
int top;
@@ -87,9 +86,6 @@
this.marker = 0;
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
-
this.position = this.properties.get("position").getEnum();
this.top = this.properties.get("top").getLength().mvalue();
this.bottom = this.properties.get("bottom").getLength().mvalue();
@@ -119,7 +115,7 @@
position);
areaContainer.setPage(area.getPage());
- areaContainer.setBackgroundColor(backgroundColor);
+ areaContainer.setBackground(propMgr.getBackgroundProps());
areaContainer.setBorderAndPadding(propMgr.getBorderAndPadding());
areaContainer.start();
1.21.2.1 +2 -5 xml-fop/src/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- ListBlock.java 20 Aug 2001 11:19:23 -0000 1.21
+++ ListBlock.java 23 Apr 2002 22:24:44 -0000 1.21.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: ListBlock.java,v 1.21 2001/08/20 11:19:23 keiron Exp $
+ * $Id: ListBlock.java,v 1.21.2.1 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -43,7 +43,6 @@
int spaceBefore;
int spaceAfter;
int spaceBetweenListRows = 0;
- ColorType backgroundColor;
public ListBlock(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
@@ -91,8 +90,6 @@
this.spaceAfter =
this.properties.get("space-after.optimum").getLength().mvalue();
this.spaceBetweenListRows = 0; // not used at present
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
this.marker = 0;
@@ -133,7 +130,7 @@
blockArea.setPage(area.getPage());
- blockArea.setBackgroundColor(backgroundColor);
+ blockArea.setBackground(propMgr.getBackgroundProps());
blockArea.start();
blockArea.setAbsoluteHeight(area.getAbsoluteHeight());
1.39.2.1 +2 -5 xml-fop/src/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -r1.39 -r1.39.2.1
--- Table.java 14 Oct 2001 20:43:32 -0000 1.39
+++ Table.java 23 Apr 2002 22:24:44 -0000 1.39.2.1
@@ -1,5 +1,5 @@
/*
- * -- $Id: Table.java,v 1.39 2001/10/14 20:43:32 klease Exp $ --
+ * -- $Id: Table.java,v 1.39.2.1 2002/04/23 22:24:44 arved Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -37,7 +37,6 @@
int breakAfter;
int spaceBefore;
int spaceAfter;
- ColorType backgroundColor;
LengthRange ipd;
int height;
String id;
@@ -113,8 +112,6 @@
this.properties.get("space-before.optimum").getLength().mvalue();
this.spaceAfter =
this.properties.get("space-after.optimum").getLength().mvalue();
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
this.ipd =
this.properties.get("inline-progression-dimension").
getLengthRange();
@@ -173,7 +170,7 @@
areaContainer.foCreator = this; // G Seshadri
areaContainer.setPage(area.getPage());
- areaContainer.setBackgroundColor(backgroundColor);
+ areaContainer.setBackground(propMgr.getBackgroundProps());
areaContainer.setBorderAndPadding(propMgr.getBorderAndPadding());
areaContainer.start();
1.38.2.2 +2 -5 xml-fop/src/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -u -r1.38.2.1 -r1.38.2.2
--- TableBody.java 8 Jan 2002 08:18:42 -0000 1.38.2.1
+++ TableBody.java 23 Apr 2002 22:24:44 -0000 1.38.2.2
@@ -1,5 +1,5 @@
/*
- * $Id: TableBody.java,v 1.38.2.1 2002/01/08 08:18:42 keiron Exp $
+ * $Id: TableBody.java,v 1.38.2.2 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -34,7 +34,6 @@
int spaceBefore;
int spaceAfter;
- ColorType backgroundColor;
String id;
Vector columns;
@@ -89,8 +88,6 @@
this.properties.get("space-before.optimum").getLength().mvalue();
this.spaceAfter =
this.properties.get("space-after.optimum").getLength().mvalue();
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
this.id = this.properties.get("id").getString();
area.getIDReferences().createID(id);
@@ -136,7 +133,7 @@
area.spaceLeft(), Position.RELATIVE);
areaContainer.foCreator = this; // G Seshadri
areaContainer.setPage(area.getPage());
- areaContainer.setBackgroundColor(backgroundColor);
+ areaContainer.setBackground(propMgr.getBackgroundProps());
areaContainer.setBorderAndPadding(propMgr.getBorderAndPadding());
areaContainer.start();
1.39.2.1 +2 -6 xml-fop/src/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -r1.39 -r1.39.2.1
--- TableCell.java 14 Oct 2001 20:42:04 -0000 1.39
+++ TableCell.java 23 Apr 2002 22:24:44 -0000 1.39.2.1
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableCell.java,v 1.39 2001/10/14 20:42:04 klease Exp $ --
+ * -- $Id: TableCell.java,v 1.39.2.1 2002/04/23 22:24:44 arved Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -30,7 +30,6 @@
// int spaceBefore;
// int spaceAfter;
- ColorType backgroundColor;
String id;
int numColumnsSpanned;
@@ -173,9 +172,6 @@
numRowsSpanned = 1;
}
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
-
this.id = this.properties.get("id").getString();
bSepBorders = (this.properties.get("border-collapse").getEnum()
@@ -247,7 +243,7 @@
System.err.println("Can't clone BorderAndPadding: " + e) ;
cellArea.setBorderAndPadding(propMgr.getBorderAndPadding());
}
- cellArea.setBackgroundColor(this.backgroundColor);
+ cellArea.setBackground(propMgr.getBackgroundProps());
cellArea.start();
cellArea.setAbsoluteHeight(area.getAbsoluteHeight()); // ???
1.20.2.1 +2 -7 xml-fop/src/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -r1.20 -r1.20.2.1
--- TableColumn.java 14 Oct 2001 20:43:32 -0000 1.20
+++ TableColumn.java 23 Apr 2002 22:24:44 -0000 1.20.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: TableColumn.java,v 1.20 2001/10/14 20:43:32 klease Exp $
+ * $Id: TableColumn.java,v 1.20.2.1 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -16,8 +16,6 @@
public class TableColumn extends FObj {
- ColorType backgroundColor;
-
Length columnWidthPropVal;
int columnWidth;
int columnOffset;
@@ -88,9 +86,6 @@
this.numColumnsRepeated =
this.properties.get("number-columns-repeated").getNumber().intValue();
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
-
this.columnWidthPropVal =
this.properties.get("column-width").getLength();
// This won't include resolved table-units or % values yet.
@@ -121,7 +116,7 @@
areaContainer.foCreator = this; // G Seshadri
areaContainer.setPage(area.getPage());
areaContainer.setBorderAndPadding(propMgr.getBorderAndPadding());
- areaContainer.setBackgroundColor(this.backgroundColor);
+ areaContainer.setBackground(propMgr.getBackgroundProps());
areaContainer.setHeight(area.getHeight());
area.addChild(areaContainer);
}
1.51.2.1 +2 -5 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- TableRow.java 20 Aug 2001 11:19:23 -0000 1.51
+++ TableRow.java 23 Apr 2002 22:24:44 -0000 1.51.2.1
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableRow.java,v 1.51 2001/08/20 11:19:23 keiron Exp $ --
+ * -- $Id: TableRow.java,v 1.51.2.1 2002/04/23 22:24:44 arved Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -35,7 +35,6 @@
boolean setup = false;
int breakAfter;
- ColorType backgroundColor;
String id;
KeepValue keepWithNext;
@@ -214,8 +213,6 @@
this.breakAfter = this.properties.get("break-after").getEnum();
- this.backgroundColor =
- this.properties.get("background-color").getColorType();
this.keepTogether = getKeepValue("keep-together.within-column");
this.keepWithNext = getKeepValue("keep-with-next.within-column");
@@ -286,7 +283,7 @@
areaContainer.foCreator = this; // G Seshadri
areaContainer.setPage(area.getPage());
- areaContainer.setBackgroundColor(backgroundColor);
+ areaContainer.setBackground(propMgr.getBackgroundProps());
areaContainer.start();
areaContainer.setAbsoluteHeight(area.getAbsoluteHeight());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
