pbwest 2004/05/23 03:41:24
Modified: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoPcdata.java FoPageSequence.java
Log:
Flailing about with the requirements for Java 2D layout
Revision Changes Path
No revision
No revision
1.1.2.10 +6 -4 xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPcdata.java
Index: FoPcdata.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPcdata.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoPcdata.java 18 May 2004 23:05:26 -0000 1.1.2.9
+++ FoPcdata.java 23 May 2004 10:41:24 -0000 1.1.2.10
@@ -147,10 +147,12 @@
// parent block area.
// Generate a text-layout for the PCDATA.
/**
- * Generate a
+ * Generates a TextMeasurer from the PCDATA text. The font and text
+ * attributes of the text are applied.
*/
private void processText() {
-
+ // Get the font
+ //
}
}
1.1.2.17 +15 -26
xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- FoPageSequence.java 18 May 2004 23:05:26 -0000 1.1.2.16
+++ FoPageSequence.java 23 May 2004 10:41:24 -0000 1.1.2.17
@@ -20,10 +20,6 @@
package org.apache.fop.fo.flow;
-// FOP
-import java.awt.Graphics2D;
-import java.awt.GraphicsEnvironment;
-import java.awt.font.FontRenderContext;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.Arrays;
@@ -186,6 +182,18 @@
}
return (Page)firstPage;
}
+
+ /** An image on which to draw areas */
+ private BufferedImage pageSpread = null;
+ /**
+ * Gets the page spread image from which the <code>Graphics2D</code> and
+ * <code>FontRenderContext</code> have been derived.
+ * @return the page spread
+ */
+ public BufferedImage getPageSpread() {
+ return pageSpread;
+ }
+
/**
* @param foTree the FO tree being built
* @param parent the parent FONode of this node
@@ -202,8 +210,6 @@
// Set up the graphics environment
pageSpread =
new BufferedImage(20*72, 12*72, BufferedImage.TYPE_INT_RGB);
- g2D = pageSpread.createGraphics();
- frcontext = g2D.getFontRenderContext();
XmlEvent ev;
// Look for optional title
@@ -301,23 +307,6 @@
}
makeSparsePropsSet();
- }
-
- private GraphicsEnvironment gEnv = null;
- public GraphicsEnvironment getGraphicsEnvironment() {
- return gEnv;
- }
- private BufferedImage pageSpread = null;
- public BufferedImage getPageSpread() {
- return pageSpread;
- }
- private Graphics2D g2D = null;
- public Graphics2D getGraphics2D() {
- return g2D;
- }
- private FontRenderContext frcontext = null;
- public FontRenderContext getFontRenderContext() {
- return frcontext;
}
public Area getReferenceRectangle() throws FOPException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
