gmazza 2004/05/09 13:45:15 Modified: src/java/org/apache/fop/fo/pagination LayoutMasterSet.java Region.java RegionAfter.java RegionBA.java RegionBASE.java RegionBefore.java RegionBody.java RegionEnd.java RegionSE.java RegionStart.java SimplePageMaster.java src/java/org/apache/fop/layoutmgr PageLayoutManager.java src/java/org/apache/fop/render/rtf PageAttributesConverter.java Log: String->int conversion and a few other simplifications to fo.Region* classes. Revision Changes Path 1.6 +13 -12 xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java Index: LayoutMasterSet.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- LayoutMasterSet.java 27 Feb 2004 17:45:13 -0000 1.5 +++ LayoutMasterSet.java 9 May 2004 20:45:15 -0000 1.6 @@ -140,11 +140,12 @@ } /** - * Section 7.33.15: check to see that if a region-name is a - * duplicate, that it maps to the same region-class. + * Section 7.25.7: check to see that if a region-name is a + * duplicate, that it maps to the same fo region-class. * @throws FOPException if there's a name duplication */ public void checkRegionNames() throws FOPException { + // (user-entered) region-name to default region map. Map allRegions = new java.util.HashMap(); for (Iterator spm = simplePageMasters.values().iterator(); spm.hasNext();) { @@ -153,22 +154,22 @@ Map spmRegions = simplePageMaster.getRegions(); for (Iterator e = spmRegions.values().iterator(); e.hasNext();) { - Region region = (Region)e.next(); + Region region = (Region) e.next(); if (allRegions.containsKey(region.getRegionName())) { - String localClass = - (String)allRegions.get(region.getRegionName()); - if (!localClass.equals(region.getRegionClass())) { - throw new FOPException("Duplicate region-names (" + String defaultRegionName = + (String) allRegions.get(region.getRegionName()); + if (!defaultRegionName.equals(region.getDefaultRegionName())) { + throw new FOPException("Region-name (" + region.getRegionName() - + ") must map " - + "to the same region-class (" - + localClass + "!=" - + region.getRegionClass() + + ") is being mapped to multiple " + + "region-classes (" + + defaultRegionName + " and " + + region.getDefaultRegionName() + ")"); } } allRegions.put(region.getRegionName(), - region.getRegionClass()); + region.getDefaultRegionName()); } } } 1.18 +5 -21 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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- Region.java 27 Feb 2004 17:45:13 -0000 1.17 +++ Region.java 9 May 2004 20:45:15 -0000 1.18 @@ -32,17 +32,6 @@ */ public abstract class Region extends FObj { - /** Key for before regions */ - public static final String BEFORE = "before"; - /** Key for start regions */ - public static final String START = "start"; - /** Key for end regions */ - public static final String END = "end"; - /** Key for after regions */ - public static final String AFTER = "after"; - /** Key for body regions */ - public static final String BODY = "body"; - /* The following codes correspond to those found in area/RegionReference */ /** Integer Code for before regions */ public static final int BEFORE_CODE = 0; @@ -56,6 +45,7 @@ public static final int AFTER_CODE = 4; private SimplePageMaster layoutMaster; + private int regionId = -1; private String regionName; /** Holds the overflow attribute */ @@ -66,8 +56,9 @@ /** * @see org.apache.fop.fo.FONode#FONode(FONode) */ - protected Region(FONode parent) { + protected Region(FONode parent, int id) { super(parent); + regionId = id; } /** @@ -115,13 +106,6 @@ */ protected abstract String getDefaultRegionName(); - - /** - * Returns the region class name. - * @return the region class name - */ - public abstract String getRegionClass(); - /** * Returns the region class code. * @return the region class code @@ -179,9 +163,9 @@ * @param regionClass the class of the requested region * @return the requested region */ - protected Region getSiblingRegion(String regionClass) { + protected Region getSiblingRegion(int regionId) { // Ask parent for region - return layoutMaster.getRegion(regionClass); + return layoutMaster.getRegion(regionId); } /** 1.9 +1 -8 xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java Index: RegionAfter.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RegionAfter.java 27 Feb 2004 17:45:13 -0000 1.8 +++ RegionAfter.java 9 May 2004 20:45:15 -0000 1.9 @@ -35,7 +35,7 @@ * @see org.apache.fop.fo.FONode#FONode(FONode) */ public RegionAfter(FONode parent) { - super(parent); + super(parent, Region.AFTER_CODE); } /** @@ -60,13 +60,6 @@ */ protected String getDefaultRegionName() { return "xsl-region-after"; - } - - /** - * @see org.apache.fop.fo.pagination.Region#getRegionClass() - */ - public String getRegionClass() { - return Region.AFTER; } /** 1.8 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java Index: RegionBA.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- RegionBA.java 27 Feb 2004 17:45:13 -0000 1.7 +++ RegionBA.java 9 May 2004 20:45:15 -0000 1.8 @@ -35,8 +35,8 @@ /** * @see org.apache.fop.fo.FONode#FONode(FONode) */ - protected RegionBA(FONode parent) { - super(parent); + protected RegionBA(FONode parent, int regionId) { + super(parent, regionId); } /** 1.7 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBASE.java Index: RegionBASE.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBASE.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- RegionBASE.java 27 Feb 2004 17:45:13 -0000 1.6 +++ RegionBASE.java 9 May 2004 20:45:15 -0000 1.7 @@ -32,8 +32,8 @@ /** * @see org.apache.fop.fo.FONode#FONode(FONode) */ - protected RegionBASE(FONode parent) { - super(parent); + protected RegionBASE(FONode parent, int regionId) { + super(parent, regionId); } /** 1.9 +1 -8 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java Index: RegionBefore.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RegionBefore.java 27 Feb 2004 17:45:13 -0000 1.8 +++ RegionBefore.java 9 May 2004 20:45:15 -0000 1.9 @@ -35,7 +35,7 @@ * @see org.apache.fop.fo.FONode#FONode(FONode) */ public RegionBefore(FONode parent) { - super(parent); + super(parent, Region.BEFORE_CODE); } /** @@ -43,13 +43,6 @@ */ protected String getDefaultRegionName() { return "xsl-region-before"; - } - - /** - * @see org.apache.fop.fo.pagination.Region#getRegionClass() - */ - public String getRegionClass() { - return Region.BEFORE; } /** 1.18 +1 -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.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- RegionBody.java 27 Feb 2004 17:45:13 -0000 1.17 +++ RegionBody.java 9 May 2004 20:45:15 -0000 1.18 @@ -41,7 +41,7 @@ * @see org.apache.fop.fo.FONode#FONode(FONode) */ public RegionBody(FONode parent) { - super(parent); + super(parent, Region.BODY_CODE); } /** @@ -93,13 +93,6 @@ */ protected String getDefaultRegionName() { return "xsl-region-body"; - } - - /** - * @see org.apache.fop.fo.pagination.Region#getRegionClass() - */ - public String getRegionClass() { - return Region.BODY; } /** 1.9 +1 -8 xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java Index: RegionEnd.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RegionEnd.java 27 Feb 2004 17:45:13 -0000 1.8 +++ RegionEnd.java 9 May 2004 20:45:15 -0000 1.9 @@ -36,7 +36,7 @@ * @see org.apache.fop.fo.FONode#FONode(FONode) */ public RegionEnd(FONode parent) { - super(parent); + super(parent, Region.END_CODE); } /** @@ -61,13 +61,6 @@ */ protected String getDefaultRegionName() { return "xsl-region-end"; - } - - /** - * @see org.apache.fop.fo.pagination.Region#getRegionClass() - */ - public String getRegionClass() { - return Region.END; } /** 1.6 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java Index: RegionSE.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RegionSE.java 27 Feb 2004 17:45:13 -0000 1.5 +++ RegionSE.java 9 May 2004 20:45:15 -0000 1.6 @@ -33,8 +33,8 @@ /** * @see org.apache.fop.fo.FONode#FONode(FONode) */ - protected RegionSE(FONode parent) { - super(parent); + protected RegionSE(FONode parent, int regionId) { + super(parent, regionId); } /** 1.9 +1 -8 xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java Index: RegionStart.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- RegionStart.java 27 Feb 2004 17:45:13 -0000 1.8 +++ RegionStart.java 9 May 2004 20:45:15 -0000 1.9 @@ -35,7 +35,7 @@ * @see org.apache.fop.fo.FONode#FONode(FONode) */ public RegionStart(FONode parent) { - super(parent); + super(parent, Region.START_CODE); } /** @@ -60,13 +60,6 @@ */ protected String getDefaultRegionName() { return "xsl-region-start"; - } - - /** - * @see org.apache.fop.fo.pagination.Region#getRegionClass() - */ - public String getRegionClass() { - return Region.START; } /** 1.15 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Index: SimplePageMaster.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- SimplePageMaster.java 27 Feb 2004 17:45:13 -0000 1.14 +++ SimplePageMaster.java 9 May 2004 20:45:15 -0000 1.15 @@ -108,9 +108,9 @@ * @param region region to add */ protected void addRegion(Region region) { - String key = region.getRegionClass(); + String key = String.valueOf(region.getRegionClassCode()); if (regions.containsKey(key)) { - getLogger().error("Only one region of class " + key + getLogger().error("Only one region of class " + region.getRegionName() + " allowed within a simple-page-master. The duplicate" + " region (" + region.getName() + ") is ignored."); } else { @@ -123,8 +123,8 @@ * @param regionClass region class to lookup * @return the region, null if it doesn't exist */ - public Region getRegion(String regionClass) { - return (Region)regions.get(regionClass); + public Region getRegion(int regionId) { + return (Region) regions.get(String.valueOf(regionId)); } /** 1.34 +5 -5 xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java Index: PageLayoutManager.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- PageLayoutManager.java 21 Mar 2004 12:03:08 -0000 1.33 +++ PageLayoutManager.java 9 May 2004 20:45:15 -0000 1.34 @@ -489,13 +489,13 @@ } // Layout static content into the regions // Need help from pageseq for this - layoutStaticContent(currentSimplePageMaster.getRegion(Region.BEFORE), + layoutStaticContent(currentSimplePageMaster.getRegion(Region.BEFORE_CODE), Region.BEFORE_CODE); - layoutStaticContent(currentSimplePageMaster.getRegion(Region.AFTER), + layoutStaticContent(currentSimplePageMaster.getRegion(Region.AFTER_CODE), Region.AFTER_CODE); - layoutStaticContent(currentSimplePageMaster.getRegion(Region.START), + layoutStaticContent(currentSimplePageMaster.getRegion(Region.START_CODE), Region.START_CODE); - layoutStaticContent(currentSimplePageMaster.getRegion(Region.END), + layoutStaticContent(currentSimplePageMaster.getRegion(Region.END_CODE), Region.END_CODE); // Queue for ID resolution and rendering areaTree.addPage(curPage); @@ -706,7 +706,7 @@ private PageViewport createPage(boolean bIsBlank, boolean bIsLast) throws FOPException { currentSimplePageMaster = getSimplePageMasterToUse(bIsBlank); - Region body = currentSimplePageMaster.getRegion(Region.BODY); + Region body = currentSimplePageMaster.getRegion(Region.BODY_CODE); if (!pageSequence.getMainFlow().getFlowName().equals(body.getRegionName())) { throw new FOPException("Flow '" + pageSequence.getMainFlow().getFlowName() + "' does not map to the region-body in page-master '" 1.8 +4 -4 xml-fop/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java Index: PageAttributesConverter.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- PageAttributesConverter.java 31 Mar 2004 10:55:07 -0000 1.7 +++ PageAttributesConverter.java 9 May 2004 20:45:15 -0000 1.8 @@ -55,9 +55,9 @@ Property p = null; Float f = null; - Region before = pagemaster.getRegion("before"); - Region body = pagemaster.getRegion("body"); - Region after = pagemaster.getRegion("after"); + Region before = pagemaster.getRegion(Region.BEFORE_CODE); + Region body = pagemaster.getRegion(Region.BODY_CODE); + Region after = pagemaster.getRegion(Region.AFTER_CODE); //page attributes props = pagemaster.propertyList;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]