vmote 2003/08/27 08:55:35
Modified: src/java/org/apache/fop/fo/pagination Region.java
src/java/org/apache/fop/layoutmgr PageLayoutManager.java
Log:
move fo/pagination/Region.setRegionPosition() to layoutmgr/PageLayoutManager
Revision Changes Path
1.10 +0 -16 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Region.java 27 Aug 2003 15:33:59 -0000 1.9
+++ Region.java 27 Aug 2003 15:55:34 -0000 1.10
@@ -60,8 +60,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.area.CTM;
-import org.apache.fop.area.RegionReference;
// SAX
import org.xml.sax.Attributes;
@@ -136,20 +134,6 @@
}
public abstract Rectangle getViewportRectangle(FODimension pageRefRect);
-
- /**
- * Set the region position inside the region viewport.
- * This sets the trasnform that is used to place the contents of
- * the region.
- *
- * @param r the region reference area
- * @param absRegVPRect the rectangle to place the region contents
- */
- public void setRegionPosition(RegionReference r, Rectangle2D absRegVPRect) {
- FODimension reldims = new FODimension(0, 0);
- r.setCTM(CTM.getCTMandRelDims(propMgr.getAbsRefOrient(),
- propMgr.getWritingMode(), absRegVPRect, reldims));
- }
/**
* Return the enumerated value designating this type of region in the
1.12 +17 -2 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PageLayoutManager.java 27 Aug 2003 15:33:59 -0000 1.11
+++ PageLayoutManager.java 27 Aug 2003 15:55:34 -0000 1.12
@@ -844,7 +844,7 @@
Rectangle2D absRegVPRect) {
// Should set some column stuff here I think, or put it elsewhere
BodyRegion body = new BodyRegion();
- r.setRegionPosition(body, absRegVPRect);
+ setRegionPosition(r, body, absRegVPRect);
int columnCount =
r.properties.get("column-count").getNumber().intValue();
if ((columnCount > 1) && (r.overflow == Overflow.SCROLL)) {
@@ -872,8 +872,23 @@
public RegionReference makeRegionReferenceArea(Region r,
Rectangle2D absRegVPRect) {
RegionReference rr = new RegionReference(r.getRegionAreaClass());
- r.setRegionPosition(rr, absRegVPRect);
+ setRegionPosition(r, rr, absRegVPRect);
return rr;
+ }
+
+ /**
+ * Set the region position inside the region viewport.
+ * This sets the trasnform that is used to place the contents of
+ * the region.
+ *
+ * @param r the region reference area
+ * @param absRegVPRect the rectangle to place the region contents
+ */
+ public void setRegionPosition(Region r, RegionReference rr,
+ Rectangle2D absRegVPRect) {
+ FODimension reldims = new FODimension(0, 0);
+ rr.setCTM(CTM.getCTMandRelDims(r.getPropertyManager().getAbsRefOrient(),
+ r.getPropertyManager().getWritingMode(), absRegVPRect, reldims));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
