[FOray-commit] SF.net SVN: foray: [7886] trunk/foray/foray-fotree/src/java/org/foray/ fotree/fo/obj/PageMasterResolver.java

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

Revision: 7886
          http://svn.sourceforge.net/foray/?rev=7886&view=rev
Author:   victormote
Date:     2006-09-04 11:24:24 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Clean up use of exception thrown, and log the warning message in all cases.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java	2006-09-04 18:08:18 UTC (rev 7885)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java	2006-09-04 18:24:24 UTC (rev 7886)
@@ -91,15 +91,16 @@
                     psm);
             firstPage = true;
             if (nextSubSequence == null) {
+                final String basicMessage = "Subsequences exhausted in "
+                    + "page-sequence-master \"" + psm.traitMasterName()
+                    + "\".";
+                /* Log the warning in any case. */
+                psm.getLogger().warn(basicMessage + "\n"
+                        + "  Attempting to use previous subsequence.");
                 if (!canRecover) {
-                    psm.throwException("subsequences exhausted in "
-                            + "page-sequence-master '" + psm.traitMasterName()
-                            + "', cannot recover");
+                    psm.throwException(basicMessage + "\n"
+                            + "  Cannot recover.");
                 }
-                psm.getLogger().warn(
-                        "subsequences exhausted in " + "page-sequence-master '"
-                                + psm.traitMasterName()
-                                + "', use previous subsequence");
                 canRecover = false;
             } else {
                 currentSubSequence = nextSubSequence;
@@ -124,14 +125,6 @@
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public int firstFallbackPage() {
-        /* TODO: Implement this. */
-        return Integer.MAX_VALUE;
-    }
-
     private SubSequenceWrapper makeWrapper(
             final SubSequenceSpecifier specifier) {
         if (specifier instanceof SinglePageMasterReference) {


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