Re: cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[Jeremias Maerki]

You're right. The check is not really needed. I simply assimilated that
part to the one in startPageSequence. So, there's no real reasoning here.
I'm aware of the validation scheme for the FO namespace but we're
talking about renderers which don't necessarily follow the same
structure as the FO tree. The problem was rather that:

The page-master1.xml test case I checked in contains several
page-sequences. Now, the XML renderer gets all page-sequences first
(because these calls are made during layout stage) and in the last
page-sequence all pages of the document appear (even if they are in
different page-sequences). That's what it looks like right now:




  
  
  
  
  

  

  


  
etc. etc.

That is primarily bad for testing but not necessarily bad for normal
renderers so I didn't take any action for now. But we may want to check
if we want create an area-tree level wrapper for pages in a
page-sequence.

On 20.01.2005 05:46:36 Glen Mazza wrote:
> I don't think this is needed (unless I'm missing your reasoning here.)  
> The validation in the FO Tree would raise errors otherwise, at least one 
> page-sequence being required by the fo:root FO.  The validation scheme 
> was designed so you don't need subsequent safety checks further downstream.
> 
> Glen
> 
> [EMAIL PROTECTED] schrieb:
> 
> >jeremias2005/01/19 13:45:07
> >
> >  Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
> >  Log:
> >  Safety check
> >  
> >  Revision  ChangesPath
> >  1.38  +3 -1  
> > xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
> >  
> >  Index: XMLRenderer.java
> >  ===
> >  RCS file: 
> > /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
> >  retrieving revision 1.37
> >  retrieving revision 1.38
> >  diff -u -r1.37 -r1.38
> >  --- XMLRenderer.java   18 Jan 2005 08:55:58 -  1.37
> >  +++ XMLRenderer.java   19 Jan 2005 21:45:07 -  1.38
> >  @@ -313,7 +313,9 @@
> >* @see org.apache.fop.render.Renderer#stopRenderer()
> >*/
> >   public void stopRenderer() throws IOException {
> >  -endElement("pageSequence");
> >  +if (startedSequence) {
> >  +endElement("pageSequence");
> >  +}
> >   endElement("areaTree");
> >   try {
> >   handler.endDocument();



Jeremias Maerki

Re: cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[Glen Mazza]

I don't think this is needed (unless I'm missing your reasoning here.)  
The validation in the FO Tree would raise errors otherwise, at least one 
page-sequence being required by the fo:root FO.  The validation scheme 
was designed so you don't need subsequent safety checks further downstream.

Glen
[EMAIL PROTECTED] schrieb:
jeremias2005/01/19 13:45:07
 Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
 Log:
 Safety check
 
 Revision  ChangesPath
 1.38  +3 -1  xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
 
 Index: XMLRenderer.java
 ===
 RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
 retrieving revision 1.37
 retrieving revision 1.38
 diff -u -r1.37 -r1.38
 --- XMLRenderer.java	18 Jan 2005 08:55:58 -	1.37
 +++ XMLRenderer.java	19 Jan 2005 21:45:07 -	1.38
 @@ -313,7 +313,9 @@
   * @see org.apache.fop.render.Renderer#stopRenderer()
   */
  public void stopRenderer() throws IOException {
 -endElement("pageSequence");
 +if (startedSequence) {
 +endElement("pageSequence");
 +}
  endElement("areaTree");
  try {
  handler.endDocument();
 
 
 

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
 

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java XMLXMLHandler.java

[jeremias]

jeremias2004/02/27 09:55:12

  Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
XMLXMLHandler.java
  Log:
  Applied Apache License Version 2.0 by following the instructions at 
http://www.apache.org/dev/apply-license.html.
  
  Revision  ChangesPath
  1.18  +16 -48xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
  
  Index: XMLRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XMLRenderer.java  25 Feb 2004 11:52:32 -  1.17
  +++ XMLRenderer.java  27 Feb 2004 17:55:12 -  1.18
  @@ -1,53 +1,21 @@
   /*
  - * $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
  - *[EMAIL PROTECTED]
  - *
  - * 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 <[EMAIL PROTECTED]>. For more information on the Apache
  - * Software Foundation, please see .
  + * 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.render.xml;
   
   // Java
  
  
  
  1.2   +16 -48xml-fop/src/java/org/apache/fop/render/xml/XMLXMLHandler.java
  
  Index: XMLXMLHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLXMLHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLXMLHandler.java11 Mar 2003 13:05:31 -  1.1
  +++ XMLXMLHandler.java27 Feb 2004 17:55:12 -  1.2
  @@ -1,53 +1,21 @@
   /*
  - * $Id$
  - * ===

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[gmazza]

gmazza  2004/02/25 03:52:32

  Modified:src/java/org/apache/fop/render AbstractRenderer.java
Renderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  Changed internal renderInlineXXX() functions from public to protected access.  
Removed need for renderers to specifically implement them in Renderer interface.
  
  Revision  ChangesPath
  1.23  +6 -6  xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
  
  Index: AbstractRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- AbstractRenderer.java 25 Feb 2004 03:32:17 -  1.22
  +++ AbstractRenderer.java 25 Feb 2004 11:52:32 -  1.23
  @@ -639,12 +639,12 @@
   
   
   /** @see org.apache.fop.render.Renderer */
  -public void renderCharacter(Character ch) {
  +protected void renderCharacter(Character ch) {
   currentBlockIPPosition += ch.getWidth();
   }
   
   /** @see org.apache.fop.render.Renderer */
  -public void renderInlineSpace(Space space) {
  +protected void renderInlineSpace(Space space) {
   // an inline space moves the inline progression position
   // for the current block by the width or height of the space
   // it may also have styling (only on this object) that needs
  @@ -653,17 +653,17 @@
   }
   
   /** @see org.apache.fop.render.Renderer */
  -public void renderLeader(Leader area) {
  +protected void renderLeader(Leader area) {
   currentBlockIPPosition += area.getWidth();
   }
   
   /** @see org.apache.fop.render.Renderer */
  -public void renderText(TextArea text) {
  +protected void renderText(TextArea text) {
   currentBlockIPPosition += text.getWidth();
   }
   
   /** @see org.apache.fop.render.Renderer */
  -public void renderInlineParent(InlineParent ip) {
  +protected void renderInlineParent(InlineParent ip) {
   int saveIP = currentBlockIPPosition;
   Iterator iter = ip.getChildAreas().iterator();
   while (iter.hasNext()) {
  @@ -673,7 +673,7 @@
   }
   
   /** @see org.apache.fop.render.Renderer */
  -public void renderViewport(Viewport viewport) {
  +protected void renderViewport(Viewport viewport) {
   Area content = viewport.getContent();
   int saveBP = currentBPPosition;
   currentBPPosition += viewport.getOffset();
  
  
  
  1.7   +0 -44 xml-fop/src/java/org/apache/fop/render/Renderer.java
  
  Index: Renderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Renderer.java 28 Oct 2003 04:22:14 -  1.6
  +++ Renderer.java 25 Feb 2004 11:52:32 -  1.7
  @@ -212,55 +212,11 @@
   throws IOException, FOPException;
   
   /**
  - * Tells the renderer to render an inline viewport. It sets up clipping as
  - * necessary.
  - *
  - * @param viewport  The viewport area
  - */
  -void renderViewport(Viewport viewport);
  -
  -/**
* Tells the renderer to render an inline container.
*
* @param cont  The inline container area
*/
   void renderContainer(Container cont);
  -
  -/**
  - * Tells the renderer to render an inline text area
  - *
  - * @param area  The text area
  - */
  -void renderText(TextArea area);
  -
  -/**
  - * Tells the renderer to render an inline parent area.
  - *
  - * @param ip  The inline parent area
  - */
  -void renderInlineParent(InlineParent ip);
  -
  -/**
  - * Tells the renderer to render an inline character.
  - *
  - * @param ch  The inline character
  - */
  -void renderCharacter(
  -org.apache.fop.area.inline.Character ch);
  -
  -/**
  - * Tells the renderer to render an inline space.
  - *
  - * @param space  The inline space
  - */
  -void renderInlineSpace(Space space);
  -
  -/**
  - * Tells the renderer to render an inline leader area.
  - *
  - * @param area  The inline leader area.
  - */
  -void renderLeader(Leader area);
   
   }
   
  
  
  
  1.17  +6 -6  xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
  
  Index: XMLRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XMLRenderer.java  25 Feb 2004 03:32:17 -  1.16
  +++ XMLRenderer.java  25 Feb 2004 11:52:32 -00

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[gmazza]

gmazza  2004/02/24 19:32:17

  Modified:src/java/org/apache/fop/area/inline Character.java
InlineArea.java InlineParent.java Leader.java
Space.java TextArea.java Viewport.java
   src/java/org/apache/fop/render AbstractRenderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Removed: src/java/org/apache/fop/area/inline InlineAreaVisitor.java
  Log:
  Removal of Visitor patterns from AbstractRenderer, moving of business logic from 
InlineArea to AbstractRenderer.
  
  Revision  ChangesPath
  1.3   +0 -10 xml-fop/src/java/org/apache/fop/area/inline/Character.java
  
  Index: Character.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/Character.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Character.java10 Sep 2003 18:42:22 -  1.2
  +++ Character.java25 Feb 2004 03:32:16 -  1.3
  @@ -67,16 +67,6 @@
   }
   
   /**
  - * Handle InlineAreaVisitor request by passing this back to it.
  - *
  - * @param visitor the InlineAreaVisitor wishing to process this.
  - * @see org.apache.fop.area.inline.InlineAreaVisitor
  - */
  -public void acceptVisitor(InlineAreaVisitor visitor) {
  -visitor.serveVisitor(this);
  -}
  -
  -/**
* Get the character for this inline character area.
*
* @return the character
  
  
  
  1.3   +0 -13 xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java
  
  Index: InlineArea.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InlineArea.java   10 Sep 2003 18:42:22 -  1.2
  +++ InlineArea.java   25 Feb 2004 03:32:17 -  1.3
  @@ -58,8 +58,6 @@
* Inline Area
* This area is for all inline areas that can be placed
* in a line area.
  - * Extensions of this class should render themselves with the
  - * requested renderer.
*/
   public class InlineArea extends Area {
   // int width;
  @@ -73,17 +71,6 @@
* offset position from top of parent area
*/
   protected int verticalPosition = 0;
  -
  -/**
  - * Handle a visitor (usually a renderer) for this inline area.
  - * Inline areas that extend this class are expected
  - * to pass themselves back to the visitor so that the visitor can process
  - * them, usually by rendering them.
  - *
  - * @param visitor the InlineAreaVisitor that will process this
  - */
  -public void acceptVisitor(InlineAreaVisitor visitor) {
  -}
   
   /**
* Set the width of this inline area.
  
  
  
  1.3   +0 -10 xml-fop/src/java/org/apache/fop/area/inline/InlineParent.java
  
  Index: InlineParent.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/InlineParent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InlineParent.java 10 Sep 2003 18:42:22 -  1.2
  +++ InlineParent.java 25 Feb 2004 03:32:17 -  1.3
  @@ -77,16 +77,6 @@
   }
   
   /**
  - * Handle InlineAreaVisitor request by passing this back to it.
  - *
  - * @param visitor the InlineAreaVisitor wishing to process this.
  - * @see org.apache.fop.area.inline.InlineAreaVisitor
  - */
  -public void acceptVisitor(InlineAreaVisitor visitor) {
  -visitor.serveVisitor(this);
  -}
  -
  -/**
* Override generic Area method.
*
* @param childArea the child area to add
  
  
  
  1.4   +0 -10 xml-fop/src/java/org/apache/fop/area/inline/Leader.java
  
  Index: Leader.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/Leader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Leader.java   17 Jan 2004 19:29:45 -  1.3
  +++ Leader.java   25 Feb 2004 03:32:17 -  1.4
  @@ -108,15 +108,5 @@
   return ruleThickness;
   }
   
  -/**
  - * Handle InlineAreaVisitor request by passing this back to it.
  - *
  - * @param visitor the InlineAreaVisitor wishing to process this.
  - * @see org.apache.fop.area.inline.InlineAreaVisitor
  - */
  -public void acceptVisitor(InlineAreaVisitor visitor) {
  -visitor.serveVisitor(this);
  -}
  -
   }
   
  
  
  
  1.3   +0 -10 xml-fop/src/java/org/apache/fop/area/inline/Space.java
  
  Index: Space.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[bckfnn]

bckfnn  2004/01/24 08:09:48

  Modified:src/java/org/apache/fop/fo BorderWidthPropertyMaker.java
FOTreeHandler.java
   src/java/org/apache/fop/render/awt AWTRenderer.java
   src/java/org/apache/fop/render/mif MIFHandler.java
RefElement.java
   src/java/org/apache/fop/render/pdf PDFRenderer.java
   src/java/org/apache/fop/render/ps PSRenderer.java
   src/java/org/apache/fop/render/rtf RTFHandler.java
   src/java/org/apache/fop/render/rtf/rtflib/rtfdoc
RtfListStyleBullet.java RtfListStyleNumber.java
RtfListStyleText.java
   src/java/org/apache/fop/render/svg SVGRenderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  Fix javadoc warnings caused by unknown @see targets.
  
  Revision  ChangesPath
  1.3   +2 -2  xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java
  
  Index: BorderWidthPropertyMaker.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BorderWidthPropertyMaker.java 23 Jan 2004 21:39:59 -  1.2
  +++ BorderWidthPropertyMaker.java 24 Jan 2004 16:09:47 -  1.3
  @@ -79,7 +79,7 @@
   /**
* Check the value of the style property and return a length of 0 when
* the style is NONE.
  - * @see org.apache.fo.Property.Maker#get(int, PropertyList, boolean, boolean)
  + * @see org.apache.fop.fo.Property.Maker#get(int, PropertyList, boolean, 
boolean)
*/
  
   public Property get(int subpropId, PropertyList propertyList,
  
  
  
  1.13  +5 -5  xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java
  
  Index: FOTreeHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- FOTreeHandler.java10 Jan 2004 19:43:58 -  1.12
  +++ FOTreeHandler.java24 Jan 2004 16:09:47 -  1.13
  @@ -448,25 +448,25 @@
   }
   
   /**
  - * @see org.apache.fop.fo.FOInputHandler#startFootnote()
  + * @see org.apache.fop.fo.FOInputHandler#startFootnote(Footnote)
*/
   public void startFootnote(Footnote footnote) {
   }
   
   /**
  - * @see org.apache.fop.fo.FOInputHandler#endFootnote()
  + * @see org.apache.fop.fo.FOInputHandler#endFootnote(Footnote)
*/
   public void endFootnote(Footnote footnote) {
   }
   
   /**
  - * @see org.apache.fop.fo.FOInputHandler#startFootnoteBody()
  + * @see org.apache.fop.fo.FOInputHandler#startFootnoteBody(FootnoteBody)
*/
   public void startFootnoteBody(FootnoteBody body) {
   }
   
   /**
  - * @see org.apache.fop.fo.FOInputHandler#endFootnoteBody()
  + * @see org.apache.fop.fo.FOInputHandler#endFootnoteBody(FootnoteBody)
*/
   public void endFootnoteBody(FootnoteBody body) {
   }
  
  
  
  1.19  +1 -1  xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
  
  Index: AWTRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AWTRenderer.java  17 Jan 2004 19:29:46 -  1.18
  +++ AWTRenderer.java  24 Jan 2004 16:09:47 -  1.19
  @@ -457,7 +457,7 @@
   }
   
   /**
  - * @see org.apache.fop.render.Renderer#renderText(Text)
  + * @see org.apache.fop.render.Renderer#renderText(TextArea)
*/
   public void renderText(TextArea text) {
   System.out.println("In render text: " + text.getTextArea());
  
  
  
  1.6   +5 -5  xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java
  
  Index: MIFHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MIFHandler.java   14 Jan 2004 00:00:38 -  1.5
  +++ MIFHandler.java   24 Jan 2004 16:09:47 -  1.6
  @@ -432,25 +432,25 @@
   }
   
   /**
  - * @see org.apache.fop.fo.FOInputHandler#startFootnote()
  + * @see org.apache.fop.fo.FOInputHandler#startFootnote(Footnote)
*/
   public void startFootnote(Footnote footnote) {
   }
   
   /**
  - * @see org.apache.fop.fo.FOInputHandler#endFootnote()
  + * @see org.apache.fop.fo.FOInputHandler#endFootnote(Footnote)
*/
   public void endFootnote(Footnot

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[gmazza]

gmazza  2004/01/19 17:52:51

  Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  Block height/width elaboration for XML Renderer--Patch by Finn Bock.
  
  Revision  ChangesPath
  1.14  +3 -2  xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
  
  Index: XMLRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- XMLRenderer.java  17 Jan 2004 19:29:46 -  1.13
  +++ XMLRenderer.java  20 Jan 2004 01:52:51 -  1.14
  @@ -366,10 +366,11 @@
* @see org.apache.fop.render.AbstractRenderer#renderBlock(Block)
*/
   protected void renderBlock(Block block) {
  -String prop = "";
  +String prop = " width=\"" + block.getWidth() + 
  +  "\" height=\"" + block.getHeight() + "\"";
   Map map = block.getTraits();
   if (map != null) {
  -prop = " props=\"" + getPropString(map) + "\"";
  +prop = prop + " props=\"" + getPropString(map) + "\"";
   }
   writeStartTag("");
   super.renderBlock(block);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[vmote]

vmote   2003/09/10 11:42:23

  Modified:src/java/org/apache/fop/area/inline Character.java
InlineArea.java InlineParent.java Leader.java
Space.java Viewport.java Word.java
   src/java/org/apache/fop/render AbstractRenderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Added:   src/java/org/apache/fop/area/inline InlineAreaVisitor.java
  Log:
  add InlineAreaVisitor interface to make Area Tree more independent of Rendering
  
  Revision  ChangesPath
  1.2   +15 -16xml-fop/src/java/org/apache/fop/area/inline/Character.java
  
  Index: Character.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/Character.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Character.java11 Mar 2003 13:05:40 -  1.1
  +++ Character.java10 Sep 2003 18:42:22 -  1.2
  @@ -3,34 +3,34 @@
* 
*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
*[EMAIL PROTECTED]
  - * 
  + *
* 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
  @@ -42,16 +42,14 @@
* (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 <[EMAIL PROTECTED]>. For more information on the Apache
* Software Foundation, please see .
  - */ 
  + */
   package org.apache.fop.area.inline;
   
  -import org.apache.fop.render.Renderer;
  -
   /**
* Single character inline area.
* This inline area holds a single character.
  @@ -69,12 +67,13 @@
   }
   
   /**
  - * Render this inline area.
  + * Handle InlineAreaVisitor request by passing this back to it.
*
  - * @param renderer the renderer to render this character area
  + * @param visitor the InlineAreaVisitor wishing to process this.
  + * @see org.apache.fop.area.inline.InlineAreaVisitor
*/
  -public void render(Renderer renderer) {
  -renderer.renderCharacter(this);
  +public void acceptVisitor(InlineAreaVisitor visitor) {
  +visitor.serveVisitor(this);
   }
   
   /**
  
  
  
  1.2   +15 -16xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java
  
  Index: InlineArea.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InlineArea.java   11 Mar 2003 13:05:40 -  1.1
  +++ InlineArea.java   10 Sep 2003 18:42:22 -  1.2
  @@ -3,34 +3,34 @@
* 
* 

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[vmote]

vmote   2003/08/28 10:27:42

  Modified:src/java/org/apache/fop/apps FOUserAgent.java
   src/java/org/apache/fop/render AbstractRenderer.java
   src/java/org/apache/fop/render/pdf PDFRenderer.java
   src/java/org/apache/fop/render/ps PSRenderer.java
   src/java/org/apache/fop/render/svg SVGRenderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  move renderXML() from apps/FOUserAgent to render/AbstractRenderer
  
  Revision  ChangesPath
  1.3   +1 -40 xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java
  
  Index: FOUserAgent.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FOUserAgent.java  28 Aug 2003 17:13:22 -  1.2
  +++ FOUserAgent.java  28 Aug 2003 17:27:42 -  1.3
  @@ -55,17 +55,12 @@
   import java.io.IOException;
   import java.io.InputStream;
   
  -// XML
  -import org.w3c.dom.Document;
  -
   // Avalon
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   
   // FOP
   import org.apache.fop.pdf.PDFEncryptionParams;
  -import org.apache.fop.render.XMLHandler;
  -import org.apache.fop.render.RendererContext;
   
   /**
* The User Agent for fo.
  @@ -186,40 +181,6 @@
*/
   public boolean linkToFootnotes() {
   return true;
  -}
  -
  -/**
  - * Render the xml document with the given xml namespace.
  - * The Render Context is by the handle to render into the current
  - * rendering target.
  - * @param ctx rendering context
  - * @param doc DOM Document containing the source document
  - * @param namespace Namespace URI of the document
  - */
  -public void renderXML(RendererContext ctx, Document doc,
  -  String namespace) {
  -String mime = ctx.getMimeType();
  -Map mh = (Map) handlers.get(mime);
  -XMLHandler handler = null;
  -if (mh != null) {
  -handler = (XMLHandler) mh.get(namespace);
  -}
  -if (handler == null) {
  -handler = (XMLHandler) defaults.get(mime);
  -}
  -if (handler != null) {
  -try {
  -handler.handleXML(ctx, doc, namespace);
  -} catch (Throwable t) {
  -// could not handle document
  -getLogger().error("Some XML content will be ignored. "
  -+ "Could not render XML", t);
  -}
  -} else {
  -// no handler found for document
  -getLogger().warn("Some XML content will be ignored. "
  -+ "No handler defined for XML: " + namespace);
  -}
   }
   
   }
  
  
  
  1.10  +37 -0 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
  
  Index: AbstractRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AbstractRenderer.java 28 Aug 2003 17:13:22 -  1.9
  +++ AbstractRenderer.java 28 Aug 2003 17:27:42 -  1.10
  @@ -58,6 +58,9 @@
   import java.util.List;
   import java.util.Iterator;
   
  +// XML
  +import org.w3c.dom.Document;
  +
   // FOP
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.area.Area;
  @@ -700,6 +703,40 @@
   foua.handlers.put(mime, mh);
   }
   mh.put(ns, handler);
  +}
  +
  +/**
  + * Render the xml document with the given xml namespace.
  + * The Render Context is by the handle to render into the current
  + * rendering target.
  + * @param ctx rendering context
  + * @param doc DOM Document containing the source document
  + * @param namespace Namespace URI of the document
  + */
  +public void renderXML(FOUserAgent foua, RendererContext ctx, Document doc,
  +  String namespace) {
  +String mime = ctx.getMimeType();
  +Map mh = (Map) foua.handlers.get(mime);
  +XMLHandler handler = null;
  +if (mh != null) {
  +handler = (XMLHandler) mh.get(namespace);
  +}
  +if (handler == null) {
  +handler = (XMLHandler) foua.defaults.get(mime);
  +}
  +if (handler != null) {
  +try {
  +handler.handleXML(ctx, doc, namespace);
  +} catch (Throwable t) {
  +// could not handle document
  +getLogger().error("Some XML content will be ignored. "
  ++ "Could not render XML", t);
  +}
  +} else {
  +// no handler found for docum

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[vmote]

vmote   2003/08/28 10:13:22

  Modified:src/java/org/apache/fop/apps FOUserAgent.java
   src/java/org/apache/fop/render AbstractRenderer.java
   src/java/org/apache/fop/render/pdf PDFRenderer.java
   src/java/org/apache/fop/render/ps PSRenderer.java
   src/java/org/apache/fop/render/svg SVGRenderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  move setDefaultXMLHandler() and addXMLHandler() from apps/FOUserAgent to 
render/AbstractRenderer
  
  Revision  ChangesPath
  1.2   +3 -27 xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java
  
  Index: FOUserAgent.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FOUserAgent.java  22 Aug 2003 17:42:41 -  1.1
  +++ FOUserAgent.java  28 Aug 2003 17:13:22 -  1.2
  @@ -90,8 +90,8 @@
   public class FOUserAgent implements LogEnabled {
   
   private Logger log;
  -private Map defaults = new java.util.HashMap();
  -private Map handlers = new java.util.HashMap();
  +public Map defaults = new java.util.HashMap();
  +public Map handlers = new java.util.HashMap();
   private String baseURL;
   private PDFEncryptionParams pdfEncryptionParams;
   private float px2mm = 0.3528f; //72dpi (=25.4/dpi)
  @@ -186,30 +186,6 @@
*/
   public boolean linkToFootnotes() {
   return true;
  -}
  -
  -/**
  - * Set the default xml handler for the given mime type.
  - * @param mime MIME type
  - * @param handler XMLHandler to use
  - */
  -public void setDefaultXMLHandler(String mime, XMLHandler handler) {
  -defaults.put(mime, handler);
  -}
  -
  -/**
  - * Add an xml handler for the given mime type and xml namespace.
  - * @param mime MIME type
  - * @param ns Namespace URI
  - * @param handler XMLHandler to use
  - */
  -public void addXMLHandler(String mime, String ns, XMLHandler handler) {
  -Map mh = (Map) handlers.get(mime);
  -if (mh == null) {
  -mh = new java.util.HashMap();
  -handlers.put(mime, mh);
  -}
  -mh.put(ns, handler);
   }
   
   /**
  
  
  
  1.9   +26 -0 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
  
  Index: AbstractRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractRenderer.java 27 Aug 2003 18:14:46 -  1.8
  +++ AbstractRenderer.java 28 Aug 2003 17:13:22 -  1.9
  @@ -676,5 +676,31 @@
   }
   }
   
  +/**
  + * Set the default xml handler for the given mime type.
  + * @param mime MIME type
  + * @param handler XMLHandler to use
  + */
  +public void setDefaultXMLHandler(FOUserAgent foua, String mime,
  + XMLHandler handler) {
  +foua.defaults.put(mime, handler);
  +}
  +
  +/**
  + * Add an xml handler for the given mime type and xml namespace.
  + * @param mime MIME type
  + * @param ns Namespace URI
  + * @param handler XMLHandler to use
  + */
  +public void addXMLHandler(FOUserAgent foua, String mime, String ns,
  +  XMLHandler handler) {
  +Map mh = (Map) foua.handlers.get(mime);
  +if (mh == null) {
  +mh = new java.util.HashMap();
  +foua.handlers.put(mime, mh);
  +}
  +mh.put(ns, handler);
  +}
  +
   }
   
  
  
  
  1.13  +1 -1  xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
  
  Index: PDFRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PDFRenderer.java  22 Aug 2003 17:42:42 -  1.12
  +++ PDFRenderer.java  28 Aug 2003 17:13:22 -  1.13
  @@ -260,7 +260,7 @@
   PDFXMLHandler xmlHandler = new PDFXMLHandler();
   //userAgent.setDefaultXMLHandler(MIME_TYPE, xmlHandler);
   String svg = "http://www.w3.org/2000/svg";;
  -userAgent.addXMLHandler(MIME_TYPE, svg, xmlHandler);
  +addXMLHandler(userAgent, MIME_TYPE, svg, xmlHandler);
   }
   
   /**
  
  
  
  1.12  +1 -1  xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
  
  Index: PSRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
  retrieving revision 1.11
  

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[vmote]

vmote   2003/08/18 23:54:31

  Modified:src/java/org/apache/fop/extensions Bookmarks.java
   src/java/org/apache/fop/fo FOInputHandler.java
FOTreeControl.java FOTreeHandler.java
   src/java/org/apache/fop/fo/flow Leader.java PageNumber.java
PageNumberCitation.java
   src/java/org/apache/fop/render AbstractRenderer.java
PrintRenderer.java Renderer.java
   src/java/org/apache/fop/render/awt AWTRenderer.java
   src/java/org/apache/fop/render/pdf FontSetup.java
PDFRenderer.java
   src/java/org/apache/fop/render/ps PSRenderer.java
   src/java/org/apache/fop/render/svg SVGRenderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  more FO Tree isolation work
  
  Revision  ChangesPath
  1.8   +4 -1  xml-fop/src/java/org/apache/fop/extensions/Bookmarks.java
  
  Index: Bookmarks.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/extensions/Bookmarks.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Bookmarks.java19 Aug 2003 00:53:52 -  1.7
  +++ Bookmarks.java19 Aug 2003 06:54:31 -  1.8
  @@ -54,6 +54,7 @@
   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 java.util.ArrayList;
   
  @@ -110,7 +111,9 @@
   }
   // add data to area tree for resolving and handling
   if (foInputHandler instanceof FOTreeHandler) {
  -AreaTree at = 
((FOTreeHandler)foInputHandler).doc.getDriver().getAreaTree();
  +FOTreeHandler foth = (FOTreeHandler)foInputHandler;
  +Document doc = (Document)foth.foTreeControl;
  +AreaTree at = doc.getDriver().getAreaTree();
   at.addTreeExtension(data);
   data.setAreaTree(at);
   }
  
  
  
  1.6   +6 -6  xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java
  
  Index: FOInputHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FOInputHandler.java   15 Aug 2003 15:52:10 -  1.5
  +++ FOInputHandler.java   19 Aug 2003 06:54:31 -  1.6
  @@ -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.control.Document;
  +import org.apache.fop.fo.FOTreeControl;
   
   import org.xml.sax.SAXException;
   
  @@ -96,13 +96,13 @@
   
   //public Driver driver = null;
   
  -public Document doc = null;
  +public FOTreeControl foTreeControl = null;
   
   /**
* Main constructor
*/
  -public FOInputHandler(Document document) {
  -this.doc = document;
  +public FOInputHandler(FOTreeControl foTreeControl) {
  +this.foTreeControl = foTreeControl;
   }
   
   /**
  @@ -117,7 +117,7 @@
* Returns the FontInfo object associated with this FOInputHandler.
* @return the FontInof object
*/
  -public Document getFontInfo() {
  +public FOTreeControl getFontInfo() {
   return null;
   }
   
  
  
  
  1.2   +9 -1  xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java
  
  Index: FOTreeControl.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeControl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FOTreeControl.java19 Aug 2003 05:19:21 -  1.1
  +++ FOTreeControl.java19 Aug 2003 06:54:31 -  1.2
  @@ -51,6 +51,10 @@
   
   package org.apache.fop.fo;
   
  +// Java
  +import java.util.Map;
  +
  +// FOP
   import org.apache.fop.fonts.FontMetrics;
   
   /**
  @@ -68,5 +72,9 @@
int weight);
   
   public FontMetrics getMetricsFor(String fontName);
  +
  +public boolean isSetupValid();
  +
  +public Map getFonts();
   
   }
  
  
  
  1.6   +10 -13xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java
  
  Index: FOTreeHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FOTreeHandler.java15 Aug 2003 15:52:10 -  1.5
  +++ FOTreeHandler.java19 Aug 2003 06:54:31 -  1.6
  @@ -53,7 +53,6 @@
   // Java
   import java.io.IOException;
   import java.io.OutputStream;
  -import ja

cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java

[gmazza]

gmazza  2003/08/07 16:38:17

  Modified:src/java/org/apache/fop/render AbstractRenderer.java
PrintRenderer.java
   src/java/org/apache/fop/render/pcl PCLRenderer.java
   src/java/org/apache/fop/render/pdf PDFRenderer.java
   src/java/org/apache/fop/render/ps PSRenderer.java
   src/java/org/apache/fop/render/svg SVGRenderer.java
   src/java/org/apache/fop/render/txt TXTRenderer.java
   src/java/org/apache/fop/render/xml XMLRenderer.java
  Log:
  1.  To facilitate comprehension of the Renderer classes, added the remaining three 
methods in the Renderer interface to AbstractRenderer: startRenderer(), 
stopRenderer(), and setupFontInfo().  SetupFontInfo() remains abstract, the other two 
have blank definitions.
  2.  Removed the blank definitions of startRenderer() and stopRenderer() from 
PrintRenderer, these are now defined in AbstractRenderer.
  3.  Member string variables "producer" and "creator" were added to AbstractRenderer 
and are now populated by its setProducer() and setCreator() methods; removed these 
functions from the several subclasses that were handling these strings equivalently.
  
  Revision  ChangesPath
  1.4   +28 -3 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
  
  Index: AbstractRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractRenderer.java 25 Apr 2003 07:06:41 -  1.3
  +++ AbstractRenderer.java 7 Aug 2003 23:38:17 -   1.4
  @@ -53,13 +53,13 @@
   // Java
   import java.awt.geom.Rectangle2D;
   import java.io.IOException;
  +import java.io.OutputStream;
   import java.util.Map;
   import java.util.List;
   import java.util.Iterator;
   
   // FOP
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.fo.FOUserAgent;
   import org.apache.fop.area.Area;
   import org.apache.fop.area.BeforeFloat;
   import org.apache.fop.area.Block;
  @@ -87,6 +87,8 @@
   import org.apache.fop.area.inline.Viewport;
   import org.apache.fop.area.inline.Word;
   import org.apache.fop.area.inline.Character;
  +import org.apache.fop.fo.FOUserAgent;
  +import org.apache.fop.layout.FontInfo;
   
   // Avalon
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  @@ -108,6 +110,16 @@
   protected FOUserAgent userAgent;
   
   /**
  + * producer (usually "FOP")
  + */
  +protected String producer = "FOP";
  +
  +/**
  + * creator of document
  + */
  +protected String creator = null;
  +
  +/**
* renderer configuration
*/
   protected Map options;
  @@ -146,14 +158,19 @@
   }
   
   /** @see org.apache.fop.render.Renderer */
  -public void setProducer(String producer) {
  +public void setProducer(String inProducer) {
  +producer = inProducer;
   }
   
   /** @see org.apache.fop.render.Renderer */
  -public void setCreator(String creator) {
  +public void setCreator(String inCreator) {
  +creator = inCreator;
   }
   
   /** @see org.apache.fop.render.Renderer */
  +public abstract void setupFontInfo(FontInfo fontInfo);
  +
  +/** @see org.apache.fop.render.Renderer */
   public void setUserAgent(FOUserAgent agent) {
   userAgent = agent;
   }
  @@ -162,6 +179,14 @@
   public void setOptions(Map opt) {
   options = opt;
   }
  +
  +/** @see org.apache.fop.render.Renderer */
  +public void startRenderer(OutputStream outputStream)
  +throws IOException { }
  +
  +/** @see org.apache.fop.render.Renderer */
  +public void stopRenderer()
  +throws IOException { }
   
   /**
* Check if this renderer supports out of order rendering. If this renderer
  
  
  
  1.2   +0 -10 xml-fop/src/java/org/apache/fop/render/PrintRenderer.java
  
  Index: PrintRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/PrintRenderer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PrintRenderer.java11 Mar 2003 13:05:39 -  1.1
  +++ PrintRenderer.java7 Aug 2003 23:38:17 -   1.2
  @@ -56,8 +56,6 @@
   
   // Java
   import java.util.List;
  -import java.io.IOException;
  -import java.io.OutputStream;
   
   /** Abstract base class of "Print" type renderers.  */
   public abstract class PrintRenderer extends AbstractRenderer {
  @@ -77,13 +75,5 @@
   this.fontInfo = fontInfo;
   FontSetup.setup(fontInfo, fontList);
   }
  -
  -/** @see org.apache.fop.render.Renderer */
  -public void startRenderer(OutputStream outputStream)
  -throws IOException { }
  -
  -/**