keiron 02/02/26 04:43:10
Modified: src/org/apache/fop/fo FONode.java XMLObj.java
src/org/apache/fop/fo/flow ExternalGraphic.java
InstreamForeignObject.java
src/org/apache/fop/render AbstractRenderer.java
PrintRenderer.java Renderer.java
src/org/apache/fop/render/mif MIFRenderer.java
src/org/apache/fop/render/pcl PCLRenderer.java
src/org/apache/fop/render/pdf PDFRenderer.java
src/org/apache/fop/render/ps PSRenderer.java
src/org/apache/fop/render/svg SVGRenderer.java
src/org/apache/fop/render/txt TXTRenderer.java
src/org/apache/fop/render/xml XMLRenderer.java
src/org/apache/fop/svg SVGElement.java
Removed: src/org/apache/fop/image ImageArea.java
src/org/apache/fop/svg SVGArea.java
Log:
remove SVGArea and ImageArea, no longer needed
Revision Changes Path
1.26 +3 -1 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- FONode.java 25 Feb 2002 21:28:01 -0000 1.25
+++ FONode.java 26 Feb 2002 12:43:09 -0000 1.26
@@ -1,5 +1,5 @@
/*
- * $Id: FONode.java,v 1.25 2002/02/25 21:28:01 klease Exp $
+ * $Id: FONode.java,v 1.26 2002/02/26 12:43:09 keiron 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,6 +25,7 @@
*
*/
abstract public class FONode {
+ protected FOUserAgent userAgent;
protected FONode parent;
protected String name;
@@ -43,6 +44,7 @@
}
public void setUserAgent(FOUserAgent ua) {
+ userAgent = ua;
}
public void setStreamRenderer(StreamRenderer st) {
1.8 +6 -1 xml-fop/src/org/apache/fop/fo/XMLObj.java
Index: XMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLObj.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLObj.java 22 Nov 2001 07:11:39 -0000 1.7
+++ XMLObj.java 26 Feb 2002 12:43:09 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: XMLObj.java,v 1.7 2001/11/22 07:11:39 keiron Exp $
+ * $Id: XMLObj.java,v 1.8 2002/02/26 12:43:09 keiron 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.
@@ -20,6 +20,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import java.util.*;
+import java.awt.geom.Point2D;
/**
* Generic XML object.
@@ -53,6 +54,10 @@
public Document getDocument() {
return doc;
+ }
+
+ public Point2D getDimension(Point2D view) {
+ return null;
}
public abstract String getNameSpace();
1.18 +4 -3 xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ExternalGraphic.java 21 Feb 2002 09:54:26 -0000 1.17
+++ ExternalGraphic.java 26 Feb 2002 12:43:09 -0000 1.18
@@ -1,5 +1,5 @@
/*
- * $Id: ExternalGraphic.java,v 1.17 2002/02/21 09:54:26 keiron Exp $
+ * $Id: ExternalGraphic.java,v 1.18 2002/02/26 12:43:09 keiron 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,8 +37,6 @@
int width;
String id;
- ImageArea imageArea;
-
public ExternalGraphic(FONode parent) {
super(parent);
}
@@ -50,6 +48,9 @@
}
protected InlineArea getInlineArea() {
+ if(url == null) {
+ return null;
+ }
url = ImageFactory.getURL(url);
// if we need to load this image to get its size
// FopImage fopimage = ImageFactory.getImage(url, userAgent);
1.21 +5 -1 xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- InstreamForeignObject.java 21 Feb 2002 09:54:26 -0000 1.20
+++ InstreamForeignObject.java 26 Feb 2002 12:43:09 -0000 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: InstreamForeignObject.java,v 1.20 2002/02/21 09:54:26 keiron Exp $
+ * $Id: InstreamForeignObject.java,v 1.21 2002/02/26 12:43:09 keiron 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.
@@ -27,6 +27,8 @@
import org.w3c.dom.Document;
+import java.awt.geom.Point2D;
+
public class InstreamForeignObject extends FObj {
int breakBefore;
@@ -121,6 +123,8 @@
// if auto then use the intrinsic size of the content scaled
// to the content-height and content-width
+
+ Point2D size = child.getDimension(new Point2D.Float(-1, -1));
Document doc = child.getDocument();
String ns = child.getNameSpace();
1.12 +1 -2 xml-fop/src/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractRenderer.java 23 Feb 2002 16:48:59 -0000 1.11
+++ AbstractRenderer.java 26 Feb 2002 12:43:09 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: AbstractRenderer.java,v 1.11 2002/02/23 16:48:59 klease Exp $
+ * $Id: AbstractRenderer.java,v 1.12 2002/02/26 12:43:09 keiron 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.
@@ -8,7 +8,6 @@
package org.apache.fop.render;
// FOP
-import org.apache.fop.image.ImageArea;
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.*;
import org.apache.fop.area.Span;
1.16 +1 -2 xml-fop/src/org/apache/fop/render/PrintRenderer.java
Index: PrintRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/PrintRenderer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PrintRenderer.java 22 Oct 2001 09:30:32 -0000 1.15
+++ PrintRenderer.java 26 Feb 2002 12:43:09 -0000 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: PrintRenderer.java,v 1.15 2001/10/22 09:30:32 keiron Exp $
+ * $Id: PrintRenderer.java,v 1.16 2002/02/26 12:43:09 keiron 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."
@@ -10,7 +10,6 @@
// FOP
import org.apache.fop.pdf.PDFPathPaint;
import org.apache.fop.pdf.PDFColor;
-import org.apache.fop.image.ImageArea;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
import org.apache.fop.datatypes.*;
1.23 +1 -2 xml-fop/src/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/Renderer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Renderer.java 12 Nov 2001 13:10:11 -0000 1.22
+++ Renderer.java 26 Feb 2002 12:43:09 -0000 1.23
@@ -1,5 +1,5 @@
/*
- * $Id: Renderer.java,v 1.22 2001/11/12 13:10:11 keiron Exp $
+ * $Id: Renderer.java,v 1.23 2002/02/26 12:43:09 keiron 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,7 +7,6 @@
package org.apache.fop.render;
// FOP
-import org.apache.fop.image.ImageArea;
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.*;
import org.apache.fop.area.inline.*;
1.13 +1 -2 xml-fop/src/org/apache/fop/render/mif/MIFRenderer.java
Index: MIFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/mif/MIFRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MIFRenderer.java 22 Oct 2001 09:30:32 -0000 1.12
+++ MIFRenderer.java 26 Feb 2002 12:43:09 -0000 1.13
@@ -1,5 +1,5 @@
/*
- * $Id: MIFRenderer.java,v 1.12 2001/10/22 09:30:32 keiron Exp $
+ * $Id: MIFRenderer.java,v 1.13 2002/02/26 12:43:09 keiron 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.
@@ -12,7 +12,6 @@
// FOP
import org.apache.fop.render.Renderer;
import org.apache.fop.render.AbstractRenderer;
-import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
1.15 +1 -3 xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java
Index: PCLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PCLRenderer.java 22 Oct 2001 09:30:32 -0000 1.14
+++ PCLRenderer.java 26 Feb 2002 12:43:09 -0000 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: PCLRenderer.java,v 1.14 2001/10/22 09:30:32 keiron Exp $
+ * $Id: PCLRenderer.java,v 1.15 2002/02/26 12:43:09 keiron 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.
@@ -9,7 +9,6 @@
// FOP
import org.apache.fop.render.PrintRenderer;
-import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
@@ -20,7 +19,6 @@
import org.apache.fop.layout.inline.*;
import org.apache.fop.image.*;
-import org.apache.fop.svg.SVGArea;
import org.w3c.dom.svg.SVGSVGElement;
import org.w3c.dom.svg.SVGDocument;
1.98 +1 -2 xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- PDFRenderer.java 23 Feb 2002 16:48:59 -0000 1.97
+++ PDFRenderer.java 26 Feb 2002 12:43:09 -0000 1.98
@@ -1,5 +1,5 @@
/*
- * $Id: PDFRenderer.java,v 1.97 2002/02/23 16:48:59 klease Exp $
+ * $Id: PDFRenderer.java,v 1.98 2002/02/26 12:43:09 keiron 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.
@@ -9,7 +9,6 @@
// FOP
import org.apache.fop.render.PrintRenderer;
-import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
1.20 +1 -3 xml-fop/src/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PSRenderer.java 21 Feb 2002 09:54:28 -0000 1.19
+++ PSRenderer.java 26 Feb 2002 12:43:10 -0000 1.20
@@ -1,5 +1,5 @@
/*
- * $Id: PSRenderer.java,v 1.19 2002/02/21 09:54:28 keiron Exp $
+ * $Id: PSRenderer.java,v 1.20 2002/02/26 12:43:10 keiron 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.
@@ -8,10 +8,8 @@
package org.apache.fop.render.ps;
// FOP
-import org.apache.fop.svg.SVGArea;
import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.render.Renderer;
-import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
import org.apache.fop.layout.*;
import org.apache.fop.layout.inline.*;
1.6 +1 -2 xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SVGRenderer.java 2 Nov 2001 07:45:18 -0000 1.5
+++ SVGRenderer.java 26 Feb 2002 12:43:10 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: SVGRenderer.java,v 1.5 2001/11/02 07:45:18 keiron Exp $
+ * $Id: SVGRenderer.java,v 1.6 2002/02/26 12:43:10 keiron 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.
@@ -13,7 +13,6 @@
import org.apache.fop.datatypes.IDReferences;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.image.*;
-import org.apache.fop.svg.SVGArea;
import org.apache.fop.svg.SVGUtilities;
import org.apache.fop.layout.FontInfo;
import org.apache.fop.fo.FOUserAgent;
1.15 +1 -3 xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java
Index: TXTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TXTRenderer.java 2 Nov 2001 11:06:08 -0000 1.14
+++ TXTRenderer.java 26 Feb 2002 12:43:10 -0000 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: TXTRenderer.java,v 1.14 2001/11/02 11:06:08 keiron Exp $
+ * $Id: TXTRenderer.java,v 1.15 2002/02/26 12:43:10 keiron 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.
@@ -19,8 +19,6 @@
import org.apache.fop.pdf.PDFPathPaint;
import org.apache.fop.pdf.PDFColor;
import org.apache.fop.image.*;
-
-import org.apache.fop.svg.SVGArea;
import org.w3c.dom.svg.SVGSVGElement;
import org.w3c.dom.svg.SVGDocument;
1.34 +1 -2 xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XMLRenderer.java 8 Feb 2002 08:25:08 -0000 1.33
+++ XMLRenderer.java 26 Feb 2002 12:43:10 -0000 1.34
@@ -1,5 +1,5 @@
/*
- * $Id: XMLRenderer.java,v 1.33 2002/02/08 08:25:08 keiron Exp $
+ * $Id: XMLRenderer.java,v 1.34 2002/02/26 12:43:10 keiron 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.
@@ -13,7 +13,6 @@
import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.XMLHandler;
-import org.apache.fop.image.ImageArea;
import org.apache.fop.area.*;
import org.apache.fop.area.inline.*;
import org.apache.fop.pdf.*;
1.21 +16 -46 xml-fop/src/org/apache/fop/svg/SVGElement.java
Index: SVGElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElement.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SVGElement.java 20 Feb 2002 09:30:40 -0000 1.20
+++ SVGElement.java 26 Feb 2002 12:43:10 -0000 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: SVGElement.java,v 1.20 2002/02/20 09:30:40 keiron Exp $
+ * $Id: SVGElement.java,v 1.21 2002/02/26 12:43:10 keiron 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.
@@ -45,14 +45,13 @@
import java.util.ArrayList;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
+import java.awt.Dimension;
/**
* class representing svg:svg pseudo flow object.
*/
public class SVGElement extends SVGObj {
- FontState fs;
-
/**
* constructs an SVG object (called by Maker).
*
@@ -68,21 +67,7 @@
init();
}
- /**
- * layout this formatting object.
- *
- * @param area the area to layout the object into
- *
- * @return the status of the layout
- */
- public Status layout(final Area area) throws FOPException {
-
- if (!(area instanceof ForeignObjectArea)) {
- // this is an error
- throw new FOPException("SVG not in fo:instream-foreign-object");
- }
-
- this.fs = area.getFontState();
+ public Point2D getDimension(Point2D view) {
// TODO - change so doesn't hold onto fo,area tree
Element svgRoot = element;
@@ -90,15 +75,14 @@
/* if width and height are zero, get the bounds of the content. */
FOPSVGContext dc = new FOPSVGContext();
dc.svgRoot = element;
- ForeignObjectArea foa = (ForeignObjectArea)area;
- dc.cwauto = foa.isContentWidthAuto();
- dc.chauto = foa.isContentHeightAuto();
- dc.cwidth = foa.getContentWidth();
- dc.cheight = foa.getContentHeight();
+ dc.cwauto = (view.getX() == -1);
+ dc.chauto = (view.getY() == -1);
+ dc.cwidth = (float)view.getX();
+ dc.cheight = (float)view.getY();
((SVGOMDocument)doc).setSVGContext(dc);
try {
- String baseDir = Configuration.getStringValue("baseDir");
+ String baseDir = userAgent.getBaseDirectory();
if(baseDir != null) {
((SVGOMDocument)doc).setURLObject(new URL(baseDir));
}
@@ -112,23 +96,9 @@
e.setAttributeNS(XMLSupport.XMLNS_NAMESPACE_URI, "xmlns",
SVGDOMImplementation.SVG_NAMESPACE_URI);
//}
- Point2D p2d = getSize(this.fs, svgRoot);
-
- SVGArea svg = new SVGArea(fs, (float)p2d.getX(),
- (float)p2d.getY());
- svg.setSVGDocument(doc);
- svg.start();
-
- /* finish off the SVG area */
- svg.end();
-
- /* add the SVG area to the containing area */
- foa.setObject(svg);
- foa.setIntrinsicWidth(svg.getWidth());
- foa.setIntrinsicHeight(svg.getHeight());
+ Point2D p2d = getSize(12 /* font size */, svgRoot);
- /* return status */
- return new Status(Status.OK);
+ return p2d;
}
private void init() {
@@ -141,10 +111,10 @@
buildTopLevel(doc, element);
}
- public static Point2D getSize(FontState fs, Element svgRoot) {
+ public static Point2D getSize(int size, Element svgRoot) {
String str;
UnitProcessor.Context ctx;
- ctx = new PDFUnitContext(fs, svgRoot);
+ ctx = new PDFUnitContext(size, svgRoot);
str = svgRoot.getAttributeNS(null, SVGConstants.SVG_WIDTH_ATTRIBUTE);
if (str.length() == 0) str = "100%";
float width = UnitProcessor.svgHorizontalLengthToUserSpace
@@ -166,10 +136,10 @@
/** The element. */
protected Element e;
- protected FontState fs;
- public PDFUnitContext(FontState fs, Element e) {
+ protected int fontSize;
+ public PDFUnitContext(int size, Element e) {
this.e = e;
- this.fs = fs;
+ this.fontSize = size;
}
/**
@@ -209,7 +179,7 @@
public CSSPrimitiveValue getFontSize() {
return new CSSOMReadOnlyValue
(new ImmutableFloat(CSSPrimitiveValue.CSS_PT,
- fs.getFontSize()));
+ fontSize));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
