Author: adelmelle
Date: Sun Jan 9 12:11:07 2011
New Revision: 1056923
URL: http://svn.apache.org/viewvc?rev=1056923&view=rev
Log:
Simplify Region.getViewportRectangle(): no reason to pass the SinglePageMaster
as a parameter, as Regions have access to it
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Region.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java?rev=1056923&r1=1056922&r2=1056923&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Sun Jan 9
12:11:07 2011
@@ -123,7 +123,7 @@ public class Page extends AreaTreeObject
for (Iterator regenum = spm.getRegions().values().iterator();
regenum.hasNext();) {
Region r = (Region)regenum.next();
- RegionViewport rvp = makeRegionViewport(r, reldims, pageCTM, spm);
+ RegionViewport rvp = makeRegionViewport(r, reldims, pageCTM);
if (r.getNameId() == Constants.FO_REGION_BODY) {
rr = new BodyRegion((RegionBody) r, rvp);
} else {
@@ -138,7 +138,7 @@ public class Page extends AreaTreeObject
setRegionReferencePosition(rr, r, rvp.getViewArea());
rvp.setRegionReference(rr);
setRegionViewport(r.getNameId(), rvp);
- }
+ }
}
/**
@@ -153,12 +153,10 @@ public class Page extends AreaTreeObject
* @param r the region the viewport is to be created for
* @param reldims relative dimensions
* @param pageCTM page coordinate transformation matrix
- * @param spm the simple-page-master for this page
* @return the new region viewport
*/
- private RegionViewport makeRegionViewport(Region r, FODimension reldims,
CTM pageCTM,
- SimplePageMaster spm) {
- Rectangle2D relRegionRect = r.getViewportRectangle(reldims, spm);
+ private RegionViewport makeRegionViewport(Region r, FODimension reldims,
CTM pageCTM) {
+ Rectangle2D relRegionRect = r.getViewportRectangle(reldims);
Rectangle2D absRegionRect = pageCTM.transform(relRegionRect);
// Get the region viewport rectangle in absolute coords by
// transforming it using the page CTM
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Region.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Region.java?rev=1056923&r1=1056922&r2=1056923&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Region.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/Region.java Sun
Jan 9 12:11:07 2011
@@ -47,7 +47,7 @@ public abstract class Region extends FOb
private int writingMode;
// End of property values
- private SimplePageMaster layoutMaster;
+ protected final SimplePageMaster layoutMaster;
/**
* Base constructor
@@ -102,11 +102,9 @@ public abstract class Region extends FOb
/**
* @param pageRefRect reference dimension of the page area.
- * @param spm the simple page master this region belongs to.
* @return the rectangle for the viewport area
*/
- public abstract Rectangle getViewportRectangle(FODimension pageRefRect
- , SimplePageMaster spm);
+ public abstract Rectangle getViewportRectangle(FODimension pageRefRect);
/**
* Returns the default region name (xsl-region-before, xsl-region-start,
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java?rev=1056923&r1=1056922&r2=1056923&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java
Sun Jan 9 12:11:07 2011
@@ -44,7 +44,7 @@ public class RegionAfter extends RegionB
}
/** {...@inheritdoc} */
- public Rectangle getViewportRectangle (FODimension reldims,
SimplePageMaster spm) {
+ public Rectangle getViewportRectangle (FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved
relative
* to the page size and reference orientation.
*/
@@ -52,7 +52,8 @@ public class RegionAfter extends RegionB
PercentBaseContext pageHeightContext =
getPageHeightContext(LengthBase.CUSTOM_BASE);
PercentBaseContext neighbourContext;
Rectangle vpRect;
- if (spm.getWritingMode() == EN_LR_TB || spm.getWritingMode() ==
EN_RL_TB) {
+ if (layoutMaster.getWritingMode() == EN_LR_TB
+ || layoutMaster.getWritingMode() == EN_RL_TB) {
neighbourContext = pageWidthContext;
vpRect = new Rectangle(0, reldims.bpd -
getExtent().getValue(pageHeightContext)
, reldims.ipd,
getExtent().getValue(pageHeightContext));
@@ -62,7 +63,7 @@ public class RegionAfter extends RegionB
, getExtent().getValue(pageWidthContext),
reldims.ipd);
}
if (getPrecedence() == EN_FALSE) {
- adjustIPD(vpRect, spm.getWritingMode(), neighbourContext);
+ adjustIPD(vpRect, layoutMaster.getWritingMode(), neighbourContext);
}
return vpRect;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java?rev=1056923&r1=1056922&r2=1056923&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
Sun Jan 9 12:11:07 2011
@@ -49,7 +49,7 @@ public class RegionBefore extends Region
}
/** {...@inheritdoc} */
- public Rectangle getViewportRectangle (FODimension reldims,
SimplePageMaster spm) {
+ public Rectangle getViewportRectangle (FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved
relative
* to the page size and reference orientation.
*/
@@ -57,7 +57,7 @@ public class RegionBefore extends Region
PercentBaseContext pageHeightContext =
getPageHeightContext(LengthBase.CUSTOM_BASE);
PercentBaseContext neighbourContext;
Rectangle vpRect;
- if (spm.getWritingMode() == EN_LR_TB || spm.getWritingMode() ==
EN_RL_TB) {
+ if (layoutMaster.getWritingMode() == EN_LR_TB ||
layoutMaster.getWritingMode() == EN_RL_TB) {
neighbourContext = pageWidthContext;
vpRect = new Rectangle(0, 0, reldims.ipd,
getExtent().getValue(pageHeightContext));
} else {
@@ -65,7 +65,7 @@ public class RegionBefore extends Region
vpRect = new Rectangle(0, 0,
getExtent().getValue(pageWidthContext), reldims.ipd);
}
if (getPrecedence() == EN_FALSE) {
- adjustIPD(vpRect, spm.getWritingMode(), neighbourContext);
+ adjustIPD(vpRect, layoutMaster.getWritingMode(), neighbourContext);
}
return vpRect;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java?rev=1056923&r1=1056922&r2=1056923&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java
Sun Jan 9 12:11:07 2011
@@ -96,7 +96,7 @@ public class RegionBody extends Region {
}
/** {...@inheritdoc} */
- public Rectangle getViewportRectangle (FODimension reldims,
SimplePageMaster spm) {
+ public Rectangle getViewportRectangle (FODimension reldims) {
/* Special rules apply to resolving margins in the page context.
* Contrary to normal margins in this case top and bottom margin
* are resolved relative to the height. In the property subsystem
@@ -113,7 +113,7 @@ public class RegionBody extends Region {
int start;
int end;
- if (spm.getWritingMode() == EN_LR_TB) { // Left-to-right
+ if (layoutMaster.getWritingMode() == EN_LR_TB) { // Left-to-right
start = commonMarginBlock.marginLeft.getValue(pageWidthContext);
end = commonMarginBlock.marginRight.getValue(pageWidthContext);
} else { // all other supported modes are right-to-left
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java?rev=1056923&r1=1056922&r2=1056923&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java
Sun Jan 9 12:11:07 2011
@@ -44,7 +44,7 @@ public class RegionEnd extends RegionSE
}
/** {...@inheritdoc} */
- public Rectangle getViewportRectangle (FODimension reldims,
SimplePageMaster spm) {
+ public Rectangle getViewportRectangle (FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved
relative
* to the page size and reference orientation.
*/
@@ -52,7 +52,7 @@ public class RegionEnd extends RegionSE
PercentBaseContext pageHeightContext =
getPageHeightContext(LengthBase.CUSTOM_BASE);
PercentBaseContext neighbourContext;
Rectangle vpRect;
- if (spm.getWritingMode() == EN_LR_TB || spm.getWritingMode() ==
EN_RL_TB) {
+ if (layoutMaster.getWritingMode() == EN_LR_TB ||
layoutMaster.getWritingMode() == EN_RL_TB) {
neighbourContext = pageHeightContext;
vpRect = new Rectangle(reldims.ipd -
getExtent().getValue(pageWidthContext), 0,
getExtent().getValue(pageWidthContext), reldims.bpd);
@@ -62,7 +62,7 @@ public class RegionEnd extends RegionSE
vpRect = new Rectangle(reldims.ipd -
getExtent().getValue(pageHeightContext), 0,
reldims.bpd, getExtent().getValue(pageHeightContext));
}
- adjustIPD(vpRect, spm.getWritingMode(), neighbourContext);
+ adjustIPD(vpRect, layoutMaster.getWritingMode(), neighbourContext);
return vpRect;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java?rev=1056923&r1=1056922&r2=1056923&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java
Sun Jan 9 12:11:07 2011
@@ -44,7 +44,7 @@ public class RegionStart extends RegionS
}
/** {...@inheritdoc} */
- public Rectangle getViewportRectangle (FODimension reldims,
SimplePageMaster spm) {
+ public Rectangle getViewportRectangle (FODimension reldims) {
/* Special rules apply to resolving extent as values are resolved
relative
* to the page size and reference orientation.
*/
@@ -52,14 +52,14 @@ public class RegionStart extends RegionS
PercentBaseContext pageHeightContext =
getPageHeightContext(LengthBase.CUSTOM_BASE);
PercentBaseContext neighbourContext;
Rectangle vpRect;
- if (spm.getWritingMode() == EN_LR_TB || spm.getWritingMode() ==
EN_RL_TB) {
+ if (layoutMaster.getWritingMode() == EN_LR_TB ||
layoutMaster.getWritingMode() == EN_RL_TB) {
neighbourContext = pageHeightContext;
vpRect = new Rectangle(0, 0,
getExtent().getValue(pageWidthContext), reldims.bpd);
} else {
neighbourContext = pageWidthContext;
vpRect = new Rectangle(0, 0, reldims.bpd,
getExtent().getValue(pageHeightContext));
}
- adjustIPD(vpRect, spm.getWritingMode(), neighbourContext);
+ adjustIPD(vpRect, layoutMaster.getWritingMode(), neighbourContext);
return vpRect;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
