Removal of empty Title subclass, now using LineArea.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197975 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/area/AreaTreeHandler.java b/src/java/org/apache/fop/area/AreaTreeHandler.java
index 5179d74195da8450daac3f08339adf1f4a3ada99..4ef9e027264ae77a88ff3c4290e0c9eb8e0d9c68 100644 (file)
--- a/src/java/org/apache/fop/area/AreaTreeHandler.java
+++ b/src/java/org/apache/fop/area/AreaTreeHandler.java
@@ -39,6 +39,7 @@ import org.apache.fop.fo.FObj;
 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 @@ public class AreaTreeHandler extends FOEventHandler {
      * @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 @@ public class AreaTreeHandler extends FOEventHandler {
     /**
      * @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());

diff --git a/src/java/org/apache/fop/area/AreaTreeModel.java b/src/java/org/apache/fop/area/AreaTreeModel.java
index 18a6a486099dfe01655e749b0292c01a3911df73..edda24cd9948f7f49f9f7daf5924dd0a2aa0b084 100644 (file)
--- a/src/java/org/apache/fop/area/AreaTreeModel.java
+++ b/src/java/org/apache/fop/area/AreaTreeModel.java
@@ -34,7 +34,7 @@ public abstract class AreaTreeModel {
      * 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 @@ public abstract class AreaTreeModel {
      * @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);
 
 }

diff --git a/src/java/org/apache/fop/area/RenderPagesModel.java b/src/java/org/apache/fop/area/RenderPagesModel.java
index fd62a88d937f34e9af97d07b1c4612caffa93ef8..66d1ae4e4989edb2cce4301767237ce68e78f3aa 100644 (file)
--- a/src/java/org/apache/fop/area/RenderPagesModel.java
+++ b/src/java/org/apache/fop/area/RenderPagesModel.java
@@ -142,7 +142,7 @@ public class RenderPagesModel extends StorePagesModel {
      * 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);
     }

diff --git a/src/java/org/apache/fop/area/StorePagesModel.java b/src/java/org/apache/fop/area/StorePagesModel.java
index 5e1b044b7ddf9b90c0802df32e8182480487d7ba..2fa296f30f8f86a3bf24f37c2c9828079ff8b2a7 100644 (file)
--- a/src/java/org/apache/fop/area/StorePagesModel.java
+++ b/src/java/org/apache/fop/area/StorePagesModel.java
@@ -47,7 +47,7 @@ public class StorePagesModel extends AreaTreeModel {
      * 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 @@ public class StorePagesModel extends AreaTreeModel {
      * @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);
     }
      
     /**

diff --git a/src/java/org/apache/fop/area/Title.java b/src/java/org/apache/fop/area/Title.java
deleted file mode 100644 (file)
index 1d4b8ec..0000000
--- a/src/java/org/apache/fop/area/Title.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
- 
-package org.apache.fop.area;
-
-/**
- * The title area.
- * This area holds the inline areas from the page-sequence
- * title element.
- */
-public class Title extends LineArea {
-}
-

diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java
index e4bb2c82322bcc10654bc1cedbf9fd6a16c02b90..a6f8f750962640882975ea0e988a557a665ae686 100644 (file)
--- a/src/java/org/apache/fop/render/AbstractRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractRenderer.java
@@ -46,7 +46,6 @@ import org.apache.fop.area.Page;
 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 @@ public abstract class AbstractRenderer
      * @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 @@ public abstract class AbstractRenderer
     }
 
     /** @see org.apache.fop.render.Renderer */
-    public void startPageSequence(Title seqTitle) {
+    public void startPageSequence(LineArea seqTitle) {
         //do nothing
     }
 

diff --git a/src/java/org/apache/fop/render/Renderer.java b/src/java/org/apache/fop/render/Renderer.java
index e319c7d2843d813d4f1b8ce95318a9293b480230..febc8b39d88e9b9d376f53cd1bc306aa84130f6e 100644 (file)
--- a/src/java/org/apache/fop/render/Renderer.java
+++ b/src/java/org/apache/fop/render/Renderer.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 // 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 @@ public interface Renderer {
      *
      * @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

diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index b56cc0a0e61b1e58a4daccf40f8cad6b8038f789..b32b6f43be3a0290d602721fcb64568448d87e67 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -45,7 +45,6 @@ import org.apache.fop.area.LineArea;
 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 @@ public class PDFRenderer extends PrintRenderer {
      *
      * @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();

diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java
index 8d3db34f39b52b0cd1ffdd7efebd1fa2d49485e7..4e7cb6fc783d58c96acadad8ca931129d29f8c70 100644 (file)
--- a/src/java/org/apache/fop/render/svg/SVGRenderer.java
+++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java
@@ -20,7 +20,7 @@ package org.apache.fop.render.svg;
 
 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 @@ public class SVGRenderer extends AbstractRenderer implements XMLHandler {
     private Element pagesGroup = null;
 
     // first sequence title
-    private Title docTitle = null;
+    private LineArea docTitle = null;
 
     private RendererContext context;
 
@@ -205,7 +205,7 @@ public class SVGRenderer extends AbstractRenderer implements XMLHandler {
     /**
      * @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;

diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java
index c38cf47e215d18dc7526c5dff9848b8191d45559..ba1459099b484e1aa172b96b0209f46bcb413f4a 100644 (file)
--- a/src/java/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java
@@ -46,7 +46,6 @@ import org.apache.fop.area.PageViewport;
 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 @@ public class XMLRenderer extends AbstractRenderer {
     /**
      * @see org.apache.fop.render.Renderer#startPageSequence(Title)
      */
-    public void startPageSequence(Title seqTitle) {
+    public void startPageSequence(LineArea seqTitle) {
         if (startedSequence) {
             writeEndTag("</pageSequence>");
         }