[FOray-commit] SF.net SVN: foray: [8745] trunk/foray

[<vic...@us...>]

Revision: 8745
          http://svn.sourceforge.net/foray/?rev=8745&view=rev
Author:   victormote
Date:     2007-02-19 20:10:42 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
Conform to aXSL change: Remove no-longer-needed method.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
    trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2007-02-20 03:46:55 UTC (rev 8744)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2007-02-20 04:10:42 UTC (rev 8745)
@@ -32,6 +32,7 @@
 import org.axsl.areaW.Area;
 import org.axsl.areaW.AreaTreeEvent;
 import org.axsl.areaW.AreaTreeListener;
+import org.axsl.areaW.AreaWException;
 import org.axsl.areaW.PageArea;
 import org.axsl.foR.FObj;
 import org.axsl.foR.fo.Bookmark;
@@ -90,8 +91,11 @@
         this.getNormalLinkage().registerGeneratedArea(this);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public PageCollection makePageCollection(
-            final PageSequence pageSequence) {
+            final PageSequence pageSequence) throws AreaWException {
         final int lastPageNumber;
         final int collectionsProcessed = this.pageCollectionsProcessed.size();
         if (collectionsProcessed > 0) {

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2007-02-20 03:46:55 UTC (rev 8744)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2007-02-20 04:10:42 UTC (rev 8745)
@@ -74,10 +74,11 @@
      * @param areaTree {@inheritDoc}
      */
     public PageCollection(final PageSequence pageSeq, final AreaTree areaTree,
-            final int lastPageNumber) {
+            final int lastPageNumber) throws AreaWException {
         super(pageSeq, areaTree);
         this.pageMasterResolver = pageSeq.makePageMasterResolver(
                 lastPageNumber);
+        padPagesAtBeginning();
     }
 
     /*

Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java
===================================================================
--- trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2007-02-20 03:46:55 UTC (rev 8744)
+++ trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java	2007-02-20 04:10:42 UTC (rev 8745)
@@ -270,9 +270,9 @@
             final Renderer renderer = (Renderer) this.outputTarget;
             final org.axsl.areaR.AreaTree areaTreeR = getRenderedAreaTree();
             renderer.setAreaTree(areaTreeR);
-            final org.axsl.areaW.PageCollection pageCollection =
-                    areaTree.makePageCollection(pageSequence);
+            final org.axsl.areaW.PageCollection pageCollection;
             try {
+                pageCollection = areaTree.makePageCollection(pageSequence);
                 layout.formatPageSequence(pageCollection);
             } catch (final AreaWException e) {
                 throw new FOrayException(e);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2007-02-20 03:46:55 UTC (rev 8744)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java	2007-02-20 04:10:42 UTC (rev 8745)
@@ -159,7 +159,6 @@
         final PageSequence pageSeq = pageCollection.getPageSequence();
         final org.axsl.foR.fo.Flow flow = pageSeq.getFlow();
         flow.setProxy(new FlowPL(flow, this));
-        pageCollection.padPagesAtBeginning();
 
         // make pages and layout content
         int status = Status.UNKNOWN;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.