pietsch 2002/09/30 13:54:23
Modified: src/org/apache/fop/datatypes Tag: fop-0_20_2-maintain
IDNode.java IDReferences.java
Log:
Use the formatted page number string instead of the
raw number in IDReferences/IDNode, so that a
page-number citation gets the formatted number.
Revision Changes Path
No revision
No revision
1.4.2.2 +7 -6 xml-fop/src/org/apache/fop/datatypes/Attic/IDNode.java
Index: IDNode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/IDNode.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- IDNode.java 2 Aug 2002 20:28:47 -0000 1.4.2.1
+++ IDNode.java 30 Sep 2002 20:54:23 -0000 1.4.2.2
@@ -15,8 +15,9 @@
private PDFGoTo internalLinkGoTo;
- private int pageNumber = -1, xPosition = 0, // x position on page
- yPosition = 0; // y position on page
+ private String pageNumber;
+ private int xPosition = 0; // x position on page
+ private int yPosition = 0; // y position on page
/**
@@ -34,8 +35,8 @@
*
* @param number page number of node
*/
- protected void setPageNumber(int number) {
- pageNumber = number;
+ protected void setPageNumber(String pageNumber) {
+ this.pageNumber = pageNumber;
}
@@ -45,7 +46,7 @@
* @return page number of this node
*/
public String getPageNumber() {
- return (pageNumber != -1) ? new Integer(pageNumber).toString() : null;
+ return pageNumber;
}
1.14.2.2 +3 -3 xml-fop/src/org/apache/fop/datatypes/Attic/IDReferences.java
Index: IDReferences.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/IDReferences.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- IDReferences.java 2 Aug 2002 20:28:47 -0000 1.14.2.1
+++ IDReferences.java 30 Sep 2002 20:54:23 -0000 1.14.2.2
@@ -145,7 +145,7 @@
+ area.getTableCellXOffset() - ID_PADDING,
area.getPage().getBody().getYPosition()
- area.getAbsoluteHeight() + ID_PADDING);
- setPageNumber(id, area.getPage().getNumber());
+ setPageNumber(id, area.getPage().getFormattedNumber());
area.getPage().addToIDList(id);
}
}
@@ -307,7 +307,7 @@
* @param id The id whose page number is being set
* @param pageNumber The page number of the specified id
*/
- public void setPageNumber(String id, int pageNumber) {
+ public void setPageNumber(String id, String pageNumber) {
IDNode node = (IDNode)idReferences.get(id);
node.setPageNumber(pageNumber);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
