olegt 2002/12/22 15:37:06 Modified: src/org/apache/fop/fo/pagination LayoutMasterSet.java PageMasterReference.java PageNumberGenerator.java PageSequenceMaster.java Region.java RegionAfter.java RegionBA.java RegionBASE.java RegionBefore.java RegionBody.java RegionEnd.java RegionSE.java RegionStart.java Root.java SimplePageMaster.java Log: Cleaned up unused imports. Revision Changes Path 1.18 +7 -8 xml-fop/src/org/apache/fop/fo/pagination/LayoutMasterSet.java Index: LayoutMasterSet.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/LayoutMasterSet.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- LayoutMasterSet.java 29 Nov 2002 23:18:54 -0000 1.17 +++ LayoutMasterSet.java 22 Dec 2002 23:37:05 -0000 1.18 @@ -9,13 +9,12 @@ // FOP import org.apache.fop.fo.*; -import org.apache.fop.fo.properties.*; import org.apache.fop.apps.FOPException; -import org.apache.fop.layout.PageMaster; // Java import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import org.xml.sax.Attributes; @@ -29,8 +28,8 @@ * information for a page sequence. */ public class LayoutMasterSet extends FObj { - private HashMap simplePageMasters; - private HashMap pageSequenceMasters; + private Map simplePageMasters; + private Map pageSequenceMasters; public LayoutMasterSet(FONode parent) { super(parent); @@ -110,12 +109,12 @@ protected void checkRegionNames() throws FOPException { // Section 7.33.15 check to see that if a region-name is a // duplicate, that it maps to the same region-class. - HashMap allRegions = new HashMap(); + Map allRegions = new HashMap(); for (Iterator spm = simplePageMasters.values().iterator(); spm.hasNext(); ) { SimplePageMaster simplePageMaster = (SimplePageMaster)spm.next(); - HashMap spmRegions = simplePageMaster.getRegions(); + Map spmRegions = simplePageMaster.getRegions(); for (Iterator e = spmRegions.values().iterator(); e.hasNext(); ) { Region region = (Region)e.next(); @@ -140,7 +139,7 @@ /** * Checks whether or not a region name exists in this master set - * @returns true when the region name specified has a region in this LayoutMasterSet + * @return true when the region name specified has a region in this LayoutMasterSet */ protected boolean regionNameExists(String regionName) { for (Iterator e = simplePageMasters.values().iterator(); 1.11 +3 -2 xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java Index: PageMasterReference.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PageMasterReference.java 17 Aug 2002 23:51:07 -0000 1.10 +++ PageMasterReference.java 22 Dec 2002 23:37:05 -0000 1.11 @@ -7,10 +7,11 @@ package org.apache.fop.fo.pagination; +// FOP import org.apache.fop.fo.*; -import org.apache.fop.fo.properties.*; import org.apache.fop.apps.FOPException; +// SAX import org.xml.sax.Attributes; /** 1.7 +1 -7 xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java Index: PageNumberGenerator.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageNumberGenerator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- PageNumberGenerator.java 25 Oct 2002 09:29:43 -0000 1.6 +++ PageNumberGenerator.java 22 Dec 2002 23:37:05 -0000 1.7 @@ -7,14 +7,8 @@ package org.apache.fop.fo.pagination; -// FOP -import org.apache.fop.fo.properties.*; - // Avalon import org.apache.avalon.framework.logger.AbstractLogEnabled; - -// Java -import java.util.*; /** * This class uses the 'format', 'groupingSeparator', 'groupingSize', 1.12 +4 -5 xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java Index: PageSequenceMaster.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- PageSequenceMaster.java 17 Aug 2002 23:51:07 -0000 1.11 +++ PageSequenceMaster.java 22 Dec 2002 23:37:05 -0000 1.12 @@ -9,14 +9,13 @@ // FOP import org.apache.fop.fo.*; -import org.apache.fop.fo.properties.*; -import org.apache.fop.layout.PageMaster; import org.apache.fop.apps.FOPException; // Java import java.util.ArrayList; -import java.util.Iterator; +import java.util.List; +// SAX import org.xml.sax.Attributes; /** @@ -26,7 +25,7 @@ */ public class PageSequenceMaster extends FObj { LayoutMasterSet layoutMasterSet; - ArrayList subSequenceSpecifiers; + List subSequenceSpecifiers; private SubSequenceSpecifier currentSubSequence; private int currentSubSequenceNumber; private String masterName; 1.14 +1 -2 xml-fop/src/org/apache/fop/fo/pagination/Region.java Index: Region.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Region.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Region.java 6 Nov 2002 15:36:28 -0000 1.13 +++ Region.java 22 Dec 2002 23:37:06 -0000 1.14 @@ -15,7 +15,6 @@ import org.apache.fop.datatypes.FODimension; import org.apache.fop.fo.FObj; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.PropertyList; import org.apache.fop.layout.BorderAndPadding; import org.apache.fop.layout.BackgroundProps; import org.apache.fop.apps.FOPException; 1.15 +2 -3 xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java Index: RegionAfter.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionAfter.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- RegionAfter.java 25 Oct 2002 09:29:43 -0000 1.14 +++ RegionAfter.java 22 Dec 2002 23:37:06 -0000 1.15 @@ -10,11 +10,10 @@ // FOP import org.apache.fop.fo.*; import org.apache.fop.datatypes.FODimension; -import org.apache.fop.apps.FOPException; import org.apache.fop.area.RegionReference; +// Java import java.awt.Rectangle; -import org.xml.sax.Attributes; public class RegionAfter extends RegionBA { 1.4 +2 -2 xml-fop/src/org/apache/fop/fo/pagination/RegionBA.java Index: RegionBA.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBA.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- RegionBA.java 25 Oct 2002 09:29:43 -0000 1.3 +++ RegionBA.java 22 Dec 2002 23:37:06 -0000 1.4 @@ -9,9 +9,9 @@ // FOP import org.apache.fop.fo.*; -import org.apache.fop.apps.FOPException; import org.apache.fop.fo.properties.Precedence; +// Java import java.awt.Rectangle; public abstract class RegionBA extends RegionBASE { 1.3 +1 -3 xml-fop/src/org/apache/fop/fo/pagination/RegionBASE.java Index: RegionBASE.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBASE.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RegionBASE.java 25 Oct 2002 09:29:43 -0000 1.2 +++ RegionBASE.java 22 Dec 2002 23:37:06 -0000 1.3 @@ -9,8 +9,6 @@ // FOP import org.apache.fop.fo.FONode; -import org.apache.fop.fo.PropertyList; -import org.apache.fop.apps.FOPException; /** * Base class for Before, After, Start and End regions (BASE). 1.16 +2 -4 xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java Index: RegionBefore.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBefore.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- RegionBefore.java 25 Oct 2002 09:29:43 -0000 1.15 +++ RegionBefore.java 22 Dec 2002 23:37:06 -0000 1.16 @@ -8,14 +8,12 @@ package org.apache.fop.fo.pagination; // FOP - import org.apache.fop.datatypes.FODimension; import org.apache.fop.fo.*; -import org.apache.fop.apps.FOPException; import org.apache.fop.area.RegionReference; +// Java import java.awt.Rectangle; -import org.xml.sax.Attributes; public class RegionBefore extends RegionBA { 1.20 +2 -3 xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java Index: RegionBody.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionBody.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- RegionBody.java 6 Nov 2002 15:36:28 -0000 1.19 +++ RegionBody.java 22 Dec 2002 23:37:06 -0000 1.20 @@ -7,11 +7,11 @@ package org.apache.fop.fo.pagination; +// Java import java.awt.Rectangle; import java.awt.geom.Rectangle2D; // FOP - import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; import org.apache.fop.fo.PropertyList; @@ -19,7 +19,6 @@ import org.apache.fop.fo.properties.Overflow; import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.FODimension; -import org.apache.fop.apps.FOPException; import org.apache.fop.area.RegionReference; import org.apache.fop.area.BodyRegion; import org.apache.fop.layout.MarginProps; 1.9 +2 -2 xml-fop/src/org/apache/fop/fo/pagination/RegionEnd.java Index: RegionEnd.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionEnd.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RegionEnd.java 25 Oct 2002 09:29:43 -0000 1.8 +++ RegionEnd.java 22 Dec 2002 23:37:06 -0000 1.9 @@ -7,12 +7,12 @@ package org.apache.fop.fo.pagination; +// Java import java.awt.Rectangle; // FOP import org.apache.fop.fo.*; import org.apache.fop.datatypes.FODimension; -import org.apache.fop.apps.FOPException; import org.apache.fop.area.RegionReference; 1.3 +3 -3 xml-fop/src/org/apache/fop/fo/pagination/RegionSE.java Index: RegionSE.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionSE.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RegionSE.java 25 Oct 2002 09:29:43 -0000 1.2 +++ RegionSE.java 22 Dec 2002 23:37:06 -0000 1.3 @@ -7,10 +7,10 @@ package org.apache.fop.fo.pagination; - +// FOP import org.apache.fop.fo.*; -import org.apache.fop.apps.FOPException; +// Java import java.awt.Rectangle; public abstract class RegionSE extends RegionBASE { 1.9 +2 -3 xml-fop/src/org/apache/fop/fo/pagination/RegionStart.java Index: RegionStart.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/RegionStart.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RegionStart.java 25 Oct 2002 09:29:43 -0000 1.8 +++ RegionStart.java 22 Dec 2002 23:37:06 -0000 1.9 @@ -7,13 +7,12 @@ package org.apache.fop.fo.pagination; +// Java import java.awt.Rectangle; - // FOP import org.apache.fop.fo.*; import org.apache.fop.datatypes.FODimension; -import org.apache.fop.apps.FOPException; import org.apache.fop.area.RegionReference; public class RegionStart extends RegionSE { 1.22 +6 -7 xml-fop/src/org/apache/fop/fo/pagination/Root.java Index: Root.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Root.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- Root.java 20 Jun 2002 09:14:15 -0000 1.21 +++ Root.java 22 Dec 2002 23:37:06 -0000 1.22 @@ -8,13 +8,12 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.*; -import org.apache.fop.fo.flow.*; -import org.apache.fop.fo.properties.*; -import org.apache.fop.apps.FOPException; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.FONode; // Java import java.util.ArrayList; +import java.util.List; /** * The fo:root formatting object. Contains page masters, page-sequences. @@ -22,7 +21,7 @@ public class Root extends FObj { LayoutMasterSet layoutMasterSet; - ArrayList pageSequences; + List pageSequences; /** * keeps count of page number from over PageSequence instances @@ -56,7 +55,7 @@ /** * Some properties, such as 'force-page-count', require a * page-sequence to know about some properties of the next. - * @returns succeeding PageSequence; null if none + * @return succeeding PageSequence; null if none */ public PageSequence getSucceedingPageSequence(PageSequence current) { int currentIndex = pageSequences.indexOf(current); 1.27 +5 -5 xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java Index: SimplePageMaster.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- SimplePageMaster.java 17 Aug 2002 23:51:07 -0000 1.26 +++ SimplePageMaster.java 22 Dec 2002 23:37:06 -0000 1.27 @@ -9,7 +9,6 @@ // FOP import org.apache.fop.fo.*; -import org.apache.fop.fo.properties.*; import org.apache.fop.area.CTM; import org.apache.fop.datatypes.FODimension; import org.apache.fop.area.PageViewport; @@ -21,9 +20,10 @@ import org.apache.fop.apps.FOPException; import java.awt.Rectangle; -import java.awt.geom.Rectangle2D; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; + import org.xml.sax.Attributes; /** @@ -35,7 +35,7 @@ /** * Page regions (regionClass, Region) */ - private HashMap _regions; + private Map _regions; PageMaster pageMaster; String masterName; @@ -168,7 +168,7 @@ return (Region)_regions.get(regionClass); } - protected HashMap getRegions() { + protected Map getRegions() { return _regions; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]