arved 02/04/23 15:26:10
Modified: src/org/apache/fop/layout Tag: fop-0_20_2-maintain Area.java
BackgroundProps.java BodyRegionArea.java
RegionArea.java
Log:
support for background-image (all renderers)
author: Michael Gratton
Revision Changes Path
No revision
No revision
1.24.2.1 +6 -6 xml-fop/src/org/apache/fop/layout/Area.java
Index: Area.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/layout/Area.java,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -r1.24 -r1.24.2.1
--- Area.java 30 Jul 2001 20:29:27 -0000 1.24
+++ Area.java 23 Apr 2002 22:26:10 -0000 1.24.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Area.java,v 1.24 2001/07/30 20:29:27 tore Exp $
+ * $Id: Area.java,v 1.24.2.1 2002/04/23 22:26:10 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.
@@ -48,7 +48,7 @@
/* the page this area is on */
protected Page page;
- protected ColorType backgroundColor;
+ protected BackgroundProps background;
private IDReferences idReferences;
@@ -206,8 +206,8 @@
return this.page;
}
- public ColorType getBackgroundColor() {
- return this.backgroundColor;
+ public BackgroundProps getBackground() {
+ return this.background;
}
// Must handle conditionality here, depending on isLast/isFirst
@@ -291,8 +291,8 @@
this.page = page;
}
- public void setBackgroundColor(ColorType bgColor) {
- this.backgroundColor = bgColor;
+ public void setBackground(BackgroundProps bg) {
+ this.background = bg;
}
public void setBorderAndPadding(BorderAndPadding bp) {
1.3.2.1 +5 -5 xml-fop/src/org/apache/fop/layout/BackgroundProps.java
Index: BackgroundProps.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/layout/BackgroundProps.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- BackgroundProps.java 6 Aug 2001 09:14:24 -0000 1.3
+++ BackgroundProps.java 23 Apr 2002 22:26:10 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: BackgroundProps.java,v 1.3 2001/08/06 09:14:24 keiron Exp $
+ * $Id: BackgroundProps.java,v 1.3.2.1 2002/04/23 22:26:10 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.
@@ -7,9 +7,9 @@
package org.apache.fop.layout;
+import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
-
-import java.awt.Color;
+import org.apache.fop.image.FopImage;
/**
* Store all hyphenation related properties on an FO.
@@ -17,8 +17,8 @@
*/
public class BackgroundProps {
public int backAttachment;
- public Color backColor;
- public String backImage;
+ public ColorType backColor;
+ public FopImage backImage; // null if no image
public int backRepeat;
public Length backPosHorizontal;
public Length backPosVertical;
1.3.2.1 +12 -4 xml-fop/src/org/apache/fop/layout/BodyRegionArea.java
Index: BodyRegionArea.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/layout/BodyRegionArea.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- BodyRegionArea.java 30 Jul 2001 20:29:27 -0000 1.3
+++ BodyRegionArea.java 23 Apr 2002 22:26:10 -0000 1.3.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: BodyRegionArea.java,v 1.3 2001/07/30 20:29:27 tore Exp $
+ * $Id: BodyRegionArea.java,v 1.3.2.1 2002/04/23 22:26:10 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.
@@ -25,9 +25,17 @@
}
public BodyAreaContainer makeBodyAreaContainer() {
- return new BodyAreaContainer(null, xPosition, yPosition, width,
- height, Position.ABSOLUTE, columnCount,
- columnGap);
+ System.out.println(" +++ Constructing new BodyAreaContainer:");
+ System.out.println(" -> x : " + xPosition);
+ System.out.println(" -> y : " + yPosition);
+ System.out.println(" -> allocW: " + width);
+ System.out.println(" -> maxH : " + height);
+ BodyAreaContainer area =
+ new BodyAreaContainer(null, xPosition, yPosition, width,
+ height, Position.ABSOLUTE, columnCount,
+ columnGap);
+ area.setBackground(getBackground());
+ return area;
}
public void setColumnCount(int columnCount) {
1.6.2.1 +11 -8 xml-fop/src/org/apache/fop/layout/RegionArea.java
Index: RegionArea.java
===================================================================
RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/layout/RegionArea.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- RegionArea.java 30 Jul 2001 20:29:27 -0000 1.6
+++ RegionArea.java 23 Apr 2002 22:26:10 -0000 1.6.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: RegionArea.java,v 1.6 2001/07/30 20:29:27 tore Exp $
+ * $Id: RegionArea.java,v 1.6.2.1 2002/04/23 22:26:10 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.
@@ -17,7 +17,7 @@
protected int width;
protected int height;
- protected ColorType backgroundColor;
+ protected BackgroundProps background;
public RegionArea(int xPosition, int yPosition, int width, int height) {
this.xPosition = xPosition;
@@ -27,16 +27,19 @@
}
public AreaContainer makeAreaContainer() {
- return new AreaContainer(null, xPosition, yPosition, width, height,
- Position.ABSOLUTE);
+ AreaContainer area =
+ new AreaContainer(null, xPosition, yPosition, width, height,
+ Position.ABSOLUTE);
+ area.setBackground(getBackground());
+ return area;
}
- public ColorType getBackgroundColor() {
- return this.backgroundColor;
+ public BackgroundProps getBackground() {
+ return this.background;
}
- public void setBackgroundColor(ColorType bgColor) {
- this.backgroundColor = bgColor;
+ public void setBackground(BackgroundProps bg) {
+ this.background = bg;
}
public int getHeight() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
