gmazza 2004/09/25 14:55:36
Modified: src/java/org/apache/fop/area AreaTreeHandler.java
AreaTreeModel.java RenderPagesModel.java
StorePagesModel.java
src/java/org/apache/fop/render AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Removed: src/java/org/apache/fop/area Title.java
Log:
Removal of empty Title subclass, now using LineArea.
Revision Changes Path
1.9 +5 -5 xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java
Index: AreaTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AreaTreeHandler.java 7 Sep 2004 20:47:08 -0000 1.8
+++ AreaTreeHandler.java 25 Sep 2004 21:55:36 -0000 1.9
@@ -39,6 +39,7 @@
import org.apache.fop.fo.extensions.Outline;
import org.apache.fop.fo.extensions.Bookmarks;
import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.fo.pagination.Title;
import org.apache.fop.layoutmgr.ContentLayoutManager;
import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
import org.apache.fop.layoutmgr.PageLayoutManager;
@@ -370,7 +371,7 @@
* @throws FOPException if there is an error formatting the contents
*/
private void formatPageSequence(PageSequence pageSeq) {
- Title title = null;
+ LineArea title = null;
if (pageSeq.getTitleFO() != null) {
title = getTitleArea(pageSeq.getTitleFO());
}
@@ -422,10 +423,9 @@
/**
* @return the Title area
*/
- private org.apache.fop.area.Title
getTitleArea(org.apache.fop.fo.pagination.Title foTitle) {
+ private LineArea getTitleArea(Title foTitle) {
// get breaks then add areas to title
- org.apache.fop.area.Title title =
- new org.apache.fop.area.Title();
+ LineArea title = new LineArea();
ContentLayoutManager clm = new ContentLayoutManager(title);
clm.setUserAgent(foTitle.getUserAgent());
1.6 +2 -2 xml-fop/src/java/org/apache/fop/area/AreaTreeModel.java
Index: AreaTreeModel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AreaTreeModel.java 20 Sep 2004 00:37:13 -0000 1.5
+++ AreaTreeModel.java 25 Sep 2004 21:55:36 -0000 1.6
@@ -34,7 +34,7 @@
* Start a page sequence on this model.
* @param title the title of the new page sequence
*/
- public abstract void startPageSequence(Title title);
+ public abstract void startPageSequence(LineArea title);
/**
* Add a page to this moel.
@@ -80,6 +80,6 @@
* @param count the page sequence count
* @return the title of the page sequence
*/
- public abstract Title getTitle(int count);
+ public abstract LineArea getTitle(int count);
}
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RenderPagesModel.java 9 Jul 2004 17:27:12 -0000 1.4
+++ RenderPagesModel.java 25 Sep 2004 21:55:36 -0000 1.5
@@ -142,7 +142,7 @@
* started with the given title.
* @param title the title of the new page sequence
*/
- public void startPageSequence(Title title) {
+ public void startPageSequence(LineArea title) {
super.startPageSequence(title);
renderer.startPageSequence(title);
}
1.8 +3 -3 xml-fop/src/java/org/apache/fop/area/StorePagesModel.java
Index: StorePagesModel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/StorePagesModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StorePagesModel.java 23 Sep 2004 10:04:36 -0000 1.7
+++ StorePagesModel.java 25 Sep 2004 21:55:36 -0000 1.8
@@ -47,7 +47,7 @@
* This creates a new list for the pages in the new page sequence.
* @param title the title of the page sequence.
*/
- public void startPageSequence(Title title) {
+ public void startPageSequence(LineArea title) {
titles.add(title);
if (pageSequence == null) {
pageSequence = new java.util.ArrayList();
@@ -139,8 +139,8 @@
* @param count the page sequence count
* @return the title of the page sequence
*/
- public Title getTitle(int count) {
- return (Title) titles.get(count);
+ public LineArea getTitle(int count) {
+ return (LineArea) titles.get(count);
}
/**
1.37 +2 -3 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- AbstractRenderer.java 23 Sep 2004 13:56:27 -0000 1.36
+++ AbstractRenderer.java 25 Sep 2004 21:55:36 -0000 1.37
@@ -46,7 +46,6 @@
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.RegionViewport;
import org.apache.fop.area.RegionReference;
-import org.apache.fop.area.Title;
import org.apache.fop.area.Trait;
import org.apache.fop.area.TreeExt;
import org.apache.fop.area.inline.Container;
@@ -182,7 +181,7 @@
* @param title The Title to convert
* @return An expanded string representing the title
*/
- protected String convertTitleToString(Title title) {
+ protected String convertTitleToString(LineArea title) {
List children = title.getInlineAreas();
String str = convertToString(children);
return str.trim();
@@ -207,7 +206,7 @@
}
/** @see org.apache.fop.render.Renderer */
- public void startPageSequence(Title seqTitle) {
+ public void startPageSequence(LineArea seqTitle) {
//do nothing
}
1.15 +2 -2 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Renderer.java 7 Sep 2004 20:47:11 -0000 1.14
+++ Renderer.java 25 Sep 2004 21:55:36 -0000 1.15
@@ -25,7 +25,7 @@
// FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.PageViewport;
-import org.apache.fop.area.Title;
+import org.apache.fop.area.LineArea;
import org.apache.fop.area.TreeExt;
import org.apache.fop.area.inline.Container;
import org.apache.fop.fonts.FontInfo;
@@ -124,7 +124,7 @@
*
* @param seqTitle The title of the page sequence
*/
- void startPageSequence(Title seqTitle);
+ void startPageSequence(LineArea seqTitle);
/**
* Tells the renderer to render a particular page. A renderer typically
1.55 +1 -2 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- PDFRenderer.java 24 Sep 2004 09:10:26 -0000 1.54
+++ PDFRenderer.java 25 Sep 2004 21:55:36 -0000 1.55
@@ -45,7 +45,6 @@
import org.apache.fop.area.Page;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.RegionViewport;
-import org.apache.fop.area.Title;
import org.apache.fop.area.Trait;
import org.apache.fop.area.TreeExt;
import org.apache.fop.area.extensions.BookmarkData;
@@ -361,7 +360,7 @@
*
* @param seqTitle the title of the page sequence
*/
- public void startPageSequence(Title seqTitle) {
+ public void startPageSequence(LineArea seqTitle) {
if (seqTitle != null) {
String str = convertTitleToString(seqTitle);
PDFInfo info = this.pdfDoc.getInfo();
1.20 +3 -3 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SVGRenderer.java 22 Sep 2004 13:12:38 -0000 1.19
+++ SVGRenderer.java 25 Sep 2004 21:55:36 -0000 1.20
@@ -20,7 +20,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.PageViewport;
-import org.apache.fop.area.Title;
+import org.apache.fop.area.LineArea;
import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.TextArea;
@@ -78,7 +78,7 @@
private Element pagesGroup = null;
// first sequence title
- private Title docTitle = null;
+ private LineArea docTitle = null;
private RendererContext context;
@@ -205,7 +205,7 @@
/**
* @see org.apache.fop.render.Renderer#startPageSequence(Title)
*/
- public void startPageSequence(Title seqTitle) {
+ public void startPageSequence(LineArea seqTitle) {
totalWidth += sequenceWidth;
if (sequenceHeight > totalHeight) {
totalHeight = sequenceHeight;
1.29 +1 -2 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XMLRenderer.java 22 Sep 2004 08:29:45 -0000 1.28
+++ XMLRenderer.java 25 Sep 2004 21:55:36 -0000 1.29
@@ -46,7 +46,6 @@
import org.apache.fop.area.RegionReference;
import org.apache.fop.area.RegionViewport;
import org.apache.fop.area.Span;
-import org.apache.fop.area.Title;
import org.apache.fop.area.Trait;
import org.apache.fop.area.inline.Container;
import org.apache.fop.area.inline.ForeignObject;
@@ -225,7 +224,7 @@
/**
* @see org.apache.fop.render.Renderer#startPageSequence(Title)
*/
- public void startPageSequence(Title seqTitle) {
+ public void startPageSequence(LineArea seqTitle) {
if (startedSequence) {
writeEndTag("</pageSequence>");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
