Incorporated into FoPageSequenceMaster.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195320 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/pagination/FoConditionalPageMasterReference.java b/src/org/apache/fop/fo/pagination/FoConditionalPageMasterReference.java
deleted file mode 100644 (file)
index 40839eb..0000000
--- a/src/org/apache/fop/fo/pagination/FoConditionalPageMasterReference.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $Id$
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
- * For details on use and redistribution please refer to the
- * LICENSE file included with these sources.
- *
- * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
- * @version $Revision$ $Name$
- */
-
-package org.apache.fop.fo.pagination;
-
-import org.apache.fop.fo.pagination.FoSimplePageMaster;
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.apps.FOPException;
-//import org.apache.fop.messaging.MessageHandler;
-
-public class FoConditionalPageMasterReference {
-
-    private FoSimplePageMaster master;
-    private FOAttributes attributes;
-
-    private int pagePosition;
-    private int oddOrEven;
-    private int blankOrNotBlank;
-
-    public FoConditionalPageMasterReference(XMLEvent event)
-        throws FOPException
-    {
-        attributes = new FOAttributes(event);
-    }
-
-    public void setMinimumRepeats(int min) {
-        minimumRepeats = min;
-    }
-
-}

diff --git a/src/org/apache/fop/fo/pagination/FoRepeatablePageMasterAlternatives.java b/src/org/apache/fop/fo/pagination/FoRepeatablePageMasterAlternatives.java
deleted file mode 100644 (file)
index 2be06fa..0000000
--- a/src/org/apache/fop/fo/pagination/FoRepeatablePageMasterAlternatives.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * FoRepeatablePageMasterAlternatives.java
- * Created: Sun Jan 27 01:19:31 2002
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
- * For details on use and redistribution please refer to the
- * LICENSE file included with these sources.
- *
- * @author <a href="mailto: "Peter B. West</a>
- * @version $Revision$ $Name$
- */
-
-package org.apache.fop.fo.pagination;
-
-// FOP
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.SyncedCircularBuffer;
-
-/**
- * <i>FoRepeatablePageMasterAlternatives</i> is the class which processes
- * and represents the <i>o:repeatable-page-master-alternatives</i> element.
- * fo:repeatable-page-master-alternatives is the most flexible of the
- * page masters in the layout-master-set.  It is also the only sub-sequence
- * into which all other sub-sequences can be mapped.  Because of this, it
- * is the only sub-sequence type actually used.
- */
-public class FoRepeatablePageMasterAlternatives {
-
-    private FOAttributes attributes;
-    private LinkedList conditions;
-    private int maximumRepeats;
-    private int minimumRepeats;
-
-    public FoRepeatablePageMasterAlternatives
-        (FOTree foTree, SyncedCircularBuffer xmlevents, XMLEvent event)
-        throws FOPException
-    {
-        
-    }
-
-    public void setMinimumRepeats(int min) {
-        minimumRepeats = min;
-    }
-
-    public void setMaximumRepeats(int max) {
-        maximumRepeats = max;
-    }
-
-}// FoRepeatablePageMasterAlternatives

diff --git a/src/org/apache/fop/fo/pagination/FoSinglePageMasterReference.java b/src/org/apache/fop/fo/pagination/FoSinglePageMasterReference.java
deleted file mode 100644 (file)
index 5ccb434..0000000
--- a/src/org/apache/fop/fo/pagination/FoSinglePageMasterReference.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * FoSinglePageMasterReference.java
- * Created: Sun Jan 27 01:19:31 2002
- * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
- * For details on use and redistribution please refer to the
- * LICENSE file included with these sources.
- *
- * @author <a href="mailto: "Peter B. West</a>
- * @version $Revision$ $Name$
- */
-
-package org.apache.fop.fo.pagination;
-
-// FOP
-import org.apache.fop.fo.FOAttributes;
-import org.apache.fop.xml.XMLEvent;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.SyncedXmlEventsBuffer;
-
-public class FoSinglePageMasterReference extends FONode {
-
-    public FoSinglePageMasterReference
-        (SyncedCircularBuffer xmlevents, XMLEvent event) throws FOPException {
-       super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
-                                   event, FOPropertySets.SEQ_MASTER_SET);
-    }
-
-    public getMasterReference() {
-        return getPropertyValue(PropNames.MASTER_REFERENCE);
-    }
-
-}// FoSinglePageMasterReference