gmazza 2005/02/06 12:48:48
Modified: src/java/org/apache/fop/area CachedRenderPagesModel.java
PageViewport.java RenderPagesModel.java
src/java/org/apache/fop/area/inline
UnresolvedPageNumber.java
src/java/org/apache/fop/fo/pagination PageSequence.java
src/java/org/apache/fop/layoutmgr
PageNumberCitationLayoutManager.java
PageSequenceLayoutManager.java
src/java/org/apache/fop/render/ps PSRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Rolled the PageNumberGenerator from PSLM back into PageSequence (slightly
simpler, also this functionality is useful for non-layout render types),
renamed PageViewport.getPageNumber() to .getPageNumberString() to emphasize
what it is actually returning.
Revision Changes Path
1.8 +1 -1
xml-fop/src/java/org/apache/fop/area/CachedRenderPagesModel.java
Index: CachedRenderPagesModel.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/CachedRenderPagesModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CachedRenderPagesModel.java 16 Dec 2004 23:59:13 -0000 1.7
+++ CachedRenderPagesModel.java 6 Feb 2005 20:48:47 -0000 1.8
@@ -83,7 +83,7 @@
if (!p.isResolved()) {
String[] idrefs = p.getIDRefs();
for (int count = 0; count < idrefs.length; count++) {
- log.warn("Page " + p.getPageNumber() +
+ log.warn("Page " + p.getPageNumberString() +
": Unresolved id reference \"" +
idrefs[count]
+ "\" found.");
}
1.11 +6 -6 xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PageViewport.java 16 Dec 2004 23:59:13 -0000 1.10
+++ PageViewport.java 6 Feb 2005 20:48:47 -0000 1.11
@@ -42,7 +42,7 @@
private Page page;
private Rectangle2D viewArea;
private boolean clip = false;
- private String pageNumber = null;
+ private String pageNumberString = null;
// list of id references and the rectangle on the page
private Map idReferences = null;
@@ -100,16 +100,16 @@
* Set the page number for this page.
* @param num the string representing the page number
*/
- public void setPageNumber(String num) {
- pageNumber = num;
+ public void setPageNumberString(String num) {
+ pageNumberString = num;
}
/**
* Get the page number of this page.
* @return the string that represents this page
*/
- public String getPageNumber() {
- return pageNumber;
+ public String getPageNumberString() {
+ return pageNumberString;
}
/**
@@ -368,7 +368,7 @@
public String toString() {
StringBuffer sb = new StringBuffer(64);
sb.append("PageViewport: page=");
- sb.append(getPageNumber());
+ sb.append(getPageNumberString());
return sb.toString();
}
}
1.12 +1 -1
xml-fop/src/java/org/apache/fop/area/RenderPagesModel.java
Index: RenderPagesModel.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/RenderPagesModel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RenderPagesModel.java 16 Dec 2004 23:59:13 -0000 1.11
+++ RenderPagesModel.java 6 Feb 2005 20:48:47 -0000 1.12
@@ -151,7 +151,7 @@
if (!p.isResolved()) {
String[] idrefs = p.getIDRefs();
for (int count = 0; count < idrefs.length; count++) {
- log.warn("Page " + p.getPageNumber() +
+ log.warn("Page " + p.getPageNumberString() +
": Unresolved id reference \"" +
idrefs[count]
+ "\" found.");
}
1.9 +1 -1
xml-fop/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
Index: UnresolvedPageNumber.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UnresolvedPageNumber.java 16 Dec 2004 23:59:13 -0000 1.8
+++ UnresolvedPageNumber.java 6 Feb 2005 20:48:48 -0000 1.9
@@ -65,7 +65,7 @@
if (pageIDRef.equals(id) && pages != null) {
resolved = true;
PageViewport page = (PageViewport)pages.get(0);
- text = page.getPageNumber();
+ text = page.getPageNumberString();
/[EMAIL PROTECTED] Update IPD ??? */
}
}
1.54 +6 -5
xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- PageSequence.java 24 Nov 2004 21:07:29 -0000 1.53
+++ PageSequence.java 6 Feb 2005 20:48:48 -0000 1.54
@@ -87,7 +87,7 @@
public int currentPageNumber = 0;
private int explicitFirstNumber = 0; // explicitly specified
public int firstPageNumber = 0; // actual
- public PageNumberGenerator pageNumberGenerator;
+ private PageNumberGenerator pageNumberGenerator;
private int pageCount = 0;
private boolean isForcing = false;
@@ -678,11 +678,12 @@
}
/**
- * Public accessor for getting the PageNumberGenerator.
- * @return the PageNumberGenerator
+ * Retrieves the string representation of a page number applicable
+ * for this page sequence
+ * @return string representation of the page number
*/
- public PageNumberGenerator getPageNumberGenerator() {
- return pageNumberGenerator;
+ public String makeFormattedPageNumber(int pageNumber) {
+ return pageNumberGenerator.makeFormattedPageNumber(pageNumber);
}
/**
1.12 +2 -2
xml-fop/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java
Index: PageNumberCitationLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PageNumberCitationLayoutManager.java 25 Jan 2005 10:55:47 -0000
1.11
+++ PageNumberCitationLayoutManager.java 6 Feb 2005 20:48:48 -0000
1.12
@@ -74,7 +74,7 @@
PageViewport page = parentLM.resolveRefID(fobj.getRefId());
InlineArea inline = null;
if (page != null) {
- String str = page.getPageNumber();
+ String str = page.getPageNumberString();
// get page string from parent, build area
TextArea text = new TextArea();
inline = text;
1.28 +5 -8
xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Index: PageSequenceLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- PageSequenceLayoutManager.java 6 Feb 2005 08:14:07 -0000 1.27
+++ PageSequenceLayoutManager.java 6 Feb 2005 20:48:48 -0000 1.28
@@ -44,7 +44,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.Marker;
-import org.apache.fop.fo.pagination.PageNumberGenerator;
import org.apache.fop.fo.pagination.PageSequence;
import org.apache.fop.fo.pagination.Region;
import org.apache.fop.fo.pagination.RegionBody;
@@ -76,7 +75,6 @@
}
}
- private PageNumberGenerator pageNumberGenerator;
private int pageCount = 1;
private String pageNumberString;
private boolean isFirstPage = true;
@@ -194,8 +192,7 @@
public void activateLayout() {
pageSeq.initPageNumber();
pageCount = pageSeq.getCurrentPageNumber();
- pageNumberGenerator = pageSeq.getPageNumberGenerator();
- pageNumberString =
pageNumberGenerator.makeFormattedPageNumber(pageCount);
+ pageNumberString = pageSeq.makeFormattedPageNumber(pageCount);
LineArea title = null;
if (pageSeq.getTitleFO() != null) {
@@ -221,7 +218,7 @@
// finish page and add to area tree
finishPage();
pageCount++;
- pageNumberString =
pageNumberGenerator.makeFormattedPageNumber(pageCount);
+ pageNumberString =
pageSeq.makeFormattedPageNumber(pageCount);
}
}
pageCount--;
@@ -480,9 +477,9 @@
log.error("Cannot create page", fopex);
}
- curPage.setPageNumber(getCurrentPageNumber());
+ curPage.setPageNumberString(getCurrentPageNumber());
if (log.isDebugEnabled()) {
- log.debug("[" + curPage.getPageNumber() + "]");
+ log.debug("[" + curPage.getPageNumberString() + "]");
}
RegionViewport rv = curPage.getPage().getRegionViewport(
FO_REGION_BODY);
1.36 +1 -1 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- PSRenderer.java 24 Nov 2004 21:07:30 -0000 1.35
+++ PSRenderer.java 6 Feb 2005 20:48:48 -0000 1.36
@@ -357,7 +357,7 @@
this.currentPageNumber++;
gen.writeDSCComment(DSCConstants.PAGE, new Object[]
- {page.getPageNumber(),
+ {page.getPageNumberString(),
new Integer(this.currentPageNumber)});
final Integer zero = new Integer(0);
final long pagewidth = Math.round(page.getViewArea().getWidth());
1.43 +1 -1
xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- XMLRenderer.java 31 Jan 2005 13:10:39 -0000 1.42
+++ XMLRenderer.java 6 Feb 2005 20:48:48 -0000 1.43
@@ -338,7 +338,7 @@
public void renderPage(PageViewport page) throws IOException,
FOPException {
atts.clear();
addAttribute("bounds", page.getViewArea());
- addAttribute("nr", page.getPageNumber());
+ addAttribute("nr", page.getPageNumberString());
startElement("pageViewport", atts);
startElement("page");
super.renderPage(page);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
