gmazza 2004/08/29 14:09:37
Modified: src/java/org/apache/fop/fo/pagination Region.java
RegionAfter.java RegionBA.java RegionBefore.java
RegionBody.java RegionEnd.java RegionSE.java
RegionStart.java SimplePageMaster.java
Log:
Simplified the region constructors.
Revision Changes Path
1.30 +2 -4 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Region.java 29 Aug 2004 20:58:19 -0000 1.29
+++ Region.java 29 Aug 2004 21:09:36 -0000 1.30
@@ -36,7 +36,6 @@
public abstract class Region extends FObj {
private SimplePageMaster layoutMaster;
- private int regionId = -1;
private String regionName;
/** Holds the overflow attribute */
@@ -49,9 +48,8 @@
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
- protected Region(FONode parent, int id) {
+ protected Region(FONode parent) {
super(parent);
- regionId = id;
}
/**
@@ -156,7 +154,7 @@
/**
* Returns a sibling region for this region.
- * @param regionClass the class of the requested region
+ * @param regionId the Constants ID of the FO representing the region
* @return the requested region
*/
protected Region getSiblingRegion(int regionId) {
1.15 +1 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RegionAfter.java 29 Aug 2004 20:58:19 -0000 1.14
+++ RegionAfter.java 29 Aug 2004 21:09:36 -0000 1.15
@@ -34,7 +34,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionAfter(FONode parent) {
- super(parent, FO_REGION_AFTER);
+ super(parent);
}
/**
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RegionBA.java 29 Aug 2004 20:58:19 -0000 1.17
+++ RegionBA.java 29 Aug 2004 21:09:36 -0000 1.18
@@ -38,8 +38,8 @@
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
- protected RegionBA(FONode parent, int regionId) {
- super(parent, regionId);
+ protected RegionBA(FONode parent) {
+ super(parent);
}
protected void addProperties(Attributes attlist) throws SAXParseException {
1.16 +1 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RegionBefore.java 29 Aug 2004 20:58:19 -0000 1.15
+++ RegionBefore.java 29 Aug 2004 21:09:36 -0000 1.16
@@ -34,7 +34,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionBefore(FONode parent) {
- super(parent, FO_REGION_BEFORE);
+ super(parent);
}
/**
1.28 +1 -1 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- RegionBody.java 29 Aug 2004 20:58:19 -0000 1.27
+++ RegionBody.java 29 Aug 2004 21:09:36 -0000 1.28
@@ -45,7 +45,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionBody(FONode parent) {
- super(parent, FO_REGION_BODY);
+ super(parent);
}
/**
1.15 +1 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RegionEnd.java 29 Aug 2004 20:58:19 -0000 1.14
+++ RegionEnd.java 29 Aug 2004 21:09:36 -0000 1.15
@@ -35,7 +35,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionEnd(FONode parent) {
- super(parent, FO_REGION_END);
+ super(parent);
}
/**
1.13 +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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RegionSE.java 29 Aug 2004 20:58:19 -0000 1.12
+++ RegionSE.java 29 Aug 2004 21:09:36 -0000 1.13
@@ -36,8 +36,8 @@
/**
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
- protected RegionSE(FONode parent, int regionId) {
- super(parent, regionId);
+ protected RegionSE(FONode parent) {
+ super(parent);
}
protected void addProperties(Attributes attlist) throws SAXParseException {
1.15 +1 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RegionStart.java 29 Aug 2004 20:58:19 -0000 1.14
+++ RegionStart.java 29 Aug 2004 21:09:36 -0000 1.15
@@ -34,7 +34,7 @@
* @see org.apache.fop.fo.FONode#FONode(FONode)
*/
public RegionStart(FONode parent) {
- super(parent, FO_REGION_START);
+ super(parent);
}
/**
1.25 +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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SimplePageMaster.java 29 Aug 2004 20:58:19 -0000 1.24
+++ SimplePageMaster.java 29 Aug 2004 21:09:36 -0000 1.25
@@ -182,7 +182,7 @@
/**
* Returns the region for a given region class.
- * @param regionClass region class to lookup
+ * @param regionId Constants ID of the FO representing the region
* @return the region, null if it doesn't exist
*/
public Region getRegion(int regionId) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
