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

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

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

Log Message:
-----------
Only test for ability to layout out flow for Flow objects as StaticContent objects are not required to be laid out on each page.

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

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java	2006-09-05 00:03:05 UTC (rev 7892)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java	2006-09-05 00:11:03 UTC (rev 7893)
@@ -58,15 +58,6 @@
         if (name == null || name.equals("")) {
             throwException(getFullName() + "requires a 'flow-name'.");
         }
-        /* Make sure that this flow name can be laid out on every page that can
-         * be created in the page-sequence. */
-        final AbstractPageMaster problemPage = getPageSequence().flowValid(
-                this);
-        if (problemPage != null) {
-            throwException(this.getFullName() + " '" + traitFlowName()
-                    + "' cannot flow into page-master '"
-                    + problemPage.traitMasterName() + "'");
-        }
     }
 
     public boolean isRAGenerator() {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java	2006-09-05 00:03:05 UTC (rev 7892)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java	2006-09-05 00:11:03 UTC (rev 7893)
@@ -45,6 +45,22 @@
     /**
      * {@inheritDoc}
      */
+    public void validateProperties() throws FOTreeException {
+        super.validateProperties();
+        /* Make sure that this flow name can be laid out on every page that can
+         * be created in the page-sequence. */
+        final AbstractPageMaster problemPage = getPageSequence().flowValid(
+                this);
+        if (problemPage != null) {
+            throwException(this.getFullName() + " '" + traitFlowName()
+                    + "' cannot flow into page-master '"
+                    + problemPage.traitMasterName() + "'");
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public void setup() throws FOTreeException {
         getPageSequence().addFlow(this);
     }


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