pbwest 2002/11/04 06:46:03
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoRegionAfter.java FoRegionBeforeAfter.java
FoRegionBefore.java FoRegionBody.java
FoRegionEnd.java FoRegionStartEnd.java
FoRegionStart.java FoSimplePageMaster.java
Log:
Node and TreeException extracted from Tree.
Revision Changes Path
No revision
No revision
1.1.2.13 +7 -7
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoLayoutMasterSet.java 30 Oct 2002 13:19:04 -0000 1.1.2.12
+++ FoLayoutMasterSet.java 4 Nov 2002 14:46:03 -0000 1.1.2.13
@@ -17,7 +17,7 @@
import org.apache.fop.xml.UriLocalName;
import org.apache.fop.xml.XMLNamespaces;
import org.apache.fop.xml.SyncedFoXmlEventsBuffer;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.fo.pagination.FoPageSequenceMaster;
import org.apache.fop.fo.pagination.PageSequenceMaster;
@@ -102,7 +102,7 @@
*/
public FoLayoutMasterSet
(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
@@ -157,7 +157,7 @@
try {
foPageSeq =
new FoPageSequenceMaster(foTree, this, ev);
- } catch (Tree.TreeException e) {
+ } catch (TreeException e) {
throw new FOPException
("TreeException: " + e.getMessage());
}
@@ -184,7 +184,7 @@
catch (PropertyException e) {
throw new FOPException(e);
}
- catch (Tree.TreeException e) {
+ catch (TreeException e) {
throw new FOPException(e);
}
if (pageMasters.size() == 0)
1.1.2.13 +8 -8
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoPageSequenceMaster.java 30 Oct 2002 13:09:11 -0000 1.1.2.12
+++ FoPageSequenceMaster.java 4 Nov 2002 14:46:03 -0000 1.1.2.13
@@ -27,7 +27,7 @@
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.NCName;
import org.apache.fop.datatypes.Ints;
@@ -188,7 +188,7 @@
};
public FoPageSequenceMaster(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
FOPropertySets.SEQ_MASTER_SET, sparsePropsMap, sparseIndices,
@@ -241,7 +241,7 @@
public FoSinglePageMasterReference
(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
event, FOPropertySets.SEQ_MASTER_SET, s_p_m_r_PropsMap,
@@ -263,7 +263,7 @@
public FoRepeatablePageMasterReference
(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
parent, event, FOPropertySets.SEQ_MASTER_SET,
@@ -289,7 +289,7 @@
public FoRepeatablePageMasterAlternatives
(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES,
parent, event, FOPropertySets.SEQ_MASTER_SET,
@@ -322,7 +322,7 @@
public FoConditionalPageMasterReference
(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
super(foTree, FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE,
parent, event, FOPropertySets.SEQ_MASTER_SET,
1.1.2.3 +4 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java
Index: FoRegionAfter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRegionAfter.java 30 Oct 2002 13:44:03 -0000 1.1.2.2
+++ FoRegionAfter.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
@@ -16,7 +16,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
/**
* Implements the fo:simple-page-master flow object
@@ -33,7 +33,7 @@
* this node
*/
public FoRegionAfter(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, FObjectNames.REGION_AFTER, parent, event);
makeSparsePropsSet();
1.1.2.3 +4 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java
Index: FoRegionBeforeAfter.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRegionBeforeAfter.java 30 Oct 2002 13:40:47 -0000 1.1.2.2
+++ FoRegionBeforeAfter.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
@@ -20,7 +20,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.Ints;
import java.util.HashMap;
@@ -88,7 +88,7 @@
*/
public FoRegionBeforeAfter
(FOTree foTree, int foType, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET,
sparsePropsMap, sparseIndices, numProps);
1.1.2.3 +4 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java
Index: FoRegionBefore.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRegionBefore.java 30 Oct 2002 13:44:03 -0000 1.1.2.2
+++ FoRegionBefore.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
@@ -16,7 +16,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
/**
* Implements the fo:simple-page-master flow object
@@ -33,7 +33,7 @@
* this node
*/
public FoRegionBefore(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, FObjectNames.REGION_BEFORE, parent, event);
makeSparsePropsSet();
1.1.2.3 +4 -4 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java
Index: FoRegionBody.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRegionBody.java 30 Oct 2002 13:35:57 -0000 1.1.2.2
+++ FoRegionBody.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
@@ -20,7 +20,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.Ints;
@@ -89,7 +89,7 @@
* this node
*/
public FoRegionBody(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, FObjectNames.REGION_BODY, parent, event,
FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
1.1.2.3 +4 -4 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java
Index: FoRegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRegionEnd.java 30 Oct 2002 13:44:03 -0000 1.1.2.2
+++ FoRegionEnd.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
@@ -16,7 +16,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
/**
@@ -34,7 +34,7 @@
* this node
*/
public FoRegionEnd(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, FObjectNames.REGION_END, parent, event);
makeSparsePropsSet();
1.1.2.3 +4 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java
Index: FoRegionStartEnd.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRegionStartEnd.java 30 Oct 2002 13:40:47 -0000 1.1.2.2
+++ FoRegionStartEnd.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
@@ -20,7 +20,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.Ints;
import java.util.HashMap;
@@ -87,7 +87,7 @@
*/
public FoRegionStartEnd
(FOTree foTree, int foType, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET,
sparsePropsMap, sparseIndices, numProps);
1.1.2.3 +4 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStart.java
Index: FoRegionStart.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStart.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FoRegionStart.java 30 Oct 2002 13:44:03 -0000 1.1.2.2
+++ FoRegionStart.java 4 Nov 2002 14:46:03 -0000 1.1.2.3
@@ -16,7 +16,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.FoXMLEvent;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
/**
* Implements the fo:simple-page-master flow object
@@ -33,7 +33,7 @@
* this node
*/
public FoRegionStart(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, FObjectNames.REGION_START, parent, event);
makeSparsePropsSet();
1.1.2.10 +4 -4
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FoSimplePageMaster.java 30 Oct 2002 13:34:34 -0000 1.1.2.9
+++ FoSimplePageMaster.java 4 Nov 2002 14:46:03 -0000 1.1.2.10
@@ -21,7 +21,7 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.NCName;
import org.apache.fop.datatypes.Ints;
@@ -91,7 +91,7 @@
* this node
*/
public FoSimplePageMaster(FOTree foTree, FONode parent, FoXMLEvent event)
- throws Tree.TreeException, FOPException
+ throws TreeException, FOPException
{
super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
