pietsch     2003/09/19 07:33:16

  Modified:    src/java/org/apache/fop/servlet FopPrintServlet.java
               src/java/org/apache/fop/fo FObj.java FOTreeBuilder.java
               src/java/org/apache/fop/fo/extensions/svg
                        BatikExtensionElementMapping.java
               src/java/org/apache/fop/render/awt AWTRenderer.java
               src/java/org/apache/fop/area CTM.java
               src/java/org/apache/fop/layoutmgr BidiLayoutManager.java
                        LayoutManagerLS.java
               src/java/org/apache/fop/fo/flow Footnote.java Leader.java
                        PageNumber.java PageNumberCitation.java
                        InstreamForeignObject.java ListItem.java
               src/java/org/apache/fop/pdf PDFInfo.java
               src/java/org/apache/fop/fo/pagination RegionBody.java
                        Region.java
               src/java/org/apache/fop/mif MIFHandler.java
  Log:
  Organize imports.
  A bit of JavaDoc cosmetics.
  
  Revision  Changes    Path
  1.8       +1 -9      xml-fop/src/java/org/apache/fop/servlet/FopPrintServlet.java
  
  Index: FopPrintServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/servlet/FopPrintServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FopPrintServlet.java      2 Aug 2003 21:26:53 -0000       1.7
  +++ FopPrintServlet.java      19 Sep 2003 14:33:15 -0000      1.8
  @@ -51,10 +51,8 @@
   package org.apache.fop.servlet;
   
   import java.io.File;
  -import java.io.IOException;
   import java.io.InputStream;
   import java.io.PrintWriter;
  -import java.util.List;
   
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServlet;
  @@ -62,18 +60,12 @@
   import javax.servlet.http.HttpServletResponse;
   import javax.xml.transform.TransformerFactory;
   
  -import org.xml.sax.InputSource;
  -
  -// Avalon
   import org.apache.avalon.framework.logger.ConsoleLogger;
   import org.apache.avalon.framework.logger.Logger;
  -
  -// FOP
   import org.apache.fop.apps.Driver;
  -import org.apache.fop.apps.FOPException;
  -import org.apache.fop.area.PageViewport;
   import org.apache.fop.apps.XSLTInputHandler;
   import org.apache.fop.render.awt.AWTPrintRenderer;
  +import org.xml.sax.InputSource;
   
   /**
    * Example servlet to generate a fop printout from a servlet.
  
  
  
  1.19      +6 -9      xml-fop/src/java/org/apache/fop/fo/FObj.java
  
  Index: FObj.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FObj.java 16 Sep 2003 05:21:04 -0000      1.18
  +++ FObj.java 19 Sep 2003 14:33:15 -0000      1.19
  @@ -50,23 +50,20 @@
    */
   package org.apache.fop.fo;
   
  -// Java
  -import java.util.Iterator;
  -import java.util.ListIterator;
   import java.util.ArrayList;
  -import java.util.List;
   import java.util.HashMap;
  -import java.util.Set;
  +import java.util.Iterator;
  +import java.util.ListIterator;
   import java.util.Map;
  -import org.xml.sax.Attributes;
  +import java.util.Set;
   
  -// FOP
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.fo.properties.FOPropertyMapping;
   import org.apache.fop.fo.flow.Marker;
  +import org.apache.fop.fo.properties.FOPropertyMapping;
  +import org.xml.sax.Attributes;
   
   /**
  - * base class for representation of formatting objects and their processing
  + * Base class for representation of formatting objects and their processing.
    */
   public class FObj extends FONode {
       private static final String FO_URI = "http://www.w3.org/1999/XSL/Format";;
  
  
  
  1.19      +10 -25    xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
  
  Index: FOTreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- FOTreeBuilder.java        13 Sep 2003 22:55:16 -0000      1.18
  +++ FOTreeBuilder.java        19 Sep 2003 14:33:15 -0000      1.19
  @@ -50,46 +50,31 @@
    */
   package org.apache.fop.fo;
   
  -// FOP
  -import java.util.HashMap;
  +import java.io.BufferedReader;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.InputStreamReader;
  +import java.io.Reader;
  +import java.util.Enumeration;
  +import java.util.Iterator;
  +import java.util.List;
   import java.util.Map;
   import java.util.Set;
  -import org.apache.fop.fo.pagination.Root;
   
  -// SAX
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.apps.FOUserAgent;
   import org.apache.fop.fo.ElementMapping.Maker;
  +import org.apache.fop.fo.pagination.Root;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.DefaultHandler;
   
  -// Java
  -import java.io.BufferedReader;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.IOException;
  -import java.io.Reader;
  -import java.util.Enumeration;
  -import java.util.Iterator;
  -import java.util.List;
  -import org.apache.fop.apps.FOUserAgent;
  -
   /**
    * SAX Handler that passes parsed data to the various
    * FO objects, where they can be used either to build
    * an FO Tree, or used by Structure Renderers to build
    * other data structures.
  - * Now uses
  - * StreamRenderer to automagically render the document as
  - * soon as it receives a page-sequence end-tag. Also,
  - * calls methods to set up and shut down the renderer at
  - * the beginning and end of the FO document. Finally,
  - * supresses adding the PageSequence object to the Root,
  - * since it is parsed immediately.
  - *
  - * @author unascribed
  - * @author Mark Lillywhite [EMAIL PROTECTED]
    */
   public class FOTreeBuilder extends DefaultHandler {
   
  
  
  
  1.2       +4 -6      
xml-fop/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java
  
  Index: BatikExtensionElementMapping.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BatikExtensionElementMapping.java 13 Sep 2003 22:55:16 -0000      1.1
  +++ BatikExtensionElementMapping.java 19 Sep 2003 14:33:15 -0000      1.2
  @@ -52,12 +52,10 @@
   
   import java.util.HashMap;
   
  -import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.ElementMapping;
  -import org.apache.fop.apps.FOFileHandler;
  -
   import org.apache.batik.util.XMLResourceDescriptor;
  -import org.apache.batik.dom.svg.ExtensibleSVGDOMImplementation;
  +import org.apache.fop.apps.FOFileHandler;
  +import org.apache.fop.fo.ElementMapping;
  +import org.apache.fop.fo.FONode;
   
   /**
    * This Element Mapping is for Batik SVG Extension elements
  
  
  
  1.13      +3 -7      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AWTRenderer.java  14 Sep 2003 21:28:38 -0000      1.12
  +++ AWTRenderer.java  19 Sep 2003 14:33:15 -0000      1.13
  @@ -59,38 +59,34 @@
   
   // Java
   import java.awt.Color;
  -import java.awt.Component;
   import java.awt.Dimension;
   import java.awt.Graphics;
   import java.awt.Graphics2D;
  -import java.awt.geom.Rectangle2D;
  +import java.awt.RenderingHints;
   import java.awt.Toolkit;
   import java.awt.event.WindowAdapter;
   import java.awt.event.WindowEvent;
   import java.awt.geom.AffineTransform;
  +import java.awt.geom.Rectangle2D;
   import java.awt.image.BufferedImage;
   import java.awt.print.PageFormat;
   import java.awt.print.Pageable;
   import java.awt.print.Printable;
  -import java.awt.RenderingHints;
   import java.io.IOException;
   import java.io.OutputStream;
   import java.util.Map;
   import java.util.Vector;
   
  -// FOP
   import org.apache.fop.apps.Document;
  -import org.apache.fop.apps.InputHandler;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.apps.InputHandler;
   import org.apache.fop.area.Area;
   import org.apache.fop.area.Page;
   import org.apache.fop.area.PageViewport;
   import org.apache.fop.area.RegionViewport;
   import org.apache.fop.area.Trait;
  -import org.apache.fop.datatypes.ColorType;
   import org.apache.fop.fo.FOTreeControl;
   import org.apache.fop.fo.properties.BackgroundRepeat;
  -import org.apache.fop.fonts.Font;
   import org.apache.fop.image.FopImage;
   import org.apache.fop.image.ImageFactory;
   import org.apache.fop.render.AbstractRenderer;
  
  
  
  1.6       +2 -3      xml-fop/src/java/org/apache/fop/area/CTM.java
  
  Index: CTM.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/CTM.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CTM.java  24 Aug 2003 18:04:06 -0000      1.5
  +++ CTM.java  19 Sep 2003 14:33:15 -0000      1.6
  @@ -50,12 +50,11 @@
    */
   package org.apache.fop.area;
   
  -import org.apache.fop.datatypes.FODimension;
  -import org.apache.fop.fo.PropertyManager;
  -import java.awt.geom.Rectangle2D;
   import java.awt.Rectangle;
  +import java.awt.geom.Rectangle2D;
   import java.io.Serializable;
   
  +import org.apache.fop.datatypes.FODimension;
   import org.apache.fop.fo.properties.WritingMode;
   
   /**
  
  
  
  1.2       +3 -11     xml-fop/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java
  
  Index: BidiLayoutManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BidiLayoutManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BidiLayoutManager.java    19 Aug 2003 00:53:54 -0000      1.1
  +++ BidiLayoutManager.java    19 Sep 2003 14:33:15 -0000      1.2
  @@ -50,18 +50,10 @@
    */
   package org.apache.fop.layoutmgr;
   
  -// FOP
  -import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObjMixed;
  -import org.apache.fop.fo.properties.CommonAural;
  -import org.apache.fop.fo.properties.CommonRelativePosition;
  +import java.util.ArrayList;
  +import java.util.List;
   
  -import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
  -import org.apache.fop.layoutmgr.LayoutProcessor;
   import org.apache.fop.area.inline.InlineArea;
  -
  -import java.util.List;
  -import java.util.ArrayList;
   
   
   /**
  
  
  
  1.15      +4 -5      xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
  
  Index: LayoutManagerLS.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- LayoutManagerLS.java      12 Sep 2003 18:57:34 -0000      1.14
  +++ LayoutManagerLS.java      19 Sep 2003 14:33:15 -0000      1.15
  @@ -50,15 +50,14 @@
    */
   package org.apache.fop.layoutmgr;
   
  -import org.apache.fop.area.extensions.BookmarkData;
  -import org.apache.fop.fo.extensions.Outline;
   import org.apache.fop.apps.Document;
   import org.apache.fop.apps.FOPException;
  -import org.apache.fop.layout.LayoutStrategy;
   import org.apache.fop.area.AreaTree;
   import org.apache.fop.area.Title;
  +import org.apache.fop.area.extensions.BookmarkData;
  +import org.apache.fop.fo.extensions.Outline;
   import org.apache.fop.fo.pagination.PageSequence;
  -import org.apache.fop.fo.FOTreeHandler;
  +import org.apache.fop.layout.LayoutStrategy;
   
   /**
    * The implementation of LayoutStrategy for the "redesign" or second generation
  
  
  
  1.5       +1 -5      xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java
  
  Index: Footnote.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Footnote.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Footnote.java     16 Sep 2003 05:21:05 -0000      1.4
  +++ Footnote.java     19 Sep 2003 14:33:15 -0000      1.5
  @@ -50,13 +50,9 @@
    */
   package org.apache.fop.fo.flow;
   
  -// Java
  -import java.util.List;
  -
  -// FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.FOTreeVisitor;
  +import org.apache.fop.fo.FObj;
   
   /**
    * Class modelling the fo:footnote object. See Sec. 6.10.3 of the XSL-FO
  
  
  
  1.15      +3 -6      xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
  
  Index: Leader.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Leader.java       16 Sep 2003 05:21:05 -0000      1.14
  +++ Leader.java       19 Sep 2003 14:33:15 -0000      1.15
  @@ -50,23 +50,20 @@
    */
   package org.apache.fop.fo.flow;
   
  -// FOP
   import org.apache.fop.datatypes.ColorType;
   import org.apache.fop.datatypes.Length;
   import org.apache.fop.datatypes.PercentLength;
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObjMixed;
  -import org.apache.fop.fo.FOInputHandler;
   import org.apache.fop.fo.FOTreeVisitor;
  -import org.apache.fop.fo.properties.LeaderPattern;
  +import org.apache.fop.fo.FObjMixed;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.fo.properties.CommonAural;
   import org.apache.fop.fo.properties.CommonBackground;
   import org.apache.fop.fo.properties.CommonBorderAndPadding;
  -import org.apache.fop.fo.FOTreeControl;
  -import org.apache.fop.fonts.Font;
   import org.apache.fop.fo.properties.CommonMarginInline;
   import org.apache.fop.fo.properties.CommonRelativePosition;
  +import org.apache.fop.fo.properties.LeaderPattern;
  +import org.apache.fop.fonts.Font;
   
   /**
    * Class modelling fo:leader object. See Sec. 6.6.9 of the XSL-FO Standard.
  
  
  
  1.15      +4 -8      xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
  
  Index: PageNumber.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PageNumber.java   16 Sep 2003 05:21:05 -0000      1.14
  +++ PageNumber.java   19 Sep 2003 14:33:15 -0000      1.15
  @@ -50,21 +50,17 @@
    */
   package org.apache.fop.fo.flow;
   
  -// FOP
  +import org.apache.fop.datatypes.ColorType;
  +import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTreeVisitor;
  +import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.fo.properties.CommonAural;
   import org.apache.fop.fo.properties.CommonBackground;
   import org.apache.fop.fo.properties.CommonBorderAndPadding;
  -import org.apache.fop.fo.FOTreeControl;
  -import org.apache.fop.fonts.Font;
   import org.apache.fop.fo.properties.CommonMarginInline;
   import org.apache.fop.fo.properties.CommonRelativePosition;
  -
  -import org.apache.fop.datatypes.ColorType;
  -import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObj;
  -import org.apache.fop.fo.FOInputHandler;
  +import org.apache.fop.fonts.Font;
   
   /**
    * Class modelling the fo:page-number object. See Sec. 6.6.10 of the XSL-FO
  
  
  
  1.16      +2 -5      xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
  
  Index: PageNumberCitation.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PageNumberCitation.java   16 Sep 2003 05:21:05 -0000      1.15
  +++ PageNumberCitation.java   19 Sep 2003 14:33:15 -0000      1.16
  @@ -50,20 +50,17 @@
    */
   package org.apache.fop.fo.flow;
   
  -// FOP
   import org.apache.fop.datatypes.ColorType;
  -import org.apache.fop.fo.FOTreeVisitor;
   import org.apache.fop.fo.FONode;
  +import org.apache.fop.fo.FOTreeVisitor;
   import org.apache.fop.fo.FObj;
  -import org.apache.fop.fo.FOInputHandler;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.fo.properties.CommonAural;
   import org.apache.fop.fo.properties.CommonBackground;
   import org.apache.fop.fo.properties.CommonBorderAndPadding;
  -import org.apache.fop.fo.FOTreeControl;
  -import org.apache.fop.fonts.Font;
   import org.apache.fop.fo.properties.CommonMarginInline;
   import org.apache.fop.fo.properties.CommonRelativePosition;
  +import org.apache.fop.fonts.Font;
   import org.apache.fop.util.CharUtilities;
   
   /**
  
  
  
  1.9       +1 -2      
xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
  
  Index: InstreamForeignObject.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- InstreamForeignObject.java        16 Sep 2003 05:21:05 -0000      1.8
  +++ InstreamForeignObject.java        19 Sep 2003 14:33:15 -0000      1.9
  @@ -51,11 +51,10 @@
   package org.apache.fop.fo.flow;
   
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.FOTreeVisitor;
  +import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.properties.DisplayAlign;
   import org.apache.fop.fo.properties.TextAlign;
  -import org.w3c.dom.Document;
   
   /**
    * The instream-foreign-object flow formatting object.
  
  
  
  1.7       +1 -5      xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java
  
  Index: ListItem.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ListItem.java     16 Sep 2003 05:21:05 -0000      1.6
  +++ ListItem.java     19 Sep 2003 14:33:15 -0000      1.7
  @@ -50,13 +50,9 @@
    */
   package org.apache.fop.fo.flow;
   
  -// Java
  -import java.util.List;
  -
  -// FOP
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.FOTreeVisitor;
  +import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.properties.CommonAccessibility;
   import org.apache.fop.fo.properties.CommonAural;
   import org.apache.fop.fo.properties.CommonBackground;
  
  
  
  1.3       +20 -2     xml-fop/src/java/org/apache/fop/pdf/PDFInfo.java
  
  Index: PDFInfo.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFInfo.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PDFInfo.java      27 Mar 2003 10:48:08 -0000      1.2
  +++ PDFInfo.java      19 Sep 2003 14:33:16 -0000      1.3
  @@ -69,6 +69,7 @@
       private String author = null;
       private String subject = null;
       private String keywords = null;
  +    private Date creationDate = null;
   
       /**
        * the name of the application that created the
  @@ -131,6 +132,20 @@
       }
   
       /**
  +     * @return last set creation date
  +     */
  +    public Date getCreationDate() {
  +        return creationDate;
  +    }
  +
  +    /**
  +     * @param date Date to store in the PDF as creation date. Use null to force 
current system date.
  +     */
  +    public void setCreationDate(Date date) {
  +        creationDate = date;
  +    }
  +
  +    /**
        * @see org.apache.fop.pdf.PDFObject#toPDF()
        */
       public byte[] toPDF() {
  @@ -170,9 +185,11 @@
               bout.write(encode("\n"));
       
               // creation date in form (D:YYYYMMDDHHmmSSOHH'mm')
  -            final Date date = new Date();
  +            if(creationDate==null) {
  +                creationDate = new Date();
  +            }
               final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
  -            final String str = sdf.format(date) + "+00'00'";
  +            final String str = sdf.format(creationDate) + "+00'00'";
               bout.write(encode("/CreationDate "));
               bout.write(encodeString("D:" + str));
               bout.write(encode("\n>>\nendobj\n"));
  @@ -181,5 +198,6 @@
           }
           return bout.toByteArray();
       }
  +
   }
   
  
  
  
  1.9       +5 -8      xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
  
  Index: RegionBody.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RegionBody.java   16 Sep 2003 05:21:06 -0000      1.8
  +++ RegionBody.java   19 Sep 2003 14:33:16 -0000      1.9
  @@ -50,20 +50,17 @@
    */
   package org.apache.fop.fo.pagination;
   
  -// Java
   import java.awt.Rectangle;
  -import java.awt.geom.Rectangle2D;
   
  -// FOP
  +import org.apache.fop.datatypes.ColorType;
  +import org.apache.fop.datatypes.FODimension;
   import org.apache.fop.fo.FONode;
  -import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.FOTreeVisitor;
  -import org.apache.fop.fo.PropertyList;
  +import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.Property;
  -import org.apache.fop.fo.properties.WritingMode;
  -import org.apache.fop.datatypes.ColorType;
  -import org.apache.fop.datatypes.FODimension;
  +import org.apache.fop.fo.PropertyList;
   import org.apache.fop.fo.properties.CommonMarginBlock;
  +import org.apache.fop.fo.properties.WritingMode;
   
   /**
    * The fo:region-body element.
  
  
  
  1.13      +2 -7      xml-fop/src/java/org/apache/fop/fo/pagination/Region.java
  
  Index: Region.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Region.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Region.java       16 Sep 2003 05:21:06 -0000      1.12
  +++ Region.java       19 Sep 2003 14:33:16 -0000      1.13
  @@ -50,18 +50,13 @@
    */
   package org.apache.fop.fo.pagination;
   
  -// Java
   import java.awt.Rectangle;
  -import java.awt.geom.Rectangle2D;
   
  -// FOP
  +import org.apache.fop.apps.FOPException;
   import org.apache.fop.datatypes.FODimension;
  -import org.apache.fop.fo.FObj;
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTreeVisitor;
  -import org.apache.fop.apps.FOPException;
  -
  -// SAX
  +import org.apache.fop.fo.FObj;
   import org.xml.sax.Attributes;
   
   /**
  
  
  
  1.13      +8 -12     xml-fop/src/java/org/apache/fop/mif/MIFHandler.java
  
  Index: MIFHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/mif/MIFHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MIFHandler.java   16 Sep 2003 17:33:06 -0000      1.12
  +++ MIFHandler.java   19 Sep 2003 14:33:16 -0000      1.13
  @@ -54,29 +54,25 @@
   import java.io.IOException;
   import java.io.OutputStream;
   
  -// XML
  -import org.xml.sax.SAXException;
  -
  -// FOP
  -import org.apache.fop.apps.Driver;
  -import org.apache.fop.fo.FOInputHandler;
  -import org.apache.fop.fo.flow.Block;
  -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.apps.Document;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.fo.FOInputHandler;
  +import org.apache.fop.fo.flow.Block;
   import org.apache.fop.fo.flow.ExternalGraphic;
   import org.apache.fop.fo.flow.InstreamForeignObject;
   import org.apache.fop.fo.flow.Leader;
   import org.apache.fop.fo.flow.ListBlock;
   import org.apache.fop.fo.flow.ListItem;
   import org.apache.fop.fo.flow.Table;
  -import org.apache.fop.fo.flow.TableColumn;
   import org.apache.fop.fo.flow.TableBody;
   import org.apache.fop.fo.flow.TableCell;
  +import org.apache.fop.fo.flow.TableColumn;
   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.pagination.PageSequenceMaster;
  +import org.apache.fop.fo.pagination.SimplePageMaster;
  +import org.xml.sax.SAXException;
   
   // TODO: do we really want every method throwing a SAXException
   
  
  
  

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

Reply via email to