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

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

Revision: 7876
          http://svn.sourceforge.net/foray/?rev=7876&view=rev
Author:   victormote
Date:     2006-09-03 15:26:23 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
Fix bug. Was skipping the first sub-sequence identifier.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
    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/ConditionalPageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java	2006-09-03 22:03:10 UTC (rev 7875)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java	2006-09-03 22:26:23 UTC (rev 7876)
@@ -69,8 +69,8 @@
                 .pageSequenceMaster().layoutMasterSet();
         if (layoutMasterSet.getSimplePageMaster(this.traitMasterReference())
                 == null) {
-            logWarning(getFullName() + "'" + this.traitMasterReference()
-                    + "' has master-reference which matches \n"
+            logWarning(getFullName() + " \"" + this.traitMasterReference()
+                    + "\" has master-reference which matches \n"
                     + "  no page definitions. It will be ignored.");
         }
     }

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-03 22:03:10 UTC (rev 7875)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterResolver.java	2006-09-03 22:26:23 UTC (rev 7876)
@@ -39,7 +39,7 @@
 
     /** Current index into the PageSequenceMaster child sub-sequences.
      * Used only for PageSequenceMaster */
-    private int currentSubSequenceNumber;
+    private int currentSubSequenceNumber = -1;
 
     /** Current SubSequenceSpecifier. */
     private SubSequenceWrapper currentSubSequence;
@@ -80,6 +80,9 @@
             currentSubSequence = getNextSubSequence(psm);
             firstPage = true;
         }
+        if (currentSubSequence == null) {
+            return null;
+        }
         String pageMasterName = currentSubSequence.getNextPageMasterName(
                 oddPage, firstPage, blankPage);
         boolean canRecover = true;


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