gmazza 2004/08/29 13:58:20
Modified: src/java/org/apache/fop/area BodyRegion.java Page.java
RegionReference.java
src/java/org/apache/fop/fo/pagination PageSequence.java
Region.java RegionAfter.java RegionBA.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 AbstractRenderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/rtf
PageAttributesConverter.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Removed the redundant Region Class Codes in favor of the FO constant
identifiers.
Revision Changes Path
1.6 +2 -2 xml-fop/src/java/org/apache/fop/area/BodyRegion.java
Index: BodyRegion.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/BodyRegion.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BodyRegion.java 27 May 2004 10:52:33 -0000 1.5
+++ BodyRegion.java 29 Aug 2004 20:58:19 -0000 1.6
@@ -18,7 +18,7 @@
package org.apache.fop.area;
-import org.apache.fop.fo.pagination.Region;
+import org.apache.fop.fo.Constants;
/**
* The body region area.
@@ -40,7 +40,7 @@
* This sets the region reference area class to BODY.
*/
public BodyRegion() {
- super(Region.BODY_CODE);
+ super(Constants.FO_REGION_BODY);
}
/**
1.6 +11 -11 xml-fop/src/java/org/apache/fop/area/Page.java
Index: Page.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Page.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Page.java 27 May 2004 10:52:33 -0000 1.5
+++ Page.java 29 Aug 2004 20:58:19 -0000 1.6
@@ -21,7 +21,7 @@
import java.io.Serializable;
import java.util.Map;
-import org.apache.fop.fo.pagination.Region;
+import org.apache.fop.fo.Constants;
/**
* The page.
@@ -52,15 +52,15 @@
* @param port the region viewport to set
*/
public void setRegionViewport(int areaclass, RegionViewport port) {
- if (areaclass == Region.BEFORE_CODE) {
+ if (areaclass == Constants.FO_REGION_BEFORE) {
regionBefore = port;
- } else if (areaclass == Region.START_CODE) {
+ } else if (areaclass == Constants.FO_REGION_START) {
regionStart = port;
- } else if (areaclass == Region.BODY_CODE) {
+ } else if (areaclass == Constants.FO_REGION_BODY) {
regionBody = port;
- } else if (areaclass == Region.END_CODE) {
+ } else if (areaclass == Constants.FO_REGION_END) {
regionEnd = port;
- } else if (areaclass == Region.AFTER_CODE) {
+ } else if (areaclass == Constants.FO_REGION_AFTER) {
regionAfter = port;
}
}
@@ -72,15 +72,15 @@
* @return the region viewport or null if none
*/
public RegionViewport getRegionViewport(int areaclass) {
- if (areaclass == Region.BEFORE_CODE) {
+ if (areaclass == Constants.FO_REGION_BEFORE) {
return regionBefore;
- } else if (areaclass == Region.START_CODE) {
+ } else if (areaclass == Constants.FO_REGION_START) {
return regionStart;
- } else if (areaclass == Region.BODY_CODE) {
+ } else if (areaclass == Constants.FO_REGION_BODY) {
return regionBody;
- } else if (areaclass == Region.END_CODE) {
+ } else if (areaclass == Constants.FO_REGION_END) {
return regionEnd;
- } else if (areaclass == Region.AFTER_CODE) {
+ } else if (areaclass == Constants.FO_REGION_AFTER) {
return regionAfter;
}
return null;
1.5 +2 -2 xml-fop/src/java/org/apache/fop/area/RegionReference.java
Index: RegionReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RegionReference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RegionReference.java 27 Feb 2004 17:41:26 -0000 1.4
+++ RegionReference.java 29 Aug 2004 20:58:19 -0000 1.5
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.fop.fo.pagination.Region;
+import org.apache.fop.fo.Constants;
/**
* This is a region reference area for the page regions.
@@ -29,7 +29,7 @@
* so the page master can make copies from the original page and regions.
*/
public class RegionReference extends Area implements Cloneable {
- private int regionClass = Region.BEFORE_CODE;
+ private int regionClass = Constants.FO_REGION_BEFORE;
private CTM ctm;
// the list of block areas from the static flow
private List blocks = new ArrayList();
1.40 +4 -1 xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- PageSequence.java 27 Aug 2004 06:02:03 -0000 1.39
+++ PageSequence.java 29 Aug 2004 20:58:19 -0000 1.40
@@ -555,7 +555,7 @@
// SimplePageMaster spm =
// this.layoutMasterSet.getSimplePageMaster(masterName);
-// Region region = spm.getRegion(Region.BODY);
+// Region region = spm.getRegion(FO_REGION_BODY);
// Flow flow = (Flow)flowMap.get(region.getRegionName());
@@ -741,6 +741,9 @@
return root;
}
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:page-sequence";
}
1.29 +0 -18 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Region.java 25 Aug 2004 05:03:06 -0000 1.28
+++ Region.java 29 Aug 2004 20:58:19 -0000 1.29
@@ -35,18 +35,6 @@
*/
public abstract class Region extends FObj {
- /* The following codes correspond to those found in area/RegionReference */
- /** Integer Code for before regions */
- public static final int BEFORE_CODE = 0;
- /** Integer Code for start regions */
- public static final int START_CODE = 1;
- /** Integer Code for body regions */
- public static final int BODY_CODE = 2;
- /** Integer Code for end regions */
- public static final int END_CODE = 3;
- /** Integer Code for after regions */
- public static final int AFTER_CODE = 4;
-
private SimplePageMaster layoutMaster;
private int regionId = -1;
private String regionName;
@@ -119,12 +107,6 @@
* @return the default region name
*/
protected abstract String getDefaultRegionName();
-
- /**
- * Returns the region class code.
- * @return the region class code
- */
- public abstract int getRegionClassCode();
/**
* Returns the name of this region.
1.14 +2 -6 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RegionAfter.java 8 Aug 2004 18:39:25 -0000 1.13
+++ RegionAfter.java 29 Aug 2004 20:58:19 -0000 1.14
@@ -34,7 +34,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionAfter(FONode parent) {
- super(parent, Region.AFTER_CODE);
+ super(parent, FO_REGION_AFTER);
}
/**
@@ -62,12 +62,8 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
+ * @see org.apache.fop.fo.FObj#getName()
*/
- public int getRegionClassCode() {
- return Region.AFTER_CODE;
- }
-
public String getName() {
return "fo:region-after";
}
1.17 +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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RegionBA.java 29 Aug 2004 20:17:35 -0000 1.16
+++ RegionBA.java 29 Aug 2004 20:58:19 -0000 1.17
@@ -69,12 +69,12 @@
*/
protected void adjustIPD(Rectangle vpRefRect, int wm) {
int offset = 0;
- Region start = getSiblingRegion(Region.START);
+ Region start = getSiblingRegion(FO_REGION_START);
if (start != null) {
offset = start.getExtent();
vpRefRect.translate(offset, 0);
}
- Region end = getSiblingRegion(Region.END);
+ Region end = getSiblingRegion(FO_REGION_END);
if (end != null) {
offset += end.getExtent();
}
1.15 +4 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RegionBefore.java 8 Aug 2004 18:39:25 -0000 1.14
+++ RegionBefore.java 29 Aug 2004 20:58:19 -0000 1.15
@@ -34,7 +34,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionBefore(FONode parent) {
- super(parent, Region.BEFORE_CODE);
+ super(parent, FO_REGION_BEFORE);
}
/**
@@ -45,13 +45,6 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
- */
- public int getRegionClassCode() {
- return Region.BEFORE_CODE;
- }
-
- /**
* @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension)
*/
public Rectangle getViewportRectangle (FODimension reldims) {
@@ -73,6 +66,9 @@
return vpRect;
}
+ /**
+ * @see org.apache.fop.fo.FObj#getName()
+ */
public String getName() {
return "fo:region-before";
}
1.27 +2 -6 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- RegionBody.java 8 Aug 2004 18:39:25 -0000 1.26
+++ RegionBody.java 29 Aug 2004 20:58:19 -0000 1.27
@@ -45,7 +45,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionBody(FONode parent) {
- super(parent, Region.BODY_CODE);
+ super(parent, FO_REGION_BODY);
}
/**
@@ -100,12 +100,8 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
+ * @see org.apache.fop.fo.FObj#getName()
*/
- public int getRegionClassCode() {
- return Region.BODY_CODE;
- }
-
public String getName() {
return "fo:region-body";
}
1.14 +2 -6 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RegionEnd.java 8 Aug 2004 18:39:25 -0000 1.13
+++ RegionEnd.java 29 Aug 2004 20:58:19 -0000 1.14
@@ -35,7 +35,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionEnd(FONode parent) {
- super(parent, Region.END_CODE);
+ super(parent, FO_REGION_END);
}
/**
@@ -63,12 +63,8 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
+ * @see org.apache.fop.fo.FObj#getName()
*/
- public int getRegionClassCode() {
- return Region.END_CODE;
- }
-
public String getName() {
return "fo:region-end";
}
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RegionSE.java 29 Aug 2004 20:17:35 -0000 1.11
+++ RegionSE.java 29 Aug 2004 20:58:19 -0000 1.12
@@ -58,12 +58,12 @@
*/
protected void adjustIPD(Rectangle vpRefRect, int wm) {
int offset = 0;
- Region before = getSiblingRegion(Region.BEFORE);
+ Region before = getSiblingRegion(FO_REGION_BEFORE);
if (before != null && before.getPrecedence()) {
offset = before.getExtent();
vpRefRect.translate(0, offset);
}
- Region after = getSiblingRegion(Region.AFTER);
+ Region after = getSiblingRegion(FO_REGION_AFTER);
if (after != null && after.getPrecedence()) {
offset += after.getExtent();
}
1.14 +2 -6 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- RegionStart.java 8 Aug 2004 18:39:25 -0000 1.13
+++ RegionStart.java 29 Aug 2004 20:58:19 -0000 1.14
@@ -34,7 +34,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionStart(FONode parent) {
- super(parent, Region.START_CODE);
+ super(parent, FO_REGION_START);
}
/**
@@ -62,12 +62,8 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getRegionClassCode()
+ * @see org.apache.fop.fo.FObj#getName()
*/
- public int getRegionClassCode() {
- return Region.START_CODE;
- }
-
public String getName() {
return "fo:region-start";
}
1.24 +1 -1
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SimplePageMaster.java 25 Aug 2004 05:03:06 -0000 1.23
+++ SimplePageMaster.java 29 Aug 2004 20:58:19 -0000 1.24
@@ -176,7 +176,7 @@
* @param region region to add
*/
protected void addRegion(Region region) {
- String key = String.valueOf(region.getRegionClassCode());
+ String key = String.valueOf(region.getNameId());
regions.put(key, region);
}
1.45 +15 -15 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- PageLayoutManager.java 29 Aug 2004 20:17:35 -0000 1.44
+++ PageLayoutManager.java 29 Aug 2004 20:58:20 -0000 1.45
@@ -442,7 +442,7 @@
curPage.setPageNumber(getCurrentPageNumber());
RegionViewport rv = curPage.getPage().getRegionViewport(
- Region.BODY_CODE);
+ FO_REGION_BODY);
curBody = (BodyRegion) rv.getRegion();
flowBPD = (int) curBody.getBPD() -
rv.getBorderAndPaddingWidthBefore() -
rv.getBorderAndPaddingWidthAfter();
@@ -490,14 +490,14 @@
}
// Layout static content into the regions
// Need help from pageseq for this
- layoutStaticContent(currentSimplePageMaster.getRegion(Region.BEFORE_CODE),
- Region.BEFORE_CODE);
- layoutStaticContent(currentSimplePageMaster.getRegion(Region.AFTER_CODE),
- Region.AFTER_CODE);
- layoutStaticContent(currentSimplePageMaster.getRegion(Region.START_CODE),
- Region.START_CODE);
- layoutStaticContent(currentSimplePageMaster.getRegion(Region.END_CODE),
- Region.END_CODE);
+ layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_BEFORE),
+ FO_REGION_BEFORE);
+ layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_AFTER),
+ FO_REGION_AFTER);
+ layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_START),
+ FO_REGION_START);
+ layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_END),
+ FO_REGION_END);
// Queue for ID resolution and rendering
areaTreeHandler.addPage(curPage);
curPage = null;
@@ -682,7 +682,7 @@
curSpan = new Span(numCols);
// get Width or Height as IPD for span
- RegionViewport rv = curPage.getPage().getRegionViewport(Region.BODY_CODE);
+ RegionViewport rv = curPage.getPage().getRegionViewport(FO_REGION_BODY);
int ipdWidth = (int) rv.getRegion().getIPD() -
rv.getBorderAndPaddingWidthStart() - rv.getBorderAndPaddingWidthEnd();
@@ -708,7 +708,7 @@
private PageViewport createPage(boolean bIsBlank, boolean bIsLast)
throws FOPException {
currentSimplePageMaster = getSimplePageMasterToUse(bIsBlank);
- Region body = currentSimplePageMaster.getRegion(Region.BODY_CODE);
+ Region body = currentSimplePageMaster.getRegion(FO_REGION_BODY);
if (!pageSequence.getMainFlow().getFlowName().equals(body.getRegionName()))
{
throw new FOPException("Flow '" + pageSequence.getMainFlow().getFlowName()
+ "' does not map to the region-body in
page-master '"
@@ -777,13 +777,13 @@
r.setLayoutDimension(PercentBase.BLOCK_IPD, pageWidth);
r.setLayoutDimension(PercentBase.BLOCK_BPD, pageHeight);
RegionViewport rvp = makeRegionViewport(r, reldims, pageCTM);
- if (r.getRegionClassCode() == Region.BODY_CODE) {
+ if (r.getNameId() == FO_REGION_BODY) {
rvp.setRegion(makeRegionBodyReferenceArea(r, rvp.getViewArea()));
} else {
rvp.setRegion(makeRegionReferenceArea(r, rvp.getViewArea()));
}
- page.setRegionViewport(r.getRegionClassCode(), rvp);
- if (r.getRegionClassCode() == Region.BODY_CODE) {
+ page.setRegionViewport(r.getNameId(), rvp);
+ if (r.getNameId() == FO_REGION_BODY) {
bHasBody = true;
}
}
@@ -857,7 +857,7 @@
*/
private RegionReference makeRegionReferenceArea(Region r,
Rectangle2D absRegVPRect) {
- RegionReference rr = new RegionReference(r.getRegionClassCode());
+ RegionReference rr = new RegionReference(r.getNameId());
setRegionPosition(r, rr, absRegVPRect);
return rr;
}
1.32 +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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- AbstractRenderer.java 9 Jul 2004 17:27:12 -0000 1.31
+++ AbstractRenderer.java 29 Aug 2004 20:58:20 -0000 1.32
@@ -238,15 +238,15 @@
decision is to have fo:region-body on top, hence it is rendered
last here. */
RegionViewport viewport;
- viewport = page.getRegionViewport(Region.BEFORE_CODE);
+ viewport = page.getRegionViewport(FO_REGION_BEFORE);
renderRegionViewport(viewport);
- viewport = page.getRegionViewport(Region.START_CODE);
+ viewport = page.getRegionViewport(FO_REGION_START);
renderRegionViewport(viewport);
- viewport = page.getRegionViewport(Region.END_CODE);
+ viewport = page.getRegionViewport(FO_REGION_END);
renderRegionViewport(viewport);
- viewport = page.getRegionViewport(Region.AFTER_CODE);
+ viewport = page.getRegionViewport(FO_REGION_AFTER);
renderRegionViewport(viewport);
- viewport = page.getRegionViewport(Region.BODY_CODE);
+ viewport = page.getRegionViewport(FO_REGION_BODY);
renderRegionViewport(viewport);
}
@@ -274,7 +274,7 @@
// shouldn't the viewport have the CTM
startVParea(region.getCTM());
// do after starting viewport area
- if (region.getRegionClass() == Region.BODY_CODE) {
+ if (region.getRegionClass() == FO_REGION_BODY) {
renderBodyRegion((BodyRegion) region);
} else {
renderRegion(region);
1.47 +1 -2 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- PDFRenderer.java 9 Jul 2004 17:27:12 -0000 1.46
+++ PDFRenderer.java 29 Aug 2004 20:58:20 -0000 1.47
@@ -517,8 +517,7 @@
float width = (float)(viewArea.getWidth() / 1000f);
float height = (float)(viewArea.getHeight() / 1000f);
- if (region.getRegion().getRegionClass()
- == org.apache.fop.fo.pagination.Region.BODY_CODE) {
+ if (region.getRegion().getRegionClass() == FO_REGION_BODY) {
bpMarginOffset = region.getBorderAndPaddingWidthBefore();
ipMarginOffset = region.getBorderAndPaddingWidthStart();
}
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PageAttributesConverter.java 22 May 2004 21:44:38 -0000 1.9
+++ PageAttributesConverter.java 29 Aug 2004 20:58:20 -0000 1.10
@@ -53,9 +53,9 @@
Property p = null;
Float f = null;
- Region before = pagemaster.getRegion(Region.BEFORE_CODE);
- Region body = pagemaster.getRegion(Region.BODY_CODE);
- Region after = pagemaster.getRegion(Region.AFTER_CODE);
+ Region before = pagemaster.getRegion(Constants.FO_REGION_BEFORE);
+ Region body = pagemaster.getRegion(Constants.FO_REGION_BODY);
+ Region after = pagemaster.getRegion(Constants.FO_REGION_AFTER);
if ((p = pagemaster.getProperty(Constants.PR_PAGE_WIDTH)) != null) {
f = new Float(p.getLength().getValue() / 1000f);
1.25 +5 -5 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XMLRenderer.java 9 Jul 2004 20:05:41 -0000 1.24
+++ XMLRenderer.java 29 Aug 2004 20:58:20 -0000 1.25
@@ -253,23 +253,23 @@
writeStartTag("<regionViewport rect=\""
+ createString(port.getViewArea()) + "\">");
RegionReference region = port.getRegion();
- if (region.getRegionClass() == Region.BEFORE_CODE) {
+ if (region.getRegionClass() == FO_REGION_BEFORE) {
writeStartTag("<regionBefore>");
renderRegion(region);
writeEndTag("</regionBefore>");
- } else if (region.getRegionClass() == Region.START_CODE) {
+ } else if (region.getRegionClass() == FO_REGION_START) {
writeStartTag("<regionStart>");
renderRegion(region);
writeEndTag("</regionStart>");
- } else if (region.getRegionClass() == Region.BODY_CODE) {
+ } else if (region.getRegionClass() == FO_REGION_BODY) {
writeStartTag("<regionBody>");
renderBodyRegion((BodyRegion) region);
writeEndTag("</regionBody>");
- } else if (region.getRegionClass() == Region.END_CODE) {
+ } else if (region.getRegionClass() == FO_REGION_END) {
writeStartTag("<regionEnd>");
renderRegion(region);
writeEndTag("</regionEnd>");
- } else if (region.getRegionClass() == Region.AFTER_CODE) {
+ } else if (region.getRegionClass() == FO_REGION_AFTER) {
writeStartTag("<regionAfter>");
renderRegion(region);
writeEndTag("</regionAfter>");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
