From: William Victor Mote Date: Wed, 20 Aug 2003 18:09:46 +0000 (+0000) Subject: move control/Document to apps/Document X-Git-Tag: Root_Temp_KnuthStylePageBreaking~1186 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d43ad404c0e1a8725269c34b5d6479abc2c472ca;p=xmlgraphics-fop.git move control/Document to apps/Document git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196817 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/apps/Document.java b/src/java/org/apache/fop/apps/Document.java new file mode 100644 index 000000000..a78b51d16 --- /dev/null +++ b/src/java/org/apache/fop/apps/Document.java @@ -0,0 +1,352 @@ +/* + * $Id$ + * ============================================================================ + * The Apache Software License, Version 1.1 + * ============================================================================ + * + * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modifica- + * tion, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. The end-user documentation included with the redistribution, if any, must + * include the following acknowledgment: "This product includes software + * developed by the Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, if + * and wherever such third-party acknowledgments normally appear. + * + * 4. The names "FOP" and "Apache Software Foundation" must not be used to + * endorse or promote products derived from this software without prior + * written permission. For written permission, please contact + * apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", nor may + * "Apache" appear in their name, without prior written permission of the + * Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * ============================================================================ + * + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + */ +package org.apache.fop.apps; + +// Java +import java.util.Map; +import java.io.IOException; + +// FOP +import org.apache.fop.area.AreaTree; +import org.apache.fop.area.AreaTreeModel; + + +import org.apache.fop.fo.FOTreeControl; +import org.apache.fop.fo.FOTreeEvent; +import org.apache.fop.fo.FOTreeListener; +import org.apache.fop.fo.pagination.PageSequence; +import org.apache.fop.fonts.Font; +import org.apache.fop.fonts.FontMetrics; +import org.apache.fop.layout.LayoutStrategy; + +// SAX +import org.xml.sax.SAXException; + +/** + * Class storing information for the FOP Document being processed, and managing + * the processing of it. + */ +public class Document implements FOTreeControl, FOTreeListener { + + /** The parent Driver object */ + private Driver driver; + + /** Map containing fonts that have been used */ + private Map usedFonts; + + /** look up a font-triplet to find a font-name */ + private Map triplets; + + /** look up a font-name to get a font (that implements FontMetrics at least) */ + private Map fonts; + + /** + * the LayoutStrategy to be used to process this document + * TODO: this actually belongs in the RenderContext class, when it is + * created + */ + private LayoutStrategy layoutStrategy = null; + + /** + * The current AreaTree for the PageSequence being rendered. + */ + public AreaTree areaTree; + public AreaTreeModel atModel; + + /** + * Main constructor + * @param driver the Driver object that is the "parent" of this Document + */ + public Document(Driver driver) { + this.driver = driver; + this.triplets = new java.util.HashMap(); + this.fonts = new java.util.HashMap(); + this.usedFonts = new java.util.HashMap(); + } + + /** + * Checks if the font setup is valid (At least the ultimate fallback font + * must be registered.) + * @return True if valid + */ + public boolean isSetupValid() { + return triplets.containsKey(Font.DEFAULT_FONT); + } + + /** + * Adds a new font triplet. + * @param name internal key + * @param family font family name + * @param style font style (normal, italic, oblique...) + * @param weight font weight + */ + public void addFontProperties(String name, String family, String style, + int weight) { + /* + * add the given family, style and weight as a lookup for the font + * with the given name + */ + + String key = createFontKey(family, style, weight); + this.triplets.put(key, name); + } + + /** + * Adds font metrics for a specific font. + * @param name internal key + * @param metrics metrics to register + */ + public void addMetrics(String name, FontMetrics metrics) { + // add the given metrics as a font with the given name + + this.fonts.put(name, metrics); + } + + /** + * Lookup a font. + *
+ * Locate the font name for a given family, style and weight. + * The font name can then be used as a key as it is unique for + * the associated document. + * This also adds the font to the list of used fonts. + * @param family font family + * @param style font style + * @param weight font weight + * @return internal key + */ + public String fontLookup(String family, String style, + int weight) { + String key; + // first try given parameters + key = createFontKey(family, style, weight); + String f = (String)triplets.get(key); + if (f == null) { + // then adjust weight, favouring normal or bold + f = findAdjustWeight(family, style, weight); + + // then try any family with orig weight + if (f == null) { + key = createFontKey("any", style, weight); + f = (String)triplets.get(key); + } + + // then try any family with adjusted weight + if (f == null) { + f = findAdjustWeight(family, style, weight); + } + + // then use default + if (f == null) { + f = (String)triplets.get(Font.DEFAULT_FONT); + } + + } + + usedFonts.put(f, fonts.get(f)); + return f; + } + + /** + * Find a font with a given family and style by trying + * different font weights according to the spec. + * @param family font family + * @param style font style + * @param weight font weight + * @return internal key + */ + public String findAdjustWeight(String family, String style, + int weight) { + String key; + String f = null; + int newWeight = weight; + if (newWeight < 400) { + while (f == null && newWeight > 0) { + newWeight -= 100; + key = createFontKey(family, style, newWeight); + f = (String)triplets.get(key); + } + } else if (newWeight == 500) { + key = createFontKey(family, style, 400); + f = (String)triplets.get(key); + } else if (newWeight > 500) { + while (f == null && newWeight < 1000) { + newWeight += 100; + key = createFontKey(family, style, newWeight); + f = (String)triplets.get(key); + } + newWeight = weight; + while (f == null && newWeight > 400) { + newWeight -= 100; + key = createFontKey(family, style, newWeight); + f = (String)triplets.get(key); + } + } + if (f == null) { + key = createFontKey(family, style, 400); + f = (String)triplets.get(key); + } + + return f; + } + + /** + * Determines if a particular font is available. + * @param family font family + * @param style font style + * @param weight font weight + * @return True if available + */ + public boolean hasFont(String family, String style, int weight) { + String key = createFontKey(family, style, weight); + return this.triplets.containsKey(key); + } + + /** + * Creates a key from the given strings. + * @param family font family + * @param style font style + * @param weight font weight + * @return internal key + */ + public static String createFontKey(String family, String style, + int weight) { + return family + "," + style + "," + weight; + } + + /** + * Gets a Map of all registred fonts. + * @return a read-only Map with font key/FontMetrics pairs + */ + public Map getFonts() { + return java.util.Collections.unmodifiableMap(this.fonts); + } + + /** + * This is used by the renderers to retrieve all the + * fonts used in the document. + * This is for embedded font or creating a list of used fonts. + * @return a read-only Map with font key/FontMetrics pairs + */ + public Map getUsedFonts() { + return this.usedFonts; + } + + /** + * Returns the FontMetrics for a particular font + * @param fontName internal key + * @return font metrics + */ + public FontMetrics getMetricsFor(String fontName) { + usedFonts.put(fontName, fonts.get(fontName)); + return (FontMetrics)fonts.get(fontName); + } + + /** + * Set the LayoutStrategy to be used to process this Document + * @param ls the LayoutStrategy object to be used to process this Document + */ + public void setLayoutStrategy(LayoutStrategy ls) { + this.layoutStrategy = ls; + } + + /** + * @return this Document's LayoutStrategy object + */ + public LayoutStrategy getLayoutStrategy () { + return layoutStrategy; + } + + /** + * Public accessor for the parent Driver of this Document + * @return the parent Driver for this Document + */ + public Driver getDriver() { + return driver; + } + + /** + * Required by the FOTreeListener interface. It handles an + * FOTreeEvent that is fired when a PageSequence object has been completed. + * @param event the FOTreeEvent that was fired + * @throws FOPException for errors in building the PageSequence + */ + public void foPageSequenceComplete (FOTreeEvent event) throws FOPException { + PageSequence pageSeq = event.getPageSequence(); + layoutStrategy.format(pageSeq, areaTree); + } + + /** + * Required by the FOTreeListener interface. It handles an FOTreeEvent that + * is fired when the Document has been completely parsed. + * @param event the FOTreeEvent that was fired + * @throws SAXException for parsing errors + */ + public void foDocumentComplete (FOTreeEvent event) throws SAXException { + //processAreaTree(atModel); + try { + areaTree.endDocument(); + driver.getRenderer().stopRenderer(); + } catch (IOException ex) { + throw new SAXException(ex); + } + } + + /** + * Get the area tree for this layout handler. + * + * @return the area tree for this document + */ + public AreaTree getAreaTree() { + return areaTree; + } + +} + diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java index b91a275ec..784060cc9 100644 --- a/src/java/org/apache/fop/apps/Driver.java +++ b/src/java/org/apache/fop/apps/Driver.java @@ -52,7 +52,7 @@ package org.apache.fop.apps; // FOP import org.apache.fop.area.AreaTree; -import org.apache.fop.control.Document; + import org.apache.fop.fo.ElementMapping; import org.apache.fop.fo.FOTreeBuilder; import org.apache.fop.fo.FOUserAgent; diff --git a/src/java/org/apache/fop/control/Document.java b/src/java/org/apache/fop/control/Document.java deleted file mode 100644 index 48c0c88de..000000000 --- a/src/java/org/apache/fop/control/Document.java +++ /dev/null @@ -1,352 +0,0 @@ -/* - * $Id$ - * ============================================================================ - * The Apache Software License, Version 1.1 - * ============================================================================ - * - * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modifica- - * tion, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by the Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "FOP" and "Apache Software Foundation" must not be used to - * endorse or promote products derived from this software without prior - * written permission. For written permission, please contact - * apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", nor may - * "Apache" appear in their name, without prior written permission of the - * Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * ============================================================================ - * - * This software consists of voluntary contributions made by many individuals - * on behalf of the Apache Software Foundation and was originally created by - * James Tauber . For more information on the Apache - * Software Foundation, please see . - */ -package org.apache.fop.control; - -// Java -import java.util.Map; -import java.io.IOException; - -// FOP -import org.apache.fop.area.AreaTree; -import org.apache.fop.area.AreaTreeModel; -import org.apache.fop.apps.Driver; -import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FOTreeControl; -import org.apache.fop.fo.FOTreeEvent; -import org.apache.fop.fo.FOTreeListener; -import org.apache.fop.fo.pagination.PageSequence; -import org.apache.fop.fonts.Font; -import org.apache.fop.fonts.FontMetrics; -import org.apache.fop.layout.LayoutStrategy; - -// SAX -import org.xml.sax.SAXException; - -/** - * Class storing information for the FOP Document being processed, and managing - * the processing of it. - */ -public class Document implements FOTreeControl, FOTreeListener { - - /** The parent Driver object */ - private Driver driver; - - /** Map containing fonts that have been used */ - private Map usedFonts; - - /** look up a font-triplet to find a font-name */ - private Map triplets; - - /** look up a font-name to get a font (that implements FontMetrics at least) */ - private Map fonts; - - /** - * the LayoutStrategy to be used to process this document - * TODO: this actually belongs in the RenderContext class, when it is - * created - */ - private LayoutStrategy layoutStrategy = null; - - /** - * The current AreaTree for the PageSequence being rendered. - */ - public AreaTree areaTree; - public AreaTreeModel atModel; - - /** - * Main constructor - * @param driver the Driver object that is the "parent" of this Document - */ - public Document(Driver driver) { - this.driver = driver; - this.triplets = new java.util.HashMap(); - this.fonts = new java.util.HashMap(); - this.usedFonts = new java.util.HashMap(); - } - - /** - * Checks if the font setup is valid (At least the ultimate fallback font - * must be registered.) - * @return True if valid - */ - public boolean isSetupValid() { - return triplets.containsKey(Font.DEFAULT_FONT); - } - - /** - * Adds a new font triplet. - * @param name internal key - * @param family font family name - * @param style font style (normal, italic, oblique...) - * @param weight font weight - */ - public void addFontProperties(String name, String family, String style, - int weight) { - /* - * add the given family, style and weight as a lookup for the font - * with the given name - */ - - String key = createFontKey(family, style, weight); - this.triplets.put(key, name); - } - - /** - * Adds font metrics for a specific font. - * @param name internal key - * @param metrics metrics to register - */ - public void addMetrics(String name, FontMetrics metrics) { - // add the given metrics as a font with the given name - - this.fonts.put(name, metrics); - } - - /** - * Lookup a font. - *
- * Locate the font name for a given family, style and weight. - * The font name can then be used as a key as it is unique for - * the associated document. - * This also adds the font to the list of used fonts. - * @param family font family - * @param style font style - * @param weight font weight - * @return internal key - */ - public String fontLookup(String family, String style, - int weight) { - String key; - // first try given parameters - key = createFontKey(family, style, weight); - String f = (String)triplets.get(key); - if (f == null) { - // then adjust weight, favouring normal or bold - f = findAdjustWeight(family, style, weight); - - // then try any family with orig weight - if (f == null) { - key = createFontKey("any", style, weight); - f = (String)triplets.get(key); - } - - // then try any family with adjusted weight - if (f == null) { - f = findAdjustWeight(family, style, weight); - } - - // then use default - if (f == null) { - f = (String)triplets.get(Font.DEFAULT_FONT); - } - - } - - usedFonts.put(f, fonts.get(f)); - return f; - } - - /** - * Find a font with a given family and style by trying - * different font weights according to the spec. - * @param family font family - * @param style font style - * @param weight font weight - * @return internal key - */ - public String findAdjustWeight(String family, String style, - int weight) { - String key; - String f = null; - int newWeight = weight; - if (newWeight < 400) { - while (f == null && newWeight > 0) { - newWeight -= 100; - key = createFontKey(family, style, newWeight); - f = (String)triplets.get(key); - } - } else if (newWeight == 500) { - key = createFontKey(family, style, 400); - f = (String)triplets.get(key); - } else if (newWeight > 500) { - while (f == null && newWeight < 1000) { - newWeight += 100; - key = createFontKey(family, style, newWeight); - f = (String)triplets.get(key); - } - newWeight = weight; - while (f == null && newWeight > 400) { - newWeight -= 100; - key = createFontKey(family, style, newWeight); - f = (String)triplets.get(key); - } - } - if (f == null) { - key = createFontKey(family, style, 400); - f = (String)triplets.get(key); - } - - return f; - } - - /** - * Determines if a particular font is available. - * @param family font family - * @param style font style - * @param weight font weight - * @return True if available - */ - public boolean hasFont(String family, String style, int weight) { - String key = createFontKey(family, style, weight); - return this.triplets.containsKey(key); - } - - /** - * Creates a key from the given strings. - * @param family font family - * @param style font style - * @param weight font weight - * @return internal key - */ - public static String createFontKey(String family, String style, - int weight) { - return family + "," + style + "," + weight; - } - - /** - * Gets a Map of all registred fonts. - * @return a read-only Map with font key/FontMetrics pairs - */ - public Map getFonts() { - return java.util.Collections.unmodifiableMap(this.fonts); - } - - /** - * This is used by the renderers to retrieve all the - * fonts used in the document. - * This is for embedded font or creating a list of used fonts. - * @return a read-only Map with font key/FontMetrics pairs - */ - public Map getUsedFonts() { - return this.usedFonts; - } - - /** - * Returns the FontMetrics for a particular font - * @param fontName internal key - * @return font metrics - */ - public FontMetrics getMetricsFor(String fontName) { - usedFonts.put(fontName, fonts.get(fontName)); - return (FontMetrics)fonts.get(fontName); - } - - /** - * Set the LayoutStrategy to be used to process this Document - * @param ls the LayoutStrategy object to be used to process this Document - */ - public void setLayoutStrategy(LayoutStrategy ls) { - this.layoutStrategy = ls; - } - - /** - * @return this Document's LayoutStrategy object - */ - public LayoutStrategy getLayoutStrategy () { - return layoutStrategy; - } - - /** - * Public accessor for the parent Driver of this Document - * @return the parent Driver for this Document - */ - public Driver getDriver() { - return driver; - } - - /** - * Required by the FOTreeListener interface. It handles an - * FOTreeEvent that is fired when a PageSequence object has been completed. - * @param event the FOTreeEvent that was fired - * @throws FOPException for errors in building the PageSequence - */ - public void foPageSequenceComplete (FOTreeEvent event) throws FOPException { - PageSequence pageSeq = event.getPageSequence(); - layoutStrategy.format(pageSeq, areaTree); - } - - /** - * Required by the FOTreeListener interface. It handles an FOTreeEvent that - * is fired when the Document has been completely parsed. - * @param event the FOTreeEvent that was fired - * @throws SAXException for parsing errors - */ - public void foDocumentComplete (FOTreeEvent event) throws SAXException { - //processAreaTree(atModel); - try { - areaTree.endDocument(); - driver.getRenderer().stopRenderer(); - } catch (IOException ex) { - throw new SAXException(ex); - } - } - - /** - * Get the area tree for this layout handler. - * - * @return the area tree for this document - */ - public AreaTree getAreaTree() { - return areaTree; - } - -} - diff --git a/src/java/org/apache/fop/extensions/Bookmarks.java b/src/java/org/apache/fop/extensions/Bookmarks.java index d013028c0..dbd1c6a81 100644 --- a/src/java/org/apache/fop/extensions/Bookmarks.java +++ b/src/java/org/apache/fop/extensions/Bookmarks.java @@ -54,7 +54,7 @@ import org.apache.fop.fo.FOTreeHandler; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTreeVisitor; import org.apache.fop.area.AreaTree; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import java.util.ArrayList; diff --git a/src/java/org/apache/fop/mif/MIFHandler.java b/src/java/org/apache/fop/mif/MIFHandler.java index 7496ef90c..c1a77b57d 100644 --- a/src/java/org/apache/fop/mif/MIFHandler.java +++ b/src/java/org/apache/fop/mif/MIFHandler.java @@ -65,7 +65,7 @@ import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.pagination.PageSequenceMaster; import org.apache.fop.fo.pagination.SimplePageMaster; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.flow.ExternalGraphic; import org.apache.fop.fo.flow.InstreamForeignObject; diff --git a/src/java/org/apache/fop/render/PrintRenderer.java b/src/java/org/apache/fop/render/PrintRenderer.java index befd43b8e..59ffda9d5 100644 --- a/src/java/org/apache/fop/render/PrintRenderer.java +++ b/src/java/org/apache/fop/render/PrintRenderer.java @@ -52,7 +52,7 @@ package org.apache.fop.render; // FOP import org.apache.fop.render.pdf.FontSetup; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.fo.FOTreeControl; // Java diff --git a/src/java/org/apache/fop/render/awt/AWTRenderer.java b/src/java/org/apache/fop/render/awt/AWTRenderer.java index 0c04be3d2..aaf56ebcf 100644 --- a/src/java/org/apache/fop/render/awt/AWTRenderer.java +++ b/src/java/org/apache/fop/render/awt/AWTRenderer.java @@ -77,7 +77,7 @@ import java.util.Map; // FOP import org.apache.fop.apps.InputHandler; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.fo.FOTreeControl; import org.apache.fop.render.AbstractRenderer; import org.apache.fop.viewer.PreviewDialog; diff --git a/src/java/org/apache/fop/render/awt/FontSetup.java b/src/java/org/apache/fop/render/awt/FontSetup.java index 0bc24424d..6297a7998 100644 --- a/src/java/org/apache/fop/render/awt/FontSetup.java +++ b/src/java/org/apache/fop/render/awt/FontSetup.java @@ -51,7 +51,7 @@ package org.apache.fop.render.awt; // FOP -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.fonts.Font; // Java diff --git a/src/java/org/apache/fop/render/pdf/FontSetup.java b/src/java/org/apache/fop/render/pdf/FontSetup.java index d1e7880db..74caf1592 100644 --- a/src/java/org/apache/fop/render/pdf/FontSetup.java +++ b/src/java/org/apache/fop/render/pdf/FontSetup.java @@ -58,7 +58,7 @@ import org.apache.fop.fonts.Typeface; import org.apache.fop.fonts.FontDescriptor; import org.apache.fop.fonts.FontUtil; import org.apache.fop.fonts.LazyFont; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.pdf.PDFDocument; import org.apache.fop.pdf.PDFResources; // FOP (base 14 fonts) diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java index baea57a97..5ae4d098c 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java +++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java @@ -117,6 +117,7 @@ import org.apache.fop.area.inline.InlineParent; import org.apache.fop.fonts.Font; import org.apache.fop.traits.BorderProps; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.apps.*; /* todo: @@ -283,7 +284,7 @@ public class PDFRenderer extends PrintRenderer { */ public void stopRenderer() throws IOException { FontSetup.addToResources(pdfDoc, pdfDoc.getResources(), - (org.apache.fop.control.Document)fontInfo); + (org.apache.fop.apps.Document)fontInfo); pdfDoc.outputTrailer(ostream); this.pdfDoc = null; diff --git a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java index 2a627bf78..1ca612be6 100644 --- a/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java +++ b/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java @@ -62,7 +62,7 @@ import org.apache.fop.svg.PDFTextElementBridge; import org.apache.fop.svg.PDFAElementBridge; import org.apache.fop.svg.PDFGraphics2D; import org.apache.fop.svg.SVGUserAgent; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; /* org.w3c.dom.Document is not imported to avoid conflict with org.apache.fop.control.Document */ diff --git a/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java b/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java index 0312c3129..35c3fc7fd 100644 --- a/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java +++ b/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java @@ -62,7 +62,7 @@ import java.io.IOException; //FOP import org.apache.fop.render.pdf.FontSetup; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; /** * This class is a wrapper for the PSGraphics2D that diff --git a/src/java/org/apache/fop/render/ps/PSGraphics2D.java b/src/java/org/apache/fop/render/ps/PSGraphics2D.java index 009bc9005..98aa6fdbf 100644 --- a/src/java/org/apache/fop/render/ps/PSGraphics2D.java +++ b/src/java/org/apache/fop/render/ps/PSGraphics2D.java @@ -84,7 +84,7 @@ import java.awt.image.renderable.RenderableImage; import java.io.IOException; // FOP -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.fonts.Font; // Batik diff --git a/src/java/org/apache/fop/render/ps/PSProcSets.java b/src/java/org/apache/fop/render/ps/PSProcSets.java index b5f19267c..f1b40156b 100644 --- a/src/java/org/apache/fop/render/ps/PSProcSets.java +++ b/src/java/org/apache/fop/render/ps/PSProcSets.java @@ -56,7 +56,7 @@ import java.util.Map; import org.apache.fop.fonts.Typeface; import org.apache.fop.fonts.Glyphs; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; /** * This class defines the basic resources (procsets) used by FOP's PostScript diff --git a/src/java/org/apache/fop/render/ps/PSRenderer.java b/src/java/org/apache/fop/render/ps/PSRenderer.java index 6514fb2d6..d1d9a1fa2 100644 --- a/src/java/org/apache/fop/render/ps/PSRenderer.java +++ b/src/java/org/apache/fop/render/ps/PSRenderer.java @@ -73,7 +73,7 @@ import org.apache.fop.area.inline.Word; import org.apache.fop.datatypes.ColorType; import org.apache.fop.fo.FOUserAgent; import org.apache.fop.fonts.Typeface; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.render.AbstractRenderer; import org.apache.fop.render.RendererContext; import org.apache.fop.fo.FOTreeControl; diff --git a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java index d2db5233a..3a4604839 100644 --- a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java +++ b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java @@ -56,7 +56,7 @@ import org.apache.batik.bridge.BridgeContext; //import org.apache.batik.bridge.TextUtilities; import org.apache.batik.gvt.GraphicsNode; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/java/org/apache/fop/render/ps/PSTextPainter.java b/src/java/org/apache/fop/render/ps/PSTextPainter.java index 76b1696de..f8ed1d10a 100644 --- a/src/java/org/apache/fop/render/ps/PSTextPainter.java +++ b/src/java/org/apache/fop/render/ps/PSTextPainter.java @@ -75,7 +75,7 @@ import org.apache.batik.gvt.renderer.StrokingTextPainter; import org.apache.fop.fonts.FontMetrics; import org.apache.fop.fonts.Font; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; /** * Renders the attributed character iterator of a TextNode. diff --git a/src/java/org/apache/fop/render/ps/PSTranscoder.java b/src/java/org/apache/fop/render/ps/PSTranscoder.java index d5be860d3..0416b7f24 100644 --- a/src/java/org/apache/fop/render/ps/PSTranscoder.java +++ b/src/java/org/apache/fop/render/ps/PSTranscoder.java @@ -85,6 +85,7 @@ import org.apache.batik.gvt.renderer.StrokingTextPainter; import org.w3c.dom.Document; import org.w3c.dom.svg.SVGDocument; import org.w3c.dom.svg.SVGSVGElement; +import org.apache.fop.apps.*; /** * This class enables to transcode an input to a PostScript document. diff --git a/src/java/org/apache/fop/render/ps/PSXMLHandler.java b/src/java/org/apache/fop/render/ps/PSXMLHandler.java index 524d05cfa..7960d04fc 100644 --- a/src/java/org/apache/fop/render/ps/PSXMLHandler.java +++ b/src/java/org/apache/fop/render/ps/PSXMLHandler.java @@ -68,7 +68,7 @@ import org.apache.batik.gvt.GraphicsNode; import org.apache.batik.gvt.TextPainter; // FOP -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.render.XMLHandler; import org.apache.fop.render.RendererContext; import org.apache.fop.svg.SVGUserAgent; @@ -150,7 +150,7 @@ public class PSXMLHandler implements XMLHandler { public static PSInfo getPSInfo(RendererContext context) { PSInfo psi = new PSInfo(); psi.psGenerator = (PSGenerator)context.getProperty(PS_GENERATOR); - psi.fontInfo = (org.apache.fop.control.Document)context.getProperty(PS_FONT_INFO); + psi.fontInfo = (org.apache.fop.apps.Document)context.getProperty(PS_FONT_INFO); psi.width = ((Integer)context.getProperty(PS_WIDTH)).intValue(); psi.height = ((Integer)context.getProperty(PS_HEIGHT)).intValue(); psi.currentXPosition = ((Integer)context.getProperty(PS_XPOS)).intValue(); @@ -166,7 +166,7 @@ public class PSXMLHandler implements XMLHandler { /** see PS_GENERATOR */ private PSGenerator psGenerator; /** see PS_FONT_INFO */ - private org.apache.fop.control.Document fontInfo; + private org.apache.fop.apps.Document fontInfo; /** see PS_PAGE_WIDTH */ private int width; /** see PS_PAGE_HEIGHT */ @@ -195,7 +195,7 @@ public class PSXMLHandler implements XMLHandler { * Returns the fontInfo. * @return FontInfo */ - public org.apache.fop.control.Document getFontInfo() { + public org.apache.fop.apps.Document getFontInfo() { return fontInfo; } @@ -203,7 +203,7 @@ public class PSXMLHandler implements XMLHandler { * Sets the fontInfo. * @param fontInfo The fontInfo to set */ - public void setFontInfo(org.apache.fop.control.Document fontInfo) { + public void setFontInfo(org.apache.fop.apps.Document fontInfo) { this.fontInfo = fontInfo; } diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java index 5181082ce..26ae4cb55 100644 --- a/src/java/org/apache/fop/render/svg/SVGRenderer.java +++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java @@ -57,7 +57,7 @@ import org.apache.fop.area.inline.ForeignObject; import org.apache.fop.area.inline.Leader; import org.apache.fop.area.inline.Word; import org.apache.fop.svg.SVGUtilities; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.fo.FOUserAgent; import org.apache.fop.fo.properties.RuleStyle; import org.apache.fop.fo.FOTreeControl; diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java index 86aac11f7..816b268ec 100644 --- a/src/java/org/apache/fop/render/xml/XMLRenderer.java +++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java @@ -68,7 +68,7 @@ import org.apache.fop.render.AbstractRenderer; import org.apache.fop.render.RendererContext; import org.apache.fop.render.XMLHandler; import org.apache.fop.fo.FOUserAgent; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; import org.apache.fop.area.BeforeFloat; import org.apache.fop.area.Block; diff --git a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java index 881f95619..f1953d7f2 100644 --- a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java +++ b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java @@ -72,7 +72,7 @@ import org.apache.fop.fo.flow.TableRow; import org.apache.fop.fo.pagination.Flow; import org.apache.fop.fo.pagination.PageSequence; import org.apache.fop.fo.properties.Constants; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes; import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable; import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea; diff --git a/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java b/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java index 93880f1b4..4f2ec8d93 100644 --- a/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java @@ -69,7 +69,7 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.logger.Logger; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import java.awt.Graphics; import java.awt.Font; diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java index 07e01dbfb..d3f48f1fe 100644 --- a/src/java/org/apache/fop/svg/PDFGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java @@ -64,7 +64,7 @@ import org.apache.fop.pdf.PDFDocument; import org.apache.fop.pdf.PDFLink; import org.apache.fop.pdf.PDFAnnotList; import org.apache.fop.pdf.BitmapImage; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.fonts.Font; import org.apache.fop.render.pdf.FontSetup; import org.apache.fop.fonts.FontMetrics; diff --git a/src/java/org/apache/fop/svg/PDFTextElementBridge.java b/src/java/org/apache/fop/svg/PDFTextElementBridge.java index 1f7eaaa5d..ae8164aea 100644 --- a/src/java/org/apache/fop/svg/PDFTextElementBridge.java +++ b/src/java/org/apache/fop/svg/PDFTextElementBridge.java @@ -56,7 +56,7 @@ import org.apache.batik.bridge.BridgeContext; import org.apache.batik.bridge.TextUtilities; import org.apache.batik.gvt.GraphicsNode; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/java/org/apache/fop/svg/PDFTextPainter.java b/src/java/org/apache/fop/svg/PDFTextPainter.java index cfbdc60ef..111ccb3e7 100644 --- a/src/java/org/apache/fop/svg/PDFTextPainter.java +++ b/src/java/org/apache/fop/svg/PDFTextPainter.java @@ -74,7 +74,7 @@ import org.apache.batik.gvt.renderer.StrokingTextPainter; import org.apache.fop.fonts.FontMetrics; import org.apache.fop.fonts.Font; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; /** * Renders the attributed character iterator of a TextNode. diff --git a/src/java/org/apache/fop/svg/PDFTranscoder.java b/src/java/org/apache/fop/svg/PDFTranscoder.java index 6b69c659b..2681743b1 100644 --- a/src/java/org/apache/fop/svg/PDFTranscoder.java +++ b/src/java/org/apache/fop/svg/PDFTranscoder.java @@ -76,6 +76,7 @@ import org.apache.batik.transcoder.image.resources.Messages; import org.w3c.dom.Document; import org.w3c.dom.svg.SVGDocument; import org.w3c.dom.svg.SVGSVGElement; +import org.apache.fop.apps.*; /** * This class enables to transcode an input to a pdf document. diff --git a/src/java/org/apache/fop/tools/AreaTreeBuilder.java b/src/java/org/apache/fop/tools/AreaTreeBuilder.java index 07b3683ff..dd25fdecc 100644 --- a/src/java/org/apache/fop/tools/AreaTreeBuilder.java +++ b/src/java/org/apache/fop/tools/AreaTreeBuilder.java @@ -100,7 +100,7 @@ import org.apache.fop.area.inline.Leader; import org.apache.fop.area.inline.Space; import org.apache.fop.area.inline.Viewport; import org.apache.fop.area.inline.Word; -import org.apache.fop.control.Document; +import org.apache.fop.apps.Document; import org.apache.fop.fonts.Font; import org.apache.fop.render.Renderer; import org.apache.fop.render.pdf.PDFRenderer;