Author: acumiskey
Date: Thu Feb 14 02:12:48 2008
New Revision: 627698
URL: http://svn.apache.org/viewvc?rev=627698&view=rev
Log:
When I first saw this it surprised me, it seems to have been here for quite
some time.
The code block directly following this if/else condition was identical so I
removed the copy/paste duplication and refactored it.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=627698&r1=627697&r2=627698&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
Thu Feb 14 02:12:48 2008
@@ -171,15 +171,7 @@
return this.currentPageViewport;
}
- /**
- * Prepare a page for rendering. This is called if the renderer supports
- * out of order rendering. The renderer should prepare the page so that a
- * page further on in the set of pages can be rendered. The body of the
- * page should not be rendered. The page will be rendered at a later time
- * by the call to render page.
- *
- * [EMAIL PROTECTED]
- */
+ /** [EMAIL PROTECTED] */
public void preparePage(PageViewport page) { }
/**
@@ -562,31 +554,20 @@
int saveIP = currentIPPosition;
int saveBP = currentBPPosition;
- if (block.getPositioning() == Block.ABSOLUTE) {
- currentIPPosition += block.getXOffset();
- currentBPPosition += block.getYOffset();
- currentBPPosition += block.getSpaceBefore();
+ currentIPPosition += block.getXOffset();
+ currentBPPosition += block.getYOffset();
+ currentBPPosition += block.getSpaceBefore();
- handleBlockTraits(block);
+ handleBlockTraits(block);
- if (children != null) {
- renderBlocks(block, children);
- }
+ if (children != null) {
+ renderBlocks(block, children);
+ }
+ if (block.getPositioning() == Block.ABSOLUTE) {
// absolute blocks do not effect the layout
currentBPPosition = saveBP;
} else {
- // relative blocks are offset
- currentIPPosition += block.getXOffset();
- currentBPPosition += block.getYOffset();
- currentBPPosition += block.getSpaceBefore();
-
- handleBlockTraits(block);
-
- if (children != null) {
- renderBlocks(block, children);
- }
-
// stacked and relative blocks effect stacking
currentIPPosition = saveIP;
currentBPPosition = saveBP + block.getAllocBPD();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
