Clean up StructureHandler's startPageSequence() method to remove unnecessary paramete...

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

diff --git a/src/java/org/apache/fop/apps/LayoutHandler.java b/src/java/org/apache/fop/apps/LayoutHandler.java
index 348d8112b9be1c4cea88926883730a13a243087f..ddc9fa82a25ed7d9a1b0d9f04e7ed6867134b12e 100644 (file)
--- a/src/java/org/apache/fop/apps/LayoutHandler.java
+++ b/src/java/org/apache/fop/apps/LayoutHandler.java
@@ -248,15 +248,11 @@ public class LayoutHandler extends StructureHandler {
      * on the area tree with the page sequence title.
      *
      * @param pageSeq the page sequence starting
-     * @param seqTitle the title of the page sequence
-     * @param lms the layout master set
      */
-    public void startPageSequence(PageSequence pageSeq,
-                                  org.apache.fop.fo.Title seqTitle,
-                                  LayoutMasterSet lms) {
+    public void startPageSequence(PageSequence pageSeq) {
         Title title = null;
-        if (seqTitle != null) {
-            title = seqTitle.getTitleArea();
+        if (pageSeq.getTitleFO() != null) {
+            title = pageSeq.getTitleFO().getTitleArea();
         }
         areaTree.startPageSequence(title);
     }

diff --git a/src/java/org/apache/fop/apps/StructureHandler.java b/src/java/org/apache/fop/apps/StructureHandler.java
index 1e22e9e2088f22707d20d06b1cf5666bc9b691a3..77667937cf4f2a62ae59ba800cb937467017c590 100644 (file)
--- a/src/java/org/apache/fop/apps/StructureHandler.java
+++ b/src/java/org/apache/fop/apps/StructureHandler.java
@@ -122,7 +122,7 @@ abstract public class StructureHandler extends AbstractLogEnabled {
      */
     abstract public void endDocument() throws SAXException;
 
-    abstract public void startPageSequence(PageSequence pageSeq, Title seqTitle, LayoutMasterSet lms);
+    abstract public void startPageSequence(PageSequence pageSeq);
 
     abstract public void endPageSequence(PageSequence pageSeq) throws FOPException;
 

diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java
index 767d5f896148049f25f6a4e9257e6908c3136d99..5e9d2b1ad028435351ec9be92df06acd2a840d38 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java
@@ -340,7 +340,7 @@ public class PageSequence extends FObj {
      */
     private void startStructuredPageSequence() {
         if (!sequenceStarted) {
-            structHandler.startPageSequence(this, titleFO, layoutMasterSet);
+            structHandler.startPageSequence(this);
             sequenceStarted = true;
         }
     }
@@ -807,5 +807,14 @@ public class PageSequence extends FObj {
     public StaticContent getStaticContent(String name) {
         return (StaticContent)flowMap.get(name);
     }
+
+    public LayoutMasterSet getLayoutMasterSet() {
+        return layoutMasterSet;
+    }
+
+    public Title getTitleFO() {
+        return titleFO;
+    }
+
 }
 

diff --git a/src/java/org/apache/fop/mif/MIFHandler.java b/src/java/org/apache/fop/mif/MIFHandler.java
index fd9b11a8cdaab417732f4574c6685e8d0f3e8ed8..2ef774edbc5e001055a3b6eae78df514e3f09e6b 100644 (file)
--- a/src/java/org/apache/fop/mif/MIFHandler.java
+++ b/src/java/org/apache/fop/mif/MIFHandler.java
@@ -147,13 +147,13 @@ public class MIFHandler extends StructureHandler {
      * by the following flows and static areas.
      * @see org.apache.fop.apps.StructureHandler
      */
-    public void startPageSequence(PageSequence pageSeq, Title seqTitle, LayoutMasterSet lms) {
+    public void startPageSequence(PageSequence pageSeq) {
         // get the layout master set
         // setup the pages for this sequence
         String name = pageSeq.getProperty("master-reference").getString();
-        SimplePageMaster spm = lms.getSimplePageMaster(name);
+        SimplePageMaster spm = pageSeq.getLayoutMasterSet().getSimplePageMaster(name);
         if (spm == null) {
-            PageSequenceMaster psm = lms.getPageSequenceMaster(name);
+            PageSequenceMaster psm = pageSeq.getLayoutMasterSet().getPageSequenceMaster(name);
         } else {
             // create simple master with regions
             MIFElement prop = new MIFElement("PageType");

diff --git a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
index 4a902624f026d67eda510b9d0f9cc6122b82ce30..15e7240cb0952b1c83292da84f9c1fab8c6faa78 100644 (file)
--- a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
+++ b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
@@ -150,7 +150,7 @@ public class RTFHandler extends StructureHandler {
     /**
      * @see org.apache.fop.apps.StructureHandler
      */
-    public void startPageSequence(PageSequence pageSeq, Title seqTitle, LayoutMasterSet lms)  {
+    public void startPageSequence(PageSequence pageSeq)  {
         try {
             sect = docArea.newSection();
             if (!warned) {