From: Glen Mazza Date: Fri, 19 Mar 2004 00:53:38 +0000 (+0000) Subject: Moved SVGUserAgent back to SVG package (not being used by SVG FO extensions.) X-Git-Tag: Root_Temp_KnuthStylePageBreaking~799 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07db034b1a23a51096f87b04b712d7733c47c641;p=xmlgraphics-fop.git Moved SVGUserAgent back to SVG package (not being used by SVG FO extensions.) git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197463 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java b/src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java deleted file mode 100644 index c3d3785f4..000000000 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGUserAgent.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* $Id$ */ - -package org.apache.fop.fo.extensions.svg; - -import org.apache.fop.apps.FOUserAgent; - -import org.apache.batik.bridge.UserAgentAdapter; - -import org.apache.avalon.framework.logger.Logger; - -// Java -import java.awt.geom.AffineTransform; -import java.awt.geom.Dimension2D; -import java.awt.Dimension; - -/** - * The SVG user agent. - * This is an implementation of the batik svg user agent - * for handling errors and getting user agent values. - */ -public class SVGUserAgent extends UserAgentAdapter { - private AffineTransform currentTransform = null; - private FOUserAgent userAgent; - - /** - * Creates a new SVGUserAgent. - * @param ua the FO user agent - * @param at the current transform - */ - public SVGUserAgent(FOUserAgent ua, AffineTransform at) { - currentTransform = at; - userAgent = ua; - } - - /** - * Returns the logger associated with this user agent. - * @return Logger the logger - */ - protected final Logger getLogger() { - return this.userAgent.getLogger(); - } - - /** - * Displays an error message. - * @param message the message to display - */ - public void displayError(String message) { - getLogger().error(message); - } - - /** - * Displays an error resulting from the specified Exception. - * @param ex the exception to display - */ - public void displayError(Exception ex) { - getLogger().error("SVG Error" + ex.getMessage(), ex); - } - - /** - * Displays a message in the User Agent interface. - * The given message is typically displayed in a status bar. - * @param message the message to display - */ - public void displayMessage(String message) { - getLogger().info(message); - } - - /** - * Shows an alert dialog box. - * @param message the message to display - */ - public void showAlert(String message) { - getLogger().warn(message); - } - - /** - * Returns a customized the pixel to mm factor. - * @return the pixel unit to millimeter conversion factor - */ - public float getPixelUnitToMillimeter() { - return userAgent.getPixelUnitToMillimeter(); - } - - /** - * Returns the language settings. - * @return the languages supported - */ - public String getLanguages() { - return "en"; // userLanguages; - } - - /** - * Returns the media type for this rendering. - * @return the media for fo documents is "print" - */ - public String getMedia() { - return "print"; - } - - /** - * Returns the user stylesheet uri. - * @return null if no user style sheet was specified. - */ - public String getUserStyleSheetURI() { - return null; // userStyleSheetURI; - } - - /** - * Returns the class name of the XML parser. - * @return the XML parser class name - */ - public String getXMLParserClassName() { - return org.apache.fop.apps.FOFileHandler.getParserClassName(); - } - - /** - * Is the XML parser validating. - * @return true if the xml parser is validating - */ - public boolean isXMLParserValidating() { - return false; - } - - /** - * Get the transform of the svg document. - * @return the transform - */ - public AffineTransform getTransform() { - return currentTransform; - } - - /** - * Get the default viewport size for an svg document. - * This returns a default value of 100x100. - * @return the default viewport size - */ - public Dimension2D getViewportSize() { - return new Dimension(100, 100); - } - -} - diff --git a/src/java/org/apache/fop/image/analyser/SVGReader.java b/src/java/org/apache/fop/image/analyser/SVGReader.java index 26ad5f8c0..7ffd6194a 100644 --- a/src/java/org/apache/fop/image/analyser/SVGReader.java +++ b/src/java/org/apache/fop/image/analyser/SVGReader.java @@ -38,7 +38,7 @@ import org.apache.batik.dom.svg.SVGDOMImplementation; import org.apache.fop.image.XMLImage; import org.apache.fop.image.FopImage; import org.apache.fop.apps.FOUserAgent; -import org.apache.fop.fo.extensions.svg.SVGUserAgent; +import org.apache.fop.svg.SVGUserAgent; /** * ImageReader object for SVG document image type. diff --git a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java index 2505892a6..01780d0b0 100644 --- a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java +++ b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java @@ -29,7 +29,7 @@ import org.apache.fop.pdf.PDFResourceContext; import org.apache.fop.svg.PDFTextElementBridge; import org.apache.fop.svg.PDFAElementBridge; import org.apache.fop.svg.PDFGraphics2D; -import org.apache.fop.fo.extensions.svg.SVGUserAgent; +import org.apache.fop.svg.SVGUserAgent; import org.apache.fop.apps.Document; /* org.w3c.dom.Document is not imported to avoid conflict with diff --git a/src/java/org/apache/fop/render/ps/PSXMLHandler.java b/src/java/org/apache/fop/render/ps/PSXMLHandler.java index c9f28a153..20e50e667 100644 --- a/src/java/org/apache/fop/render/ps/PSXMLHandler.java +++ b/src/java/org/apache/fop/render/ps/PSXMLHandler.java @@ -36,7 +36,7 @@ import org.apache.batik.gvt.GraphicsNode; // FOP import org.apache.fop.render.XMLHandler; import org.apache.fop.render.RendererContext; -import org.apache.fop.fo.extensions.svg.SVGUserAgent; +import org.apache.fop.svg.SVGUserAgent; /** * PostScript XML handler. diff --git a/src/java/org/apache/fop/svg/SVGUserAgent.java b/src/java/org/apache/fop/svg/SVGUserAgent.java new file mode 100644 index 000000000..7d5e80f83 --- /dev/null +++ b/src/java/org/apache/fop/svg/SVGUserAgent.java @@ -0,0 +1,156 @@ +/* + * Copyright 1999-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id: SVGUserAgent.java,v 1.2 2004/02/27 17:43:22 jeremias Exp $ */ + +package org.apache.fop.svg; + +import org.apache.fop.apps.FOUserAgent; +import org.apache.batik.bridge.UserAgentAdapter; +import org.apache.avalon.framework.logger.Logger; + +// Java +import java.awt.geom.AffineTransform; +import java.awt.geom.Dimension2D; +import java.awt.Dimension; + +/** + * The SVG user agent. + * This is an implementation of the batik svg user agent + * for handling errors and getting user agent values. + */ +public class SVGUserAgent extends UserAgentAdapter { + private AffineTransform currentTransform = null; + private FOUserAgent userAgent; + + /** + * Creates a new SVGUserAgent. + * @param ua the FO user agent + * @param at the current transform + */ + public SVGUserAgent(FOUserAgent ua, AffineTransform at) { + currentTransform = at; + userAgent = ua; + } + + /** + * Returns the logger associated with this user agent. + * @return Logger the logger + */ + protected final Logger getLogger() { + return this.userAgent.getLogger(); + } + + /** + * Displays an error message. + * @param message the message to display + */ + public void displayError(String message) { + getLogger().error(message); + } + + /** + * Displays an error resulting from the specified Exception. + * @param ex the exception to display + */ + public void displayError(Exception ex) { + getLogger().error("SVG Error" + ex.getMessage(), ex); + } + + /** + * Displays a message in the User Agent interface. + * The given message is typically displayed in a status bar. + * @param message the message to display + */ + public void displayMessage(String message) { + getLogger().info(message); + } + + /** + * Shows an alert dialog box. + * @param message the message to display + */ + public void showAlert(String message) { + getLogger().warn(message); + } + + /** + * Returns a customized the pixel to mm factor. + * @return the pixel unit to millimeter conversion factor + */ + public float getPixelUnitToMillimeter() { + return userAgent.getPixelUnitToMillimeter(); + } + + /** + * Returns the language settings. + * @return the languages supported + */ + public String getLanguages() { + return "en"; // userLanguages; + } + + /** + * Returns the media type for this rendering. + * @return the media for fo documents is "print" + */ + public String getMedia() { + return "print"; + } + + /** + * Returns the user stylesheet uri. + * @return null if no user style sheet was specified. + */ + public String getUserStyleSheetURI() { + return null; // userStyleSheetURI; + } + + /** + * Returns the class name of the XML parser. + * @return the XML parser class name + */ + public String getXMLParserClassName() { + return org.apache.fop.apps.FOFileHandler.getParserClassName(); + } + + /** + * Is the XML parser validating. + * @return true if the xml parser is validating + */ + public boolean isXMLParserValidating() { + return false; + } + + /** + * Get the transform of the svg document. + * @return the transform + */ + public AffineTransform getTransform() { + return currentTransform; + } + + /** + * Get the default viewport size for an svg document. + * This returns a default value of 100x100. + * @return the default viewport size + */ + public Dimension2D getViewportSize() { + return new Dimension(100, 100); + } + +} + diff --git a/src/java/org/apache/fop/svg/package.html b/src/java/org/apache/fop/svg/package.html index 1f7cfb6be..a42efa921 100644 --- a/src/java/org/apache/fop/svg/package.html +++ b/src/java/org/apache/fop/svg/package.html @@ -16,7 +16,7 @@ The PDFTranscoder is a transcoder for use with batik to convert from SVG to a single page PDF document.

-SVGElement, SVGElementMapping, SVGObj and SVGUserAgent are used by +SVGElement, SVGElementMapping and SVGObj are used by FOP for handling embedded SVG or external SVG graphics.