diff options
| author | Glen Mazza <gmazza@apache.org> | 2005-03-11 07:23:43 +0000 |
|---|---|---|
| committer | Glen Mazza <gmazza@apache.org> | 2005-03-11 07:23:43 +0000 |
| commit | 61ccdc197b8e27c824aa09ed766f54430ef13cd4 (patch) | |
| tree | 152acc6e1182fb28333e58ca4fec1524b40c84b8 /src/java/org/apache/fop/render | |
| parent | b1e947efe8ac8299a586a1a5d49faccbd352cb39 (diff) | |
| download | xmlgraphics-fop-61ccdc197b8e27c824aa09ed766f54430ef13cd4.tar.gz xmlgraphics-fop-61ccdc197b8e27c824aa09ed766f54430ef13cd4.zip | |
1.) More commenting, some simplifications in the Area classes and PSLM.
2.) Renamed Area.Flow to NormalFlow, uglier but more in conformance with the Recommendation (normal-flow-reference-area) and more specific/easier to understand.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198477 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render')
| -rw-r--r-- | src/java/org/apache/fop/render/AbstractRenderer.java | 6 | ||||
| -rw-r--r-- | src/java/org/apache/fop/render/xml/XMLRenderer.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java index ab017e007..2492ab129 100644 --- a/src/java/org/apache/fop/render/AbstractRenderer.java +++ b/src/java/org/apache/fop/render/AbstractRenderer.java @@ -37,7 +37,7 @@ import org.apache.fop.area.Block; import org.apache.fop.area.BlockViewport; import org.apache.fop.area.BodyRegion; import org.apache.fop.area.CTM; -import org.apache.fop.area.Flow; +import org.apache.fop.area.NormalFlow; import org.apache.fop.area.Footnote; import org.apache.fop.area.LineArea; import org.apache.fop.area.MainReference; @@ -380,7 +380,7 @@ public abstract class AbstractRenderer - (span.getColumnCount() - 1) * mr.getColumnGap()) / span.getColumnCount() + mr.getColumnGap(); for (int c = 0; c < span.getColumnCount(); c++) { - Flow flow = (Flow) span.getFlow(c); + NormalFlow flow = (NormalFlow) span.getNormalFlow(c); renderFlow(flow); currentIPPosition += offset; @@ -395,7 +395,7 @@ public abstract class AbstractRenderer * * @param flow The flow reference area */ - protected void renderFlow(Flow flow) { + protected void renderFlow(NormalFlow flow) { // the normal flow reference area contains stacked blocks List blocks = flow.getChildAreas(); if (blocks != null) { diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java index 4a2e54cf1..8fccab4bd 100644 --- a/src/java/org/apache/fop/render/xml/XMLRenderer.java +++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java @@ -47,7 +47,7 @@ import org.apache.fop.area.BeforeFloat; import org.apache.fop.area.Block; import org.apache.fop.area.BlockViewport; import org.apache.fop.area.BodyRegion; -import org.apache.fop.area.Flow; +import org.apache.fop.area.NormalFlow; import org.apache.fop.area.Footnote; import org.apache.fop.area.LineArea; import org.apache.fop.area.MainReference; @@ -445,7 +445,7 @@ public class XMLRenderer extends AbstractRenderer { addTraitAttributes(span); startElement("span", atts); for (int c = 0; c < span.getColumnCount(); c++) { - Flow flow = (Flow) span.getFlow(c); + NormalFlow flow = (NormalFlow) span.getNormalFlow(c); renderFlow(flow); } @@ -457,7 +457,7 @@ public class XMLRenderer extends AbstractRenderer { /** * @see org.apache.fop.render.AbstractRenderer#renderFlow(Flow) */ - protected void renderFlow(Flow flow) { + protected void renderFlow(NormalFlow flow) { // the normal flow reference area contains stacked blocks atts.clear(); addAreaAttributes(flow); |