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

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

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

Log Message:
-----------
Make SubSequenceSpecifier an abstract class.

Modified Paths:
--------------
    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/RepeatablePMAlternatives.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java	2006-09-04 00:18:15 UTC (rev 7879)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java	2006-09-04 16:35:31 UTC (rev 7880)
@@ -40,8 +40,7 @@
 /**
  * A "repeatable-page-master-alternatives" object in XSL-FO.
  */
-public class RepeatablePMAlternatives extends FObj
-        implements SubSequenceSpecifier {
+public class RepeatablePMAlternatives extends SubSequenceSpecifier {
 
     public RepeatablePMAlternatives(final FObj parent,
             final PropertyList propertyList, final String systemId,

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-09-04 00:18:15 UTC (rev 7879)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java	2006-09-04 16:35:31 UTC (rev 7880)
@@ -40,8 +40,7 @@
 /**
  * A "repeatable-page-master-reference" object in XSL-FO.
  */
-public class RepeatablePMReference extends FObj
-        implements SubSequenceSpecifier {
+public class RepeatablePMReference extends SubSequenceSpecifier {
 
     public RepeatablePMReference(final FObj parent,
             final PropertyList propertyList, final String systemId,

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-09-04 00:18:15 UTC (rev 7879)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java	2006-09-04 16:35:31 UTC (rev 7880)
@@ -39,8 +39,7 @@
 /**
  * A "single-page-master-reference" object in XSl-FO.
  */
-public class SinglePageMasterReference extends FObj
-        implements SubSequenceSpecifier {
+public class SinglePageMasterReference extends SubSequenceSpecifier {
 
     public SinglePageMasterReference(final FObj parent,
             final PropertyList propertyList, final String systemId,

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-09-04 00:18:15 UTC (rev 7879)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java	2006-09-04 16:35:31 UTC (rev 7880)
@@ -24,19 +24,28 @@
 
 package org.foray.fotree.fo.obj;
 
+import org.foray.fotree.FObj;
+import org.foray.fotree.PropertyList;
+
 import java.util.Set;
 
 /**
- * Interface specifying requirements for a sub-sequence-specifier in XSL-FO,
- * that is, items capable of looking up an appropriate PageMaster.
+ * Abstract superclass for the formatting objects that can be used to specify a
+ * sub-sequence of pages to be used in a page-sequence-master.
  */
-public interface SubSequenceSpecifier {
+public abstract class SubSequenceSpecifier extends FObj {
 
+    protected SubSequenceSpecifier(final FObj parent,
+            final PropertyList propertyList, final String systemId,
+            final int line, final int column) {
+        super(parent, propertyList, systemId, line, column);
+    }
+
     /**
      * Returns the page-master instances that are included in this template.
      * @return The page-master instances that can be generated from this
      * template.
      */
-    Set getPages() ;
+    public abstract Set getPages() ;
 
 }


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