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

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

Revision: 7638
Author:   victormote
Date:     2006-06-15 16:28:17 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7638&view=rev

Log Message:
-----------
Remove unneeded parameter.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java	2006-06-15 23:26:33 UTC (rev 7637)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java	2006-06-15 23:28:17 UTC (rev 7638)
@@ -29,7 +29,6 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
-import org.axsl.foR.FOContext;
 import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOTreeException;
 import org.axsl.foR.ProxyFactory;
@@ -114,8 +113,6 @@
 
     public SimplePageMaster getNextSimplePageMaster(
             boolean oddPage, boolean blankPage) throws FOTreeException {
-        /* TODO: Handle context better. */
-        FOContext context = null;
         boolean firstPage = false;
         if (currentSubSequence==null) {
             currentSubSequence = getNextSubSequence();
@@ -126,7 +123,7 @@
             firstPage = true;
         }
         String pageMasterName = currentSubSequence
-          .getNextPageMasterName(context, oddPage, firstPage, blankPage);
+          .getNextPageMasterName(oddPage, firstPage, blankPage);
         boolean canRecover = true;
         while (pageMasterName==null) {
             SubSequenceSpecifier nextSubSequence = getNextSubSequence();
@@ -148,7 +145,7 @@
                 currentSubSequence = nextSubSequence;
             }
             pageMasterName = currentSubSequence
-              .getNextPageMasterName(context, oddPage, firstPage, blankPage);
+              .getNextPageMasterName(oddPage, firstPage, blankPage);
         }
         SimplePageMaster pageMaster=this.layoutMasterSet()
           .getSimplePageMaster(pageMasterName);

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java	2006-06-15 23:26:33 UTC (rev 7637)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java	2006-06-15 23:28:17 UTC (rev 7638)
@@ -30,7 +30,6 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
-import org.axsl.foR.FOContext;
 import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOTreeException;
 import org.axsl.foR.ProxyFactory;
@@ -61,8 +60,8 @@
         return "repeatable-page-master-alternatives";
     }
 
-    public String getNextPageMasterName(FOContext context, boolean isOddPage,
-            boolean isFirstPage, boolean isEmptyPage) {
+    public String getNextPageMasterName(boolean isOddPage, boolean isFirstPage,
+            boolean isEmptyPage) {
         if (numberConsumed < traitMaximumRepeats()) {
             numberConsumed++;
         } else {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java	2006-06-15 23:26:33 UTC (rev 7637)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java	2006-06-15 23:28:17 UTC (rev 7638)
@@ -30,7 +30,6 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
-import org.axsl.foR.FOContext;
 import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOTreeException;
 import org.axsl.foR.ProxyFactory;
@@ -70,8 +69,8 @@
         return "repeatable-page-master-reference";
     }
 
-    public String getNextPageMasterName(FOContext context, boolean isOddPage,
-            boolean isFirstPage, boolean isEmptyPage) {
+    public String getNextPageMasterName(boolean isOddPage, boolean isFirstPage,
+            boolean isEmptyPage) {
         if (numberConsumed < traitMaximumRepeats()) {
             numberConsumed++;
         } else {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java	2006-06-15 23:26:33 UTC (rev 7637)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java	2006-06-15 23:28:17 UTC (rev 7638)
@@ -28,7 +28,6 @@
 import org.foray.fotree.Namespace;
 import org.foray.fotree.PropertyList;
 
-import org.axsl.foR.FOContext;
 import org.axsl.foR.FONodeProxy;
 import org.axsl.foR.FOTreeException;
 import org.axsl.foR.ProxyFactory;
@@ -75,8 +74,8 @@
         return "single-page-master-reference";
     }
 
-    public String getNextPageMasterName(FOContext context, boolean isOddPage,
-            boolean isFirstPage, boolean isEmptyPage) {
+    public String getNextPageMasterName(boolean isOddPage, boolean isFirstPage,
+            boolean isEmptyPage) {
         if (! this.isDone) {
             this.isDone = true;
             return traitMasterName();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java	2006-06-15 23:26:33 UTC (rev 7637)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java	2006-06-15 23:28:17 UTC (rev 7638)
@@ -24,7 +24,6 @@
 
 package org.foray.fotree.fo.obj;
 
-import org.axsl.foR.FOContext;
 import org.axsl.foR.FOTreeException;
 
 /**
@@ -33,8 +32,8 @@
  */
 public interface SubSequenceSpecifier {
 
-    String getNextPageMasterName(FOContext context, boolean isOddPage,
-            boolean isFirstPage, boolean isEmptyPage) throws FOTreeException;
+    String getNextPageMasterName(boolean isOddPage, boolean isFirstPage,
+            boolean isEmptyPage) throws FOTreeException;
 
     /**
      * Called before a new page sequence is rendered so subsequences can reset


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