jeremias    2003/03/07 01:47:56

  Modified:    src/org/apache/fop/rtf/renderer RTFHandler.java
  Log:
  Switched to long licence
  Some general checkstyle fixing
  
  Revision  Changes    Path
  1.4       +124 -42   xml-fop/src/org/apache/fop/rtf/renderer/RTFHandler.java
  
  Index: RTFHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/rtf/renderer/RTFHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RTFHandler.java   29 Nov 2002 23:18:58 -0000      1.3
  +++ RTFHandler.java   7 Mar 2003 09:47:56 -0000       1.4
  @@ -1,120 +1,202 @@
   /*
    * $Id$
  - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  - * For details on use and redistribution please refer to the
  - * LICENSE file included with these sources.
  - */
  -
  + * ============================================================================
  + *                    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 <http://www.apache.org/>.
  + */ 
   package org.apache.fop.rtf.renderer;
   
  +// Java
  +import java.io.OutputStream;
  +import java.io.OutputStreamWriter;
  +import java.io.IOException;
  +
  +// XML
  +import org.xml.sax.SAXException;
  +
  +// FOP
   import org.apache.fop.apps.StructureHandler;
   import org.apache.fop.layout.FontInfo;
   import org.apache.fop.apps.FOPException;
   
   import org.apache.fop.fo.pagination.PageSequence;
   import org.apache.fop.fo.pagination.LayoutMasterSet;
  -import org.apache.fop.fo.pagination.SimplePageMaster;
   import org.apache.fop.fo.Title;
   import org.apache.fop.fo.flow.Block;
   import org.apache.fop.fo.flow.Flow;
   
  +// JFOR
   import org.jfor.jfor.rtflib.rtfdoc.RtfFile;
   import org.jfor.jfor.rtflib.rtfdoc.RtfSection;
   import org.jfor.jfor.rtflib.rtfdoc.RtfParagraph;
   import org.jfor.jfor.rtflib.rtfdoc.RtfDocumentArea;
   
  -import org.xml.sax.SAXException;
  -import java.io.OutputStream;
  -import java.io.OutputStreamWriter;
  -import java.io.IOException;
  -
   /**
    * RTF Handler: generates RTF output using the structure events from
    * the FO Tree sent to this structure handler.
    *
  - *  @author [EMAIL PROTECTED]
  + * @author [EMAIL PROTECTED]
    */
  -
  - public class RTFHandler extends StructureHandler {
  -    private FontInfo _fontInfo = new FontInfo();
  -    private RtfFile _rtfFile;
  -    private final OutputStream _os;
  -    private RtfSection _sect;
  -    private RtfDocumentArea _docArea;
  -    private RtfParagraph _para;
  -    private boolean _warned = false;
  -
  -    private static final String ALPHA_WARNING = "WARNING: RTF renderer is 
veryveryalpha at this time, see class org.apache.fop.rtf.renderer.RTFHandler";
  -
  +public class RTFHandler extends StructureHandler {
  +    
  +    private FontInfo fontInfo = new FontInfo();
  +    private RtfFile rtfFile;
  +    private final OutputStream os;
  +    private RtfSection sect;
  +    private RtfDocumentArea docArea;
  +    private RtfParagraph para;
  +    private boolean warned = false;
  +
  +    private static final String ALPHA_WARNING = "WARNING: RTF renderer is "
  +        + "veryveryalpha at this time, see class 
org.apache.fop.rtf.renderer.RTFHandler";
  +
  +    /**
  +     * Creates a new RTF structure handler.
  +     * @param os OutputStream to write to
  +     */
       public RTFHandler(OutputStream os) {
  -        _os = os;
  +        this.os = os;
           // use pdf fonts for now, this is only for resolving names
  -        org.apache.fop.render.pdf.FontSetup.setup(_fontInfo, null);
  +        org.apache.fop.render.pdf.FontSetup.setup(fontInfo, null);
           System.err.println(ALPHA_WARNING);
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#getFontInfo()
  +     */
       public FontInfo getFontInfo() {
  -        return _fontInfo;
  +        return this.fontInfo;
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#startDocument()
  +     */
       public void startDocument() throws SAXException {
           // FIXME sections should be created
           try {
  -            _rtfFile = new RtfFile(new OutputStreamWriter(_os));
  -            _docArea = _rtfFile.startDocumentArea();
  -        } catch(IOException ioe) {
  +            rtfFile = new RtfFile(new OutputStreamWriter(os));
  +            docArea = rtfFile.startDocumentArea();
  +        } catch (IOException ioe) {
               // FIXME could we throw Exception in all StructureHandler events?
               throw new SAXException("IOException: " + ioe);
           }
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#endDocument()
  +     */
       public void endDocument() throws SAXException {
           try {
  -            _rtfFile.flush();
  -        } catch(IOException ioe) {
  +            rtfFile.flush();
  +        } catch (IOException ioe) {
               // FIXME could we throw Exception in all StructureHandler events?
               throw new SAXException("IOException: " + ioe);
           }
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler
  +     */
       public void startPageSequence(PageSequence pageSeq, Title seqTitle, 
LayoutMasterSet lms)  {
           try {
  -            _sect = _docArea.newSection();
  -            if(!_warned) {
  -                _sect.newParagraph().newText(ALPHA_WARNING);
  -                _warned = true;
  +            sect = docArea.newSection();
  +            if (!warned) {
  +                sect.newParagraph().newText(ALPHA_WARNING);
  +                warned = true;
               }
  -        } catch(IOException ioe) {
  +        } catch (IOException ioe) {
               // FIXME could we throw Exception in all StructureHandler events?
               throw new Error("IOException: " + ioe);
           }
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#endPageSequence(PageSequence)
  +     */
       public void endPageSequence(PageSequence pageSeq) throws FOPException {
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#startFlow(Flow)
  +     */
       public void startFlow(Flow fl) {
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#endFlow(Flow)
  +     */
       public void endFlow(Flow fl) {
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#startBlock(Block)
  +     */
       public void startBlock(Block bl) {
           try {
  -            _para = _sect.newParagraph();
  -        } catch(IOException ioe) {
  +            para = sect.newParagraph();
  +        } catch (IOException ioe) {
               // FIXME could we throw Exception in all StructureHandler events?
               throw new Error("IOException: " + ioe);
           }
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#endBlock(Block)
  +     */
       public void endBlock(Block bl) {
       }
   
  +    /**
  +     * @see org.apache.fop.apps.StructureHandler#characters(char[], int, int)
  +     */
       public void characters(char data[], int start, int length) {
           try {
  -            _para.newText(new String(data,start,length));
  -         } catch(IOException ioe) {
  +            para.newText(new String(data, start, length));
  +         } catch (IOException ioe) {
               // FIXME could we throw Exception in all StructureHandler events?
               throw new Error("IOException: " + ioe);
           }
  
  
  

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

Reply via email to