You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pi...@apache.org on 2003/04/11 02:24:43 UTC
cvs commit: xml-fop/src/org/apache/fop/svg SVGElement.java SVGObj.java
pietsch 2003/04/10 17:24:42
Modified: . Tag: fop-0_20_2-maintain CHANGES STATUS
src/org/apache/fop/apps Tag: fop-0_20_2-maintain
FOPException.java
src/org/apache/fop/extensions Tag: fop-0_20_2-maintain
ContinuedLabel.java Destination.java
ExtensionObj.java Label.java Outline.java
src/org/apache/fop/fo Tag: fop-0_20_2-maintain
ColorProfile.java Declarations.java
FOTreeBuilder.java FObj.java FObjMixed.java
Title.java ToBeImplementedElement.java Unknown.java
UnknownXMLObj.java XMLElement.java XMLObj.java
src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
AbstractFlow.java AbstractTableBody.java
BasicLink.java BidiOverride.java Block.java
BlockContainer.java Character.java
ExternalGraphic.java Float.java Flow.java
Footnote.java FootnoteBody.java
InitialPropertySet.java Inline.java
InlineContainer.java InstreamForeignObject.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java Marker.java
MultiCase.java MultiProperties.java
MultiPropertySet.java MultiSwitch.java
MultiToggle.java PageNumber.java
PageNumberCitation.java RetrieveMarker.java
StaticContent.java Table.java TableAndCaption.java
TableBody.java TableCaption.java TableCell.java
TableColumn.java TableFooter.java TableHeader.java
TableRow.java Wrapper.java
src/org/apache/fop/fo/pagination Tag: fop-0_20_2-maintain
ConditionalPageMasterReference.java
LayoutMasterSet.java PageMasterReference.java
PageSequence.java PageSequenceMaster.java
Region.java RegionAfter.java RegionBefore.java
RegionBody.java RegionEnd.java RegionStart.java
RepeatablePageMasterAlternatives.java
RepeatablePageMasterReference.java Root.java
SimplePageMaster.java
SinglePageMasterReference.java
src/org/apache/fop/svg Tag: fop-0_20_2-maintain
SVGElement.java SVGObj.java
Log:
improved error messages by providing the document system id, line
and column number, if available.
Revision Changes Path
No revision
No revision
1.10.2.54 +3 -0 xml-fop/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/xml-fop/CHANGES,v
retrieving revision 1.10.2.53
retrieving revision 1.10.2.54
diff -u -r1.10.2.53 -r1.10.2.54
--- CHANGES 5 Mar 2003 19:02:05 -0000 1.10.2.53
+++ CHANGES 11 Apr 2003 00:24:36 -0000 1.10.2.54
@@ -1,5 +1,8 @@
==============================================================================
Done since 0.20.4 release
+- Use Locator to make system id, line and column number available to
+ FOs. Use it when throwing FOPExceptions. TBD: Use it in mesages, also
+ catch RuntimeExceptions and wrap them.
- Added PDF encryption. Available options: no printing, no copy, no
edit, no annotations.
Submitted by Patrick C. Lankswert <PL...@InsightBB.COM>
1.47.2.4 +4 -4 xml-fop/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/xml-fop/STATUS,v
retrieving revision 1.47.2.3
retrieving revision 1.47.2.4
diff -u -r1.47.2.3 -r1.47.2.4
--- STATUS 11 Nov 2002 10:26:24 -0000 1.47.2.3
+++ STATUS 11 Apr 2003 00:24:36 -0000 1.47.2.4
@@ -4,16 +4,16 @@
Active committers
+Arved Sandstrom
Bertrand Delacretaz
Christian Geisert (release coordinator)
-Karen Lease
-Keiron Liddle
Jeremias Maerki
Joerg Pietschmann
-Arved Sandstrom
+Karen Lease
+Keiron Liddle
Oleg Tkachenko
Peter B. West
-
+Victor Mote
Emeritus committers
(They have not committed anything for six months, and so are considered
No revision
No revision
1.9.2.2 +56 -4 xml-fop/src/org/apache/fop/apps/Attic/FOPException.java
Index: FOPException.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/FOPException.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- FOPException.java 25 Feb 2003 10:18:32 -0000 1.9.2.1
+++ FOPException.java 11 Apr 2003 00:24:36 -0000 1.9.2.2
@@ -61,6 +61,9 @@
private static final String EXCEPTION_SEPARATOR = "\n---------\n";
private Throwable _exception;
+ private String systemId;
+ private int line;
+ private int column;
/**
* create a new FOP Exception
@@ -69,16 +72,48 @@
*/
public FOPException(String message) {
super(message);
+ systemId = null;
+ line = -1;
+ column = -1;
+ }
+
+ public FOPException(String message, String systemId, int line, int column) {
+ super(message);
+ this.systemId = systemId;
+ this.line = line;
+ this.column = column;
}
public FOPException(Throwable e) {
super(e.getMessage());
setException(e);
+ systemId = null;
+ line = -1;
+ column = -1;
+ }
+
+ public FOPException(Throwable e, String systemId, int line, int column) {
+ super(e.getMessage());
+ setException(e);
+ this.systemId = systemId;
+ this.line = line;
+ this.column = column;
}
public FOPException(String message, Throwable e) {
super(message);
setException(e);
+ systemId = null;
+ line = -1;
+ column = -1;
+ }
+
+ public FOPException(String message, Throwable e, String systemId, int line, int column) {
+ super(message);
+ setException(e);
+ this.systemId = systemId;
+ this.line = line;
+ this.column = column;
}
protected void setException(Throwable t) {
@@ -89,6 +124,16 @@
return _exception;
}
+ public void setLocation(String systemId, int line, int column) {
+ this.systemId = systemId;
+ this.line = line;
+ this.column = column;
+ }
+
+ public boolean isLocationSet() {
+ return line>=0;
+ }
+
protected Throwable getRootException() {
Throwable result = _exception;
@@ -105,7 +150,14 @@
return null;
}
-
+ public String getMessage() {
+ if (line>=0) {
+ return systemId+':'+line+':'+column+' '+super.getMessage();
+ } else {
+ return super.getMessage();
+ }
+ }
+
public void printStackTrace() {
synchronized (System.err) {
super.printStackTrace();
@@ -128,7 +180,7 @@
_exception.printStackTrace(stream);
}
if (getRootException() != null) {
- System.err.println(EXCEPTION_SEPARATOR);
+ stream.println(EXCEPTION_SEPARATOR);
getRootException().printStackTrace(stream);
}
}
@@ -142,7 +194,7 @@
_exception.printStackTrace(writer);
}
if (getRootException() != null) {
- System.err.println(EXCEPTION_SEPARATOR);
+ writer.println(EXCEPTION_SEPARATOR);
getRootException().printStackTrace(writer);
}
}
No revision
No revision
1.1.2.3 +10 -6 xml-fop/src/org/apache/fop/extensions/Attic/ContinuedLabel.java
Index: ContinuedLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/ContinuedLabel.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ContinuedLabel.java 25 Feb 2003 11:05:52 -0000 1.1.2.2
+++ ContinuedLabel.java 11 Apr 2003 00:24:37 -0000 1.1.2.3
@@ -50,6 +50,7 @@
*/
package org.apache.fop.extensions;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.IDReferences;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FONode;
@@ -57,7 +58,6 @@
import org.apache.fop.fo.Status;
import org.apache.fop.layout.Area;
import org.apache.fop.layout.AreaTree;
-import org.apache.fop.apps.FOPException;
/**
* Implement continued labels for table header/footer.
@@ -68,8 +68,11 @@
private FObj containingTable=null;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent, PropertyList propertyList) {
- return new ContinuedLabel(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ContinuedLabel(parent, propertyList,
+ systemId, line, column);
}
}
@@ -78,8 +81,9 @@
return new ContinuedLabel.Maker();
}
- public ContinuedLabel(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public ContinuedLabel(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
// Find ancestor table
for (; parent!=null ; parent = parent.getParent()) {
1.1.2.3 +114 -8 xml-fop/src/org/apache/fop/extensions/Attic/Destination.java
Index: Destination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/Destination.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Destination.java 25 Feb 2003 11:05:52 -0000 1.1.2.2
+++ Destination.java 11 Apr 2003 00:24:37 -0000 1.1.2.3
@@ -1,8 +1,114 @@
-/*
* $Id$
* ============================================================================
* The Apache Software License, Version 1.1
* ============================================================================
*
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* 3. The end-user documentation included with the redistribution, if any, must
* include the following acknowledgment: "This product includes software
* developed by the Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself, if
* and wherever such third-party acknowledgments normally appear.
*
* 4. The names "FOP" and "Apache Software Foundation" must not be used to
* endorse or promote products derived from this software without prior
* written permission. For written permission, please contact
* apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache", nor may
* "Apache" appear in their name, without prior written permission of the
* Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
* DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ============================================================================
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by
* James Tauber <jt...@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.extensions;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
-/**
* Provides support for PDF destinations, which allow external
* files to link into a particular place within the generated
* document.
*
* @author Stefan Wachter (based on work by Lloyd McKenzie)
*/
-public class Destination extends ExtensionObj {
- private String internalDestination;
private String destinationName;
- public static class Maker extends FObj.Maker {
public FObj make(FObj parent, PropertyList propertyList) {
return new Destination(parent, propertyList);
}
}
- public static FObj.Maker maker() {
return new Destination.Maker();
}
- public Destination(FObj parent, PropertyList propertyList) {
super(parent, propertyList);
internalDestination = properties.get("internal-destination").getString();
if (internalDestination.equals("")) {
log.warn("fox:destination requires an internal-destination.");
}
destinationName = properties.get("destination-name").getString();
}
- /**
* Gets the name under which the destination may be referenced.
*/
public String getDestinationName() {
// if no destination name is set then the internal destination is used as
// destination name
return !"".equals(destinationName) ? destinationName : internalDestination;
}
/**
* Gets the internal destination. The internal destination must be equal
* to the value of an id-attribute of some xsl:fo-Element.
*/
public String getInternalDestination() {
return internalDestination;
}
public String getName() {
return "fox:destination";
}
}
\ No newline at end of file
+/*
+ * $Id$
+ * ============================================================================
+ * The Apache Software License, Version 1.1
+ * ============================================================================
+ *
+ * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if any, must
+ * include the following acknowledgment: "This product includes software
+ * developed by the Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself, if
+ * and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "FOP" and "Apache Software Foundation" must not be used to
+ * endorse or promote products derived from this software without prior
+ * written permission. For written permission, please contact
+ * apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache", nor may
+ * "Apache" appear in their name, without prior written permission of the
+ * Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ============================================================================
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * on behalf of the Apache Software Foundation and was originally created by
+ * James Tauber <jt...@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+ */
+package org.apache.fop.extensions;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.PropertyList;
+
+/**
+ * Provides support for PDF destinations, which allow external
+ * files to link into a particular place within the generated
+ * document.
+ *
+ * @author Stefan Wachter (based on work by Lloyd McKenzie)
+ */
+
+public class Destination extends ExtensionObj {
+
+ private String internalDestination;
+ private String destinationName;
+
+ public static class Maker extends FObj.Maker {
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Destination(parent, propertyList,
+ systemId, line, column);
+ }
+ }
+
+ public static FObj.Maker maker() {
+ return new Destination.Maker();
+ }
+
+ public Destination(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
+ internalDestination = properties.get("internal-destination").getString();
+ if (internalDestination.equals("")) {
+ log.warn("fox:destination requires an internal-destination.");
+ }
+ destinationName = properties.get("destination-name").getString();
+ }
+
+ /**
+ * Gets the name under which the destination may be referenced.
+ */
+ public String getDestinationName() {
+ // if no destination name is set then the internal destination is used as
+ // destination name
+ return !"".equals(destinationName) ? destinationName : internalDestination;
+ }
+
+ /**
+ * Gets the internal destination. The internal destination must be equal
+ * to the value of an id-attribute of some xsl:fo-Element.
+ */
+ public String getInternalDestination() {
+ return internalDestination;
+ }
+
+ public String getName() {
+ return "fox:destination";
+ }
+
+}
1.2.2.3 +4 -3 xml-fop/src/org/apache/fop/extensions/Attic/ExtensionObj.java
Index: ExtensionObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/ExtensionObj.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ExtensionObj.java 25 Feb 2003 11:05:53 -0000 1.2.2.2
+++ ExtensionObj.java 11 Apr 2003 00:24:37 -0000 1.2.2.3
@@ -64,8 +64,9 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- public ExtensionObj(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public ExtensionObj(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
/**
1.2.2.6 +9 -5 xml-fop/src/org/apache/fop/extensions/Attic/Label.java
Index: Label.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/Label.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- Label.java 25 Feb 2003 11:05:53 -0000 1.2.2.5
+++ Label.java 11 Apr 2003 00:24:37 -0000 1.2.2.6
@@ -50,6 +50,7 @@
*/
package org.apache.fop.extensions;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.*;
@@ -62,8 +63,10 @@
private StringBuffer textBuffer;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent, PropertyList propertyList) {
- return new Label(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Label(parent, propertyList, systemId, line, column);
}
}
@@ -72,8 +75,9 @@
return new Label.Maker();
}
- public Label(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public Label(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
protected void addCharacters(char data[], int start, int length) {
1.4.2.6 +12 -6 xml-fop/src/org/apache/fop/extensions/Attic/Outline.java
Index: Outline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/extensions/Attic/Outline.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- Outline.java 25 Feb 2003 11:05:53 -0000 1.4.2.5
+++ Outline.java 11 Apr 2003 00:24:37 -0000 1.4.2.6
@@ -50,6 +50,7 @@
*/
package org.apache.fop.extensions;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.*;
import java.util.*;
@@ -77,8 +78,10 @@
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent, PropertyList propertyList) {
- return new Outline(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Outline(parent, propertyList, systemId, line, column);
}
}
@@ -87,8 +90,9 @@
return new Outline.Maker();
}
- public Outline(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public Outline(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
_internalDestination =
this.properties.get("internal-destination").getString();
@@ -135,7 +139,9 @@
}
public Label getLabel() {
- return _label == null ? new Label(this, this.properties) : _label;
+ return _label == null ? new Label(this, this.properties,
+ systemId, line, column)
+ : _label;
}
public ArrayList getOutlines() {
No revision
No revision
1.4.2.6 +10 -7 xml-fop/src/org/apache/fop/fo/Attic/ColorProfile.java
Index: ColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ColorProfile.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- ColorProfile.java 25 Feb 2003 12:56:54 -0000 1.4.2.5
+++ ColorProfile.java 11 Apr 2003 00:24:37 -0000 1.4.2.6
@@ -56,9 +56,11 @@
public class ColorProfile extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ColorProfile(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ColorProfile(parent, propertyList,
+ systemId, line, column);
}
}
@@ -66,9 +68,10 @@
return new ColorProfile.Maker();
}
- protected ColorProfile(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected ColorProfile(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
log.warn("color profile not implemented");
// this.properties.get("src");
// this.properties.get("color-profile-name");
1.3.2.6 +8 -7 xml-fop/src/org/apache/fop/fo/Attic/Declarations.java
Index: Declarations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Declarations.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- Declarations.java 25 Feb 2003 12:56:54 -0000 1.3.2.5
+++ Declarations.java 11 Apr 2003 00:24:37 -0000 1.3.2.6
@@ -56,9 +56,10 @@
public class Declarations extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Declarations(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Declarations(parent, propertyList, systemId, line, column);
}
}
@@ -66,9 +67,9 @@
return new Declarations.Maker();
}
- protected Declarations(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected Declarations(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) throws FOPException {
+ super(parent, propertyList, systemId, line, column);
log.warn("declarations not implemented");
}
1.30.2.8 +22 -4 xml-fop/src/org/apache/fop/fo/Attic/FOTreeBuilder.java
Index: FOTreeBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTreeBuilder.java,v
retrieving revision 1.30.2.7
retrieving revision 1.30.2.8
diff -u -r1.30.2.7 -r1.30.2.8
--- FOTreeBuilder.java 25 Feb 2003 12:56:54 -0000 1.30.2.7
+++ FOTreeBuilder.java 11 Apr 2003 00:24:37 -0000 1.30.2.8
@@ -63,6 +63,7 @@
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.SAXException;
import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
// Java
import java.util.HashMap;
@@ -118,12 +119,16 @@
private Logger log;
+ private Locator locator;
+
public FOTreeBuilder() {}
public void setLogger(Logger logger) {
log = logger;
}
+
+
public void setStreamRenderer(StreamRenderer streamRenderer) {
this.streamRenderer = streamRenderer;
}
@@ -239,6 +244,9 @@
streamRenderer.stopRenderer();
}
+ public void setDocumentLocator(Locator locator) {
+ this.locator = locator;
+ }
/**
* SAX Handler for the start of an element
*/
@@ -260,6 +268,14 @@
(PropertyListBuilder)this.propertylistTable.get(uri);
boolean foreignXML = false;
+ String systemId=null;
+ int line = -1;
+ int column = -1;
+ if (locator!=null) {
+ systemId = locator.getSystemId();
+ line = locator.getLineNumber();
+ column = locator.getColumnNumber();
+ }
if (fobjMaker == null) {
String fullName = uri + "^" + localName;
if (!this.unknownFOs.containsKey(fullName)) {
@@ -287,11 +303,12 @@
list = new DirectPropertyListBuilder.AttrPropertyList(attlist);
} else {
if(currentFObj == null) {
- throw new FOPException("Invalid XML or missing namespace");
+ throw new FOPException("Invalid XML or missing namespace",
+ systemId, line, column);
}
list = currentFObj.properties;
}
- fobj = fobjMaker.make(currentFObj, list);
+ fobj = fobjMaker.make(currentFObj, list, systemId, line, column);
fobj.setLogger(log);
} catch (FOPException e) {
throw new SAXException(e);
@@ -302,7 +319,8 @@
if (!fobj.getName().equals("fo:root")) {
throw new SAXException(new FOPException("Root element must"
+ " be root, not "
- + fobj.getName()));
+ + fobj.getName(),
+ systemId, line, column));
}
} else if(!(fobj instanceof org.apache.fop.fo.pagination.PageSequence)) {
currentFObj.addChild(fobj);
1.20.2.9 +15 -6 xml-fop/src/org/apache/fop/fo/Attic/FObj.java
Index: FObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObj.java,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
diff -u -r1.20.2.8 -r1.20.2.9
--- FObj.java 25 Feb 2003 12:56:54 -0000 1.20.2.8
+++ FObj.java 11 Apr 2003 00:24:37 -0000 1.20.2.9
@@ -64,22 +64,30 @@
public abstract class FObj extends FONode {
public abstract static class Maker {
- public abstract FObj make(FObj parent,
- PropertyList propertyList) throws FOPException;
+ public abstract FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException;
}
// protected PropertyList properties;
public PropertyList properties;
protected PropertyManager propMgr;
+ protected String systemId;
+ protected int line;
+ protected int column;
// markers
private HashSet markerClassNames;
- protected FObj(FObj parent, PropertyList propertyList) {
+ protected FObj(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
super(parent);
this.properties = propertyList; // TO BE REMOVED!!!
propertyList.setFObj(this);
this.propMgr = makePropertyManager(propertyList);
+ this.systemId = systemId;
+ this.line = line;
+ this.column = column;
setWritingMode();
}
@@ -199,7 +207,7 @@
FONode child = (FONode)children.get(i);
if (!child.mayPrecedeMarker()) {
throw new FOPException("A fo:marker must be an initial child of '"
- + getName()+"'");
+ + getName()+"'", systemId, line, column);
}
}
}
@@ -211,7 +219,8 @@
} else {
throw new FOPException("marker-class-name '"
+ markerClassName
- + "' already exists for this parent");
+ + "' already exists for this parent",
+ systemId, line, column);
}
}
1.12.2.12 +15 -5 xml-fop/src/org/apache/fop/fo/Attic/FObjMixed.java
Index: FObjMixed.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjMixed.java,v
retrieving revision 1.12.2.11
retrieving revision 1.12.2.12
diff -u -r1.12.2.11 -r1.12.2.12
--- FObjMixed.java 25 Feb 2003 12:56:54 -0000 1.12.2.11
+++ FObjMixed.java 11 Apr 2003 00:24:37 -0000 1.12.2.12
@@ -65,9 +65,10 @@
private StringBuffer textBuffer;
- protected FObjMixed(FObj parent, PropertyList propertyList)
+ protected FObjMixed(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
textState = propMgr.getTextDecoration(parent);
}
@@ -110,8 +111,17 @@
String id = prop.getString();
if (this.marker == START) {
- if (area.getIDReferences() != null)
- area.getIDReferences().createID(id);
+ if (area.getIDReferences() != null) {
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
+ }
this.marker = 0;
}
1.4.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/Attic/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Title.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- Title.java 25 Feb 2003 12:56:55 -0000 1.4.2.3
+++ Title.java 11 Apr 2003 00:24:37 -0000 1.4.2.4
@@ -61,9 +61,10 @@
public class Title extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Title(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Title(parent, propertyList, systemId, line, column);
}
}
@@ -72,9 +73,10 @@
return new Title.Maker();
}
- protected Title(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected Title(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.3.2.4 +4 -3 xml-fop/src/org/apache/fop/fo/Attic/ToBeImplementedElement.java
Index: ToBeImplementedElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ToBeImplementedElement.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- ToBeImplementedElement.java 25 Feb 2003 12:56:55 -0000 1.3.2.3
+++ ToBeImplementedElement.java 11 Apr 2003 00:24:37 -0000 1.3.2.4
@@ -58,9 +58,10 @@
*/
public abstract class ToBeImplementedElement extends FObj {
- protected ToBeImplementedElement(FObj parent, PropertyList propertyList)
+ protected ToBeImplementedElement(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
}
public int layout(Area area) throws FOPException {
1.2.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/Attic/Unknown.java
Index: Unknown.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/Unknown.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- Unknown.java 25 Feb 2003 12:56:55 -0000 1.2.2.3
+++ Unknown.java 11 Apr 2003 00:24:37 -0000 1.2.2.4
@@ -63,9 +63,10 @@
public class Unknown extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Unknown(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Unknown(parent, propertyList, systemId, line, column);
}
}
@@ -74,9 +75,10 @@
return new Unknown.Maker();
}
- protected Unknown(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected Unknown(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.2.2.4 +10 -6 xml-fop/src/org/apache/fop/fo/Attic/UnknownXMLObj.java
Index: UnknownXMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/UnknownXMLObj.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- UnknownXMLObj.java 25 Feb 2003 12:56:55 -0000 1.2.2.3
+++ UnknownXMLObj.java 11 Apr 2003 00:24:37 -0000 1.2.2.4
@@ -76,9 +76,11 @@
*
* @return the unknown xml object
*/
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new UnknownXMLObj(parent, propertyList, space, tag);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new UnknownXMLObj(parent, propertyList, space, tag,
+ systemId, line, column);
}
}
@@ -97,8 +99,10 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- protected UnknownXMLObj(FObj parent, PropertyList propertyList, String namespace, String name) {
- super(parent, propertyList, name);
+ protected UnknownXMLObj(FObj parent, PropertyList propertyList,
+ String namespace, String name,
+ String systemId, int line, int column) {
+ super(parent, propertyList, name, systemId, line, column);
this.namespace = namespace;
}
1.1.2.4 +11 -7 xml-fop/src/org/apache/fop/fo/Attic/XMLElement.java
Index: XMLElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/XMLElement.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XMLElement.java 25 Feb 2003 12:56:55 -0000 1.1.2.3
+++ XMLElement.java 11 Apr 2003 00:24:37 -0000 1.1.2.4
@@ -79,9 +79,11 @@
*
* @return the XML object
*/
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new XMLElement(parent, propertyList, tag);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new XMLElement(parent, propertyList, tag,
+ systemId, line, column);
}
}
@@ -100,8 +102,9 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- public XMLElement(FObj parent, PropertyList propertyList, String tag) {
- super(parent, propertyList, tag);
+ public XMLElement(FObj parent, PropertyList propertyList, String tag,
+ String systemId, int line, int column) {
+ super(parent, propertyList, tag, systemId, line, column);
init();
}
@@ -120,7 +123,8 @@
if (!(area instanceof ForeignObjectArea)) {
// this is an error
- throw new FOPException("XML not in fo:instream-foreign-object");
+ throw new FOPException("XML not in fo:instream-foreign-object",
+ systemId, line, column);
}
/* return status */
1.2.2.7 +4 -3 xml-fop/src/org/apache/fop/fo/Attic/XMLObj.java
Index: XMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/XMLObj.java,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -r1.2.2.6 -r1.2.2.7
--- XMLObj.java 25 Feb 2003 12:56:55 -0000 1.2.2.6
+++ XMLObj.java 11 Apr 2003 00:24:37 -0000 1.2.2.7
@@ -79,8 +79,9 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- public XMLObj(FObj parent, PropertyList propertyList, String tag) {
- super(parent, propertyList);
+ public XMLObj(FObj parent, PropertyList propertyList, String tag,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
tagName = tag;
}
No revision
No revision
1.1.2.6 +7 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/AbstractFlow.java
Index: AbstractFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/AbstractFlow.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbstractFlow.java 25 Feb 2003 12:57:00 -0000 1.1.2.5
+++ AbstractFlow.java 11 Apr 2003 00:24:38 -0000 1.1.2.6
@@ -90,15 +90,15 @@
private int _status = Status.AREA_FULL_NONE;
- protected AbstractFlow(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected AbstractFlow(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (parent.getName().equals("fo:page-sequence")) {
this.pageSequence = (PageSequence)parent;
} else {
throw new FOPException("flow must be child of page-sequence, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
}
@@ -124,7 +124,8 @@
int numChildren = this.children.size();
if (numChildren == 0) {
- throw new FOPException("fo:flow must contain block-level children");
+ throw new FOPException("fo:flow must contain block-level children",
+ systemId, line, column);
}
for (int i = this.marker; i < numChildren; i++) {
FObj fo = (FObj)children.get(i);
1.1.2.9 +16 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/AbstractTableBody.java
Index: AbstractTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/AbstractTableBody.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractTableBody.java 25 Feb 2003 12:57:00 -0000 1.1.2.8
+++ AbstractTableBody.java 11 Apr 2003 00:24:38 -0000 1.1.2.9
@@ -71,12 +71,14 @@
AreaContainer areaContainer;
- public AbstractTableBody(FObj parent, PropertyList propertyList)
+ public AbstractTableBody(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
if (!(parent instanceof Table)) {
throw new FOPException("A table body must be child of fo:table,"
- + " not " + parent.getName());
+ + " not " + parent.getName(),
+ systemId, line, column);
}
}
@@ -124,7 +126,15 @@
this.properties.get("space-after.optimum").getLength().mvalue();
this.id = this.properties.get("id").getString();
- area.getIDReferences().createID(id);
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
if (area instanceof BlockArea) {
area.end();
@@ -186,7 +196,7 @@
continue;
}
if (!(child instanceof TableRow)) {
- throw new FOPException("Currently only Table Rows are supported in table body, header and footer");
+ throw new FOPException("Currently only Table Rows are supported in table body, header and footer", systemId, line, column);
}
TableRow row = (TableRow)child;
1.8.2.8 +19 -10 xml-fop/src/org/apache/fop/fo/flow/Attic/BasicLink.java
Index: BasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/BasicLink.java,v
retrieving revision 1.8.2.7
retrieving revision 1.8.2.8
diff -u -r1.8.2.7 -r1.8.2.8
--- BasicLink.java 25 Feb 2003 12:57:00 -0000 1.8.2.7
+++ BasicLink.java 11 Apr 2003 00:24:38 -0000 1.8.2.8
@@ -59,9 +59,10 @@
public class BasicLink extends Inline {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new BasicLink(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new BasicLink(parent, propertyList, systemId, line, column);
}
}
@@ -69,9 +70,9 @@
return new BasicLink.Maker();
}
- public BasicLink(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ public BasicLink(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -132,13 +133,21 @@
}
}
} else {
- throw new FOPException("internal-destination or external-destination must be specified in basic-link");
+ throw new FOPException("internal-destination or external-destination must be specified in basic-link", systemId, line, column);
}
if (this.marker == START) {
// initialize id
String id = this.properties.get("id").getString();
- area.getIDReferences().initializeID(id, area);
+ try {
+ area.getIDReferences().initializeID(id, area);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
this.marker = 0;
}
@@ -157,7 +166,7 @@
//System.err.println("Using currentColumnArea as AC for link");
}
if (ac == null) {
- throw new FOPException("Couldn't get ancestor AreaContainer when processing basic-link");
+ throw new FOPException("Couldn't get ancestor AreaContainer when processing basic-link", systemId, line, column);
}
int numChildren = this.children.size();
1.4.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/BidiOverride.java
Index: BidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/BidiOverride.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- BidiOverride.java 25 Feb 2003 12:57:00 -0000 1.4.2.3
+++ BidiOverride.java 11 Apr 2003 00:24:38 -0000 1.4.2.4
@@ -60,9 +60,10 @@
public class BidiOverride extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new BidiOverride(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new BidiOverride(parent, propertyList, systemId, line, column);
}
}
@@ -70,9 +71,10 @@
return new BidiOverride.Maker();
}
- protected BidiOverride(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected BidiOverride(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.41.2.18 +19 -9 xml-fop/src/org/apache/fop/fo/flow/Attic/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Block.java,v
retrieving revision 1.41.2.17
retrieving revision 1.41.2.18
diff -u -r1.41.2.17 -r1.41.2.18
--- Block.java 6 Mar 2003 23:24:40 -0000 1.41.2.17
+++ Block.java 11 Apr 2003 00:24:38 -0000 1.41.2.18
@@ -73,9 +73,10 @@
public class Block extends FObjMixed {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Block(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Block(parent, propertyList, systemId, line, column);
}
}
@@ -108,10 +109,10 @@
//Added to see how long it's been since nothing was laid out.
int noLayoutCount = 0;
- public Block(FObj parent, PropertyList propertyList)
+ public Block(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
-
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
this.span = this.properties.get("span").getEnum();
}
@@ -138,7 +139,8 @@
if (noLayoutCount > infLoopThreshhold) {
throw new FOPException(
"No meaningful layout in block after many attempts. "+
- "Infinite loop is assumed. Processing halted.");
+ "Infinite loop is assumed. Processing halted.",
+ systemId, line, column);
}
// log.error(" b:LAY[" + marker + "] ");
@@ -197,7 +199,15 @@
}
if (area.getIDReferences() != null) {
- area.getIDReferences().createID(id);
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
}
this.marker = 0;
1.11.2.8 +19 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/BlockContainer.java,v
retrieving revision 1.11.2.7
retrieving revision 1.11.2.8
diff -u -r1.11.2.7 -r1.11.2.8
--- BlockContainer.java 25 Feb 2003 12:57:00 -0000 1.11.2.7
+++ BlockContainer.java 11 Apr 2003 00:24:38 -0000 1.11.2.8
@@ -73,9 +73,11 @@
AreaContainer areaContainer;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new BlockContainer(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new BlockContainer(parent, propertyList,
+ systemId, line, column);
}
}
@@ -86,9 +88,10 @@
PageSequence pageSequence;
- protected BlockContainer(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected BlockContainer(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
this.span = this.properties.get("span").getEnum();
}
@@ -138,7 +141,15 @@
// initialize id
String id = this.properties.get("id").getString();
- area.getIDReferences().initializeID(id, area);
+ try {
+ area.getIDReferences().initializeID(id, area);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
}
boolean prevChildMustKeepWithNext = false;
1.12.2.4 +17 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Character.java,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -r1.12.2.3 -r1.12.2.4
--- Character.java 25 Feb 2003 12:57:00 -0000 1.12.2.3
+++ Character.java 11 Apr 2003 00:24:38 -0000 1.12.2.4
@@ -78,9 +78,10 @@
public static final int DOESNOT_FIT = 1;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Character(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Character(parent, propertyList, systemId, line, column);
}
}
@@ -88,8 +89,9 @@
return new Character.Maker();
}
- public Character(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public Character(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -171,7 +173,15 @@
// initialize id
String id = this.properties.get("id").getString();
- blockArea.getIDReferences().initializeID(id, blockArea);
+ try {
+ blockArea.getIDReferences().initializeID(id, blockArea);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
LineArea la = blockArea.getCurrentLineArea();
if (la == null) {
1.13.2.7 +18 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/ExternalGraphic.java,v
retrieving revision 1.13.2.6
retrieving revision 1.13.2.7
diff -u -r1.13.2.6 -r1.13.2.7
--- ExternalGraphic.java 25 Feb 2003 12:57:00 -0000 1.13.2.6
+++ ExternalGraphic.java 11 Apr 2003 00:24:38 -0000 1.13.2.7
@@ -77,9 +77,11 @@
ImageArea imageArea;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ExternalGraphic(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ExternalGraphic(parent, propertyList,
+ systemId, line, column);
}
}
@@ -87,8 +89,9 @@
return new ExternalGraphic.Maker();
}
- public ExternalGraphic(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public ExternalGraphic(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -159,7 +162,15 @@
this.id = this.properties.get("id").getString();
- area.getIDReferences().createID(id);
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
/*
* if (area instanceof BlockArea) {
* area.end();
1.4.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/Float.java
Index: Float.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Float.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- Float.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ Float.java 11 Apr 2003 00:24:38 -0000 1.4.2.4
@@ -60,9 +60,10 @@
public class Float extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Float(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Float(parent, propertyList, systemId, line, column);
}
}
@@ -71,9 +72,10 @@
return new Float.Maker();
}
- protected Float(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected Float(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.24.2.5 +8 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Flow.java,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -u -r1.24.2.4 -r1.24.2.5
--- Flow.java 25 Feb 2003 12:57:01 -0000 1.24.2.4
+++ Flow.java 11 Apr 2003 00:24:38 -0000 1.24.2.5
@@ -57,9 +57,10 @@
public class Flow extends AbstractFlow {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Flow(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Flow(parent, propertyList, systemId, line, column);
}
}
@@ -67,9 +68,9 @@
return new Flow.Maker();
}
- protected Flow(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected Flow(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) throws FOPException {
+ super(parent, propertyList, systemId, line, column);
setFlowName(getProperty("flow-name").getString());
pageSequence.addFlow(this);
}
1.6.2.7 +8 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/Footnote.java
Index: Footnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Footnote.java,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -r1.6.2.6 -r1.6.2.7
--- Footnote.java 6 Mar 2003 23:55:30 -0000 1.6.2.6
+++ Footnote.java 11 Apr 2003 00:24:38 -0000 1.6.2.7
@@ -61,9 +61,10 @@
public class Footnote extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Footnote(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Footnote(parent, propertyList, systemId, line, column);
}
}
@@ -72,9 +73,9 @@
return new Footnote.Maker();
}
- public Footnote(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ public Footnote(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.6.2.7 +10 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FootnoteBody.java,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -r1.6.2.6 -r1.6.2.7
--- FootnoteBody.java 25 Feb 2003 12:57:01 -0000 1.6.2.6
+++ FootnoteBody.java 11 Apr 2003 00:24:38 -0000 1.6.2.7
@@ -67,9 +67,11 @@
int textIndent;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new FootnoteBody(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new FootnoteBody(parent, propertyList,
+ systemId, line, column);
}
}
@@ -78,9 +80,10 @@
return new FootnoteBody.Maker();
}
- public FootnoteBody(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ public FootnoteBody(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
this.areaClass = AreaClass.setAreaClass(AreaClass.XSL_FOOTNOTE);
}
1.4.2.4 +10 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/InitialPropertySet.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- InitialPropertySet.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ InitialPropertySet.java 11 Apr 2003 00:24:38 -0000 1.4.2.4
@@ -60,9 +60,11 @@
public class InitialPropertySet extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new InitialPropertySet(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new InitialPropertySet(parent, propertyList,
+ systemId, line, column);
}
}
@@ -71,9 +73,10 @@
return new InitialPropertySet.Maker();
}
- protected InitialPropertySet(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ protected InitialPropertySet(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.8.2.9 +10 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Inline.java,v
retrieving revision 1.8.2.8
retrieving revision 1.8.2.9
diff -u -r1.8.2.8 -r1.8.2.9
--- Inline.java 25 Feb 2003 12:57:01 -0000 1.8.2.8
+++ Inline.java 11 Apr 2003 00:24:38 -0000 1.8.2.9
@@ -58,9 +58,10 @@
public class Inline extends FObjMixed {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Inline(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Inline(parent, propertyList, systemId, line, column);
}
}
@@ -69,12 +70,13 @@
return new Inline.Maker();
}
- public Inline(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ public Inline(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (parent.getName().equals("fo:flow")) {
throw new FOPException("inline formatting objects cannot"
- + " be directly under flow");
+ + " be directly under flow",
+ systemId, line, column);
}
// Common Accessibility Properties
1.4.2.4 +10 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/InlineContainer.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- InlineContainer.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ InlineContainer.java 11 Apr 2003 00:24:38 -0000 1.4.2.4
@@ -60,9 +60,11 @@
public class InlineContainer extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new InlineContainer(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new InlineContainer(parent, propertyList,
+ systemId, line, column);
}
}
@@ -70,9 +72,10 @@
return new InlineContainer.Maker();
}
- protected InlineContainer(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected InlineContainer(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
// Common Border, Padding, and Background Properties
BorderAndPadding bap = propMgr.getBorderAndPadding();
1.14.2.7 +19 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/InstreamForeignObject.java,v
retrieving revision 1.14.2.6
retrieving revision 1.14.2.7
diff -u -r1.14.2.6 -r1.14.2.7
--- InstreamForeignObject.java 25 Feb 2003 12:57:01 -0000 1.14.2.6
+++ InstreamForeignObject.java 11 Apr 2003 00:24:38 -0000 1.14.2.7
@@ -73,9 +73,11 @@
*
* @return the SVG object
*/
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new InstreamForeignObject(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new InstreamForeignObject(parent, propertyList,
+ systemId, line, column);
}
}
@@ -113,8 +115,9 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- public InstreamForeignObject(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public InstreamForeignObject(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -206,7 +209,15 @@
this.scaling = this.properties.get("scaling").getEnum();
- area.getIDReferences().createID(id);
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
if (this.areaCurrent == null) {
this.areaCurrent =
new ForeignObjectArea(propMgr.getFontState(area.getFontInfo()),
@@ -229,7 +240,7 @@
int numChildren = this.children.size();
if (numChildren > 1) {
- throw new FOPException("Only one child element is allowed in an instream-foreign-object");
+ throw new FOPException("Only one child element is allowed in an instream-foreign-object", systemId, line, column);
}
/* layout foreign object */
if (this.children.size() > 0) {
1.13.2.7 +19 -9 xml-fop/src/org/apache/fop/fo/flow/Attic/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Leader.java,v
retrieving revision 1.13.2.6
retrieving revision 1.13.2.7
diff -u -r1.13.2.6 -r1.13.2.7
--- Leader.java 25 Feb 2003 12:57:01 -0000 1.13.2.6
+++ Leader.java 11 Apr 2003 00:24:38 -0000 1.13.2.7
@@ -68,9 +68,10 @@
public class Leader extends FObjMixed {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Leader(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Leader(parent, propertyList, systemId, line, column);
}
}
@@ -79,9 +80,10 @@
return new Leader.Maker();
}
- public Leader(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ public Leader(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -185,8 +187,16 @@
// initialize id
String id = this.properties.get("id").getString();
- blockArea.getIDReferences().initializeID(id, blockArea);
-
+ try {
+ blockArea.getIDReferences().initializeID(id, blockArea);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
+
// adds leader to blockarea, there the leaderArea is generated
int succeeded = addLeader(blockArea,
propMgr.getFontState(area.getFontInfo()),
1.21.2.9 +18 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/ListBlock.java,v
retrieving revision 1.21.2.8
retrieving revision 1.21.2.9
diff -u -r1.21.2.8 -r1.21.2.9
--- ListBlock.java 25 Feb 2003 12:57:01 -0000 1.21.2.8
+++ ListBlock.java 11 Apr 2003 00:24:38 -0000 1.21.2.9
@@ -59,9 +59,11 @@
public class ListBlock extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ListBlock(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ListBlock(parent, propertyList,
+ systemId, line, column);
}
}
@@ -81,8 +83,9 @@
int spaceAfter;
int spaceBetweenListRows = 0;
- public ListBlock(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public ListBlock(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -149,7 +152,15 @@
// initialize id
String id = this.properties.get("id").getString();
- area.getIDReferences().initializeID(id, area);
+ try {
+ area.getIDReferences().initializeID(id, area);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
}
BlockArea blockArea =
1.16.2.8 +19 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/ListItem.java,v
retrieving revision 1.16.2.7
retrieving revision 1.16.2.8
diff -u -r1.16.2.7 -r1.16.2.8
--- ListItem.java 25 Feb 2003 12:57:01 -0000 1.16.2.7
+++ ListItem.java 11 Apr 2003 00:24:38 -0000 1.16.2.8
@@ -59,9 +59,10 @@
public class ListItem extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ListItem(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ListItem(parent, propertyList, systemId, line, column);
}
}
@@ -82,8 +83,9 @@
String id;
BlockArea blockArea;
- public ListItem(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public ListItem(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -127,7 +129,15 @@
this.properties.get("space-after.optimum").getLength().mvalue();
this.id = this.properties.get("id").getString();
- area.getIDReferences().createID(id);
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
this.marker = 0;
}
@@ -169,7 +179,8 @@
int numChildren = this.children.size();
if (numChildren != 2) {
- throw new FOPException("list-item must have exactly two children");
+ throw new FOPException("list-item must have exactly two children",
+ systemId, line, column);
}
ListItemLabel label = (ListItemLabel)children.get(0);
ListItemBody body = (ListItemBody)children.get(1);
1.11.2.6 +18 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/ListItemBody.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- ListItemBody.java 25 Feb 2003 12:57:01 -0000 1.11.2.5
+++ ListItemBody.java 11 Apr 2003 00:24:38 -0000 1.11.2.6
@@ -58,9 +58,11 @@
public class ListItemBody extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ListItemBody(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ListItemBody(parent, propertyList,
+ systemId, line, column);
}
}
@@ -69,8 +71,9 @@
return new ListItemBody.Maker();
}
- public ListItemBody(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public ListItemBody(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -89,7 +92,15 @@
this.marker = 0;
// initialize id
String id = this.properties.get("id").getString();
- area.getIDReferences().initializeID(id, area);
+ try {
+ area.getIDReferences().initializeID(id, area);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
}
/*
1.11.2.6 +19 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/ListItemLabel.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- ListItemLabel.java 25 Feb 2003 12:57:01 -0000 1.11.2.5
+++ ListItemLabel.java 11 Apr 2003 00:24:38 -0000 1.11.2.6
@@ -58,9 +58,11 @@
public class ListItemLabel extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ListItemLabel(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ListItemLabel(parent, propertyList,
+ systemId, line, column);
}
}
@@ -69,8 +71,9 @@
return new ListItemLabel.Maker();
}
- public ListItemLabel(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public ListItemLabel(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -81,7 +84,7 @@
int numChildren = this.children.size();
if (numChildren != 1) {
- throw new FOPException("list-item-label must have exactly one block in this version of FOP");
+ throw new FOPException("list-item-label must have exactly one block in this version of FOP", systemId, line, column);
}
// Common Accessibility Properties
@@ -92,7 +95,15 @@
// initialize id
String id = this.properties.get("id").getString();
- area.getIDReferences().initializeID(id, area);
+ try {
+ area.getIDReferences().initializeID(id, area);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
Block block = (Block)children.get(0);
1.6.2.8 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/Marker.java
Index: Marker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Marker.java,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -r1.6.2.7 -r1.6.2.8
--- Marker.java 25 Feb 2003 12:57:01 -0000 1.6.2.7
+++ Marker.java 11 Apr 2003 00:24:38 -0000 1.6.2.8
@@ -63,9 +63,10 @@
private boolean isLast;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Marker(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Marker(parent, propertyList, systemId, line, column);
}
}
@@ -74,9 +75,10 @@
return new Marker.Maker();
}
- public Marker(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ public Marker(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
// do check to see that 'this' is under fo:flow
1.4.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/MultiCase.java
Index: MultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/MultiCase.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- MultiCase.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ MultiCase.java 11 Apr 2003 00:24:38 -0000 1.4.2.4
@@ -60,9 +60,10 @@
public class MultiCase extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new MultiCase(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new MultiCase(parent, propertyList, systemId, line, column);
}
}
@@ -70,9 +71,10 @@
return new MultiCase.Maker();
}
- protected MultiCase(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected MultiCase(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.4.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/MultiProperties.java
Index: MultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/MultiProperties.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- MultiProperties.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ MultiProperties.java 11 Apr 2003 00:24:39 -0000 1.4.2.4
@@ -60,9 +60,10 @@
public class MultiProperties extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new MultiProperties(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new MultiProperties(parent, propertyList, systemId, line, column);
}
}
@@ -71,9 +72,10 @@
return new MultiProperties.Maker();
}
- protected MultiProperties(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected MultiProperties(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.4.2.4 +9 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/MultiPropertySet.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- MultiPropertySet.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ MultiPropertySet.java 11 Apr 2003 00:24:39 -0000 1.4.2.4
@@ -60,9 +60,11 @@
public class MultiPropertySet extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new MultiPropertySet(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new MultiPropertySet(parent, propertyList,
+ systemId, line, column);
}
}
@@ -71,8 +73,9 @@
return new MultiPropertySet.Maker();
}
- protected MultiPropertySet(FObj parent, PropertyList propertyList)
- throws FOPException {
+ protected MultiPropertySet(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
super(parent, propertyList);
}
1.4.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/MultiSwitch.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- MultiSwitch.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ MultiSwitch.java 11 Apr 2003 00:24:39 -0000 1.4.2.4
@@ -60,9 +60,10 @@
public class MultiSwitch extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new MultiSwitch(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new MultiSwitch(parent, propertyList, systemId, line, column);
}
}
@@ -71,9 +72,10 @@
return new MultiSwitch.Maker();
}
- protected MultiSwitch(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected MultiSwitch(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.4.2.4 +9 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/MultiToggle.java
Index: MultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/MultiToggle.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- MultiToggle.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ MultiToggle.java 11 Apr 2003 00:24:39 -0000 1.4.2.4
@@ -60,9 +60,10 @@
public class MultiToggle extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new MultiToggle(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new MultiToggle(parent, propertyList, systemId, line, column);
}
}
@@ -71,9 +72,10 @@
return new MultiToggle.Maker();
}
- protected MultiToggle(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected MultiToggle(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.21.2.6 +17 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/PageNumber.java,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -u -r1.21.2.5 -r1.21.2.6
--- PageNumber.java 25 Feb 2003 12:57:01 -0000 1.21.2.5
+++ PageNumber.java 11 Apr 2003 00:24:39 -0000 1.21.2.6
@@ -60,9 +60,10 @@
public class PageNumber extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new PageNumber(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new PageNumber(parent, propertyList, systemId, line, column);
}
}
@@ -78,8 +79,9 @@
int whiteSpaceCollapse;
TextState ts;
- public PageNumber(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public PageNumber(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -141,7 +143,15 @@
// initialize id
String id = this.properties.get("id").getString();
- area.getIDReferences().initializeID(id, area);
+ try {
+ area.getIDReferences().initializeID(id, area);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
}
String p = area.getPage().getFormattedNumber();
1.19.2.4 +19 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/PageNumberCitation.java,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -r1.19.2.3 -r1.19.2.4
--- PageNumberCitation.java 25 Feb 2003 12:57:01 -0000 1.19.2.3
+++ PageNumberCitation.java 11 Apr 2003 00:24:39 -0000 1.19.2.4
@@ -115,9 +115,11 @@
public class PageNumberCitation extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new PageNumberCitation(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new PageNumberCitation(parent, propertyList,
+ systemId, line, column);
}
}
@@ -138,8 +140,9 @@
TextState ts;
- public PageNumberCitation(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public PageNumberCitation(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -204,12 +207,20 @@
this.refId = this.properties.get("ref-id").getString();
if (this.refId.equals("")) {
- throw new FOPException("page-number-citation must contain \"ref-id\"");
+ throw new FOPException("page-number-citation must contain \"ref-id\"", systemId, line, column);
}
// create id
this.id = this.properties.get("id").getString();
- idReferences.createID(id);
+ try {
+ idReferences.createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
ts = new TextState();
this.marker = 0;
1.6.2.10 +11 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/RetrieveMarker.java
Index: RetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/RetrieveMarker.java,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -u -r1.6.2.9 -r1.6.2.10
--- RetrieveMarker.java 25 Feb 2003 12:57:01 -0000 1.6.2.9
+++ RetrieveMarker.java 11 Apr 2003 00:24:39 -0000 1.6.2.10
@@ -73,9 +73,11 @@
private Marker bestMarker;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RetrieveMarker(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RetrieveMarker(parent, propertyList,
+ systemId, line, column);
}
}
@@ -84,8 +86,9 @@
return new RetrieveMarker.Maker();
}
- public RetrieveMarker(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public RetrieveMarker(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
this.retrieveClassName =
this.properties.get("retrieve-class-name").getString();
@@ -123,7 +126,7 @@
} else if (retrieveBoundary == RetrieveBoundary.DOCUMENT) {
return layoutBestMarker(areaTree.getDocumentMarkers(),area);
} else if (retrieveBoundary != RetrieveBoundary.PAGE) {
- throw new FOPException("Illegal 'retrieve-boundary' value");
+ throw new FOPException("Illegal 'retrieve-boundary' value", systemId, line, column);
}
} else if (bestMarker != null) {
return bestMarker.layoutMarker(area);
@@ -191,7 +194,7 @@
}
} else {
- throw new FOPException("Illegal 'retrieve-position' value");
+ throw new FOPException("Illegal 'retrieve-position' value", systemId, line, column);
}
return null;
}
1.18.2.8 +11 -9 xml-fop/src/org/apache/fop/fo/flow/Attic/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/StaticContent.java,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -u -r1.18.2.7 -r1.18.2.8
--- StaticContent.java 25 Feb 2003 12:57:01 -0000 1.18.2.7
+++ StaticContent.java 11 Apr 2003 00:24:39 -0000 1.18.2.8
@@ -59,9 +59,11 @@
public class StaticContent extends AbstractFlow {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new StaticContent(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new StaticContent(parent, propertyList,
+ systemId, line, column);
}
}
@@ -69,12 +71,12 @@
return new StaticContent.Maker();
}
- protected StaticContent(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected StaticContent(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
setFlowName(getProperty("flow-name").getString());
pageSequence.addStaticContent(this);
-// ((PageSequence)parent).setIsFlowSet(false); // hacquery of sorts
}
public String getName() {
@@ -130,7 +132,7 @@
protected void setFlowName(String name) throws FOPException {
if (name == null || name.equals("")) {
throw new FOPException("A 'flow-name' is required for "
- + getName() + ".");
+ + getName() + ".", systemId, line, column);
} else {
_flowName = name;
}
1.39.2.11 +19 -9 xml-fop/src/org/apache/fop/fo/flow/Attic/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Table.java,v
retrieving revision 1.39.2.10
retrieving revision 1.39.2.11
diff -u -r1.39.2.10 -r1.39.2.11
--- Table.java 25 Feb 2003 12:57:01 -0000 1.39.2.10
+++ Table.java 11 Apr 2003 00:24:39 -0000 1.39.2.11
@@ -63,9 +63,10 @@
public class Table extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Table(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Table(parent, propertyList, systemId, line, column);
}
}
@@ -100,8 +101,9 @@
AreaContainer areaContainer;
- public Table(FObj parent, PropertyList propertyList) {
- super(parent, propertyList);
+ public Table(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
@@ -176,9 +178,17 @@
if (area instanceof BlockArea) {
area.end();
}
- if (this.areaContainer
- == null) { // check if anything was previously laid out
- area.getIDReferences().createID(id);
+ // check if anything was previously laid out
+ if (this.areaContainer == null) {
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
}
1.4.2.4 +10 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/TableAndCaption.java
Index: TableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableAndCaption.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- TableAndCaption.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ TableAndCaption.java 11 Apr 2003 00:24:39 -0000 1.4.2.4
@@ -60,9 +60,11 @@
public class TableAndCaption extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableAndCaption(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableAndCaption(parent, propertyList,
+ systemId, line, column);
}
}
@@ -71,9 +73,10 @@
return new TableAndCaption.Maker();
}
- protected TableAndCaption(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected TableAndCaption(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.38.2.9 +8 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableBody.java,v
retrieving revision 1.38.2.8
retrieving revision 1.38.2.9
diff -u -r1.38.2.8 -r1.38.2.9
--- TableBody.java 25 Feb 2003 12:57:01 -0000 1.38.2.8
+++ TableBody.java 11 Apr 2003 00:24:39 -0000 1.38.2.9
@@ -57,9 +57,10 @@
public class TableBody extends AbstractTableBody {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableBody(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableBody(parent, propertyList, systemId, line, column);
}
}
@@ -68,9 +69,10 @@
return new TableBody.Maker();
}
- public TableBody(FObj parent, PropertyList propertyList)
+ public TableBody(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.4.2.4 +10 -7 xml-fop/src/org/apache/fop/fo/flow/Attic/TableCaption.java
Index: TableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableCaption.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- TableCaption.java 25 Feb 2003 12:57:01 -0000 1.4.2.3
+++ TableCaption.java 11 Apr 2003 00:24:39 -0000 1.4.2.4
@@ -60,9 +60,11 @@
public class TableCaption extends ToBeImplementedElement {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableCaption(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableCaption(parent, propertyList,
+ systemId, line, column);
}
}
@@ -71,9 +73,10 @@
return new TableCaption.Maker();
}
- protected TableCaption(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected TableCaption(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.39.2.10 +18 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableCell.java,v
retrieving revision 1.39.2.9
retrieving revision 1.39.2.10
diff -u -r1.39.2.9 -r1.39.2.10
--- TableCell.java 25 Feb 2003 12:57:01 -0000 1.39.2.9
+++ TableCell.java 11 Apr 2003 00:24:39 -0000 1.39.2.10
@@ -59,9 +59,10 @@
public class TableCell extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableCell(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableCell(parent, propertyList, systemId, line, column);
}
}
@@ -137,12 +138,13 @@
AreaContainer cellArea;
- public TableCell(FObj parent, PropertyList propertyList)
+ public TableCell(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
if (!(parent instanceof TableRow)) {
throw new FOPException("A table cell must be child of fo:table-row,"
- + " not " + parent.getName());
+ + " not " + parent.getName(), systemId, line, column);
}
doSetup(); // init some basic property values
}
@@ -257,7 +259,15 @@
// Calculate cell borders
// calcBorders(propMgr.getBorderAndPadding());
- area.getIDReferences().createID(id);
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
this.marker = 0;
this.bDone=false;
1.20.2.6 +19 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableColumn.java,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- TableColumn.java 25 Feb 2003 12:57:01 -0000 1.20.2.5
+++ TableColumn.java 11 Apr 2003 00:24:39 -0000 1.20.2.6
@@ -70,9 +70,11 @@
AreaContainer areaContainer;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableColumn(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableColumn(parent, propertyList,
+ systemId, line, column);
}
}
@@ -80,12 +82,13 @@
return new TableColumn.Maker();
}
- public TableColumn(FObj parent, PropertyList propertyList)
+ public TableColumn(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
if (!(parent instanceof Table)) {
throw new FOPException("A table column must be child of fo:table, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
}
@@ -143,7 +146,15 @@
// initialize id
String id = this.properties.get("id").getString();
- area.getIDReferences().initializeID(id, area);
+ try {
+ area.getIDReferences().initializeID(id, area);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
setup = true;
}
1.3.2.6 +9 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/TableFooter.java
Index: TableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableFooter.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- TableFooter.java 25 Feb 2003 12:57:01 -0000 1.3.2.5
+++ TableFooter.java 11 Apr 2003 00:24:39 -0000 1.3.2.6
@@ -57,9 +57,11 @@
public class TableFooter extends AbstractTableBody {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableFooter(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableFooter(parent, propertyList,
+ systemId, line, column);
}
}
@@ -68,9 +70,10 @@
return new TableFooter.Maker();
}
- public TableFooter(FObj parent, PropertyList propertyList)
+ public TableFooter(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.2.2.6 +9 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/TableHeader.java
Index: TableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableHeader.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- TableHeader.java 25 Feb 2003 12:57:01 -0000 1.2.2.5
+++ TableHeader.java 11 Apr 2003 00:24:39 -0000 1.2.2.6
@@ -57,9 +57,11 @@
public class TableHeader extends AbstractTableBody {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableHeader(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableHeader(parent, propertyList,
+ systemId, line, column);
}
}
@@ -68,9 +70,10 @@
return new TableHeader.Maker();
}
- public TableHeader(FObj parent, PropertyList propertyList)
+ public TableHeader(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.51.2.11 +18 -8 xml-fop/src/org/apache/fop/fo/flow/Attic/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/TableRow.java,v
retrieving revision 1.51.2.10
retrieving revision 1.51.2.11
diff -u -r1.51.2.10 -r1.51.2.11
--- TableRow.java 25 Feb 2003 12:57:01 -0000 1.51.2.10
+++ TableRow.java 11 Apr 2003 00:24:39 -0000 1.51.2.11
@@ -63,9 +63,10 @@
public class TableRow extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new TableRow(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new TableRow(parent, propertyList, systemId, line, column);
}
}
@@ -175,13 +176,14 @@
}
- public TableRow(FObj parent, PropertyList propertyList)
+ public TableRow(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
if (!(parent instanceof AbstractTableBody)) {
throw new FOPException("A table row must be child of fo:table-body,"
+ " fo:table-header or fo:table-footer, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
}
@@ -271,7 +273,15 @@
// laid out yet (with an id created already)
}
// create ID also in case the row has been reset
- area.getIDReferences().createID(id);
+ try {
+ area.getIDReferences().createID(id);
+ }
+ catch(FOPException e) {
+ if (!e.isLocationSet()) {
+ e.setLocation(systemId, line, column);
+ }
+ throw e;
+ }
this.marker = 0;
int breakStatus = propMgr.checkBreakBefore(area);
1.4.2.6 +8 -6 xml-fop/src/org/apache/fop/fo/flow/Attic/Wrapper.java
Index: Wrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Wrapper.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- Wrapper.java 25 Feb 2003 12:57:02 -0000 1.4.2.5
+++ Wrapper.java 11 Apr 2003 00:24:39 -0000 1.4.2.6
@@ -65,9 +65,10 @@
public class Wrapper extends FObjMixed {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Wrapper(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Wrapper(parent, propertyList, systemId, line, column);
}
}
@@ -79,9 +80,10 @@
return "fo:wrapper";
}
- public Wrapper(FObj parent, PropertyList propertyList)
+ public Wrapper(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
// check that this occurs inside an fo:flow
}
No revision
No revision
1.5.2.8 +11 -8 xml-fop/src/org/apache/fop/fo/pagination/Attic/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/ConditionalPageMasterReference.java,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -u -r1.5.2.7 -r1.5.2.8
--- ConditionalPageMasterReference.java 25 Feb 2003 12:57:04 -0000 1.5.2.7
+++ ConditionalPageMasterReference.java 11 Apr 2003 00:24:41 -0000 1.5.2.8
@@ -64,9 +64,11 @@
public class ConditionalPageMasterReference extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new ConditionalPageMasterReference(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new ConditionalPageMasterReference(parent, propertyList,
+ systemId, line, column);
}
}
@@ -83,9 +85,10 @@
private int oddOrEven;
private int blankOrNotBlank;
- public ConditionalPageMasterReference(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ public ConditionalPageMasterReference(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (getProperty("master-reference") != null) {
this.masterName = getProperty("master-reference").getString();
@@ -101,7 +104,7 @@
} else {
throw new FOPException("fo:conditional-page-master-reference must be child "
+ "of fo:repeatable-page-master-alternatives, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
this.pagePosition = this.properties.get("page-position").getEnum();
this.oddOrEven = this.properties.get("odd-or-even").getEnum();
1.10.2.6 +14 -11 xml-fop/src/org/apache/fop/fo/pagination/Attic/LayoutMasterSet.java
Index: LayoutMasterSet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/LayoutMasterSet.java,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -r1.10.2.5 -r1.10.2.6
--- LayoutMasterSet.java 25 Feb 2003 12:57:04 -0000 1.10.2.5
+++ LayoutMasterSet.java 11 Apr 2003 00:24:41 -0000 1.10.2.6
@@ -68,9 +68,11 @@
public class LayoutMasterSet extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new LayoutMasterSet(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new LayoutMasterSet(parent, propertyList,
+ systemId, line, column);
}
}
@@ -84,9 +86,10 @@
private Root root;
- protected LayoutMasterSet(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected LayoutMasterSet(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
this.simplePageMasters = new HashMap();
this.pageSequenceMasters = new HashMap();
@@ -96,7 +99,7 @@
root.setLayoutMasterSet(this);
} else {
throw new FOPException("fo:layout-master-set must be child of fo:root, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
allRegions = new HashMap();
@@ -113,7 +116,7 @@
throw new FOPException("'master-name' ("
+ simplePageMaster.getMasterName()
+ ") must be unique "
- + "across page-masters and page-sequence-masters");
+ + "across page-masters and page-sequence-masters", systemId, line, column);
this.simplePageMasters.put(simplePageMaster.getMasterName(),
simplePageMaster);
}
@@ -128,7 +131,7 @@
if (existsName(masterName))
throw new FOPException("'master-name' (" + masterName
+ ") must be unique "
- + "across page-masters and page-sequence-masters");
+ + "across page-masters and page-sequence-masters", systemId, line, column);
this.pageSequenceMasters.put(masterName, pageSequenceMaster);
}
@@ -165,7 +168,7 @@
+ "to the same region-class ("
+ localClass + "!="
+ region.getRegionClass()
- + ")");
+ + ")", systemId, line, column);
}
}
allRegions.put(region.getRegionName(),
1.5.2.6 +4 -3 xml-fop/src/org/apache/fop/fo/pagination/Attic/PageMasterReference.java
Index: PageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/PageMasterReference.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -r1.5.2.5 -r1.5.2.6
--- PageMasterReference.java 25 Feb 2003 12:57:04 -0000 1.5.2.5
+++ PageMasterReference.java 11 Apr 2003 00:24:41 -0000 1.5.2.6
@@ -63,9 +63,10 @@
protected String masterName;
- public PageMasterReference(FObj parent, PropertyList propertyList)
+ public PageMasterReference(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
}
public String getMasterName() {
1.39.2.16 +21 -17 xml-fop/src/org/apache/fop/fo/pagination/Attic/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/PageSequence.java,v
retrieving revision 1.39.2.15
retrieving revision 1.39.2.16
diff -u -r1.39.2.15 -r1.39.2.16
--- PageSequence.java 6 Mar 2003 23:55:30 -0000 1.39.2.15
+++ PageSequence.java 11 Apr 2003 00:24:41 -0000 1.39.2.16
@@ -78,9 +78,11 @@
// Factory methods
//
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new PageSequence(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new PageSequence(parent, propertyList,
+ systemId, line, column);
}
}
@@ -152,16 +154,17 @@
private SimplePageMaster currentSimplePageMaster;
private PageSequenceMaster pageSequenceMaster;
- protected PageSequence(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected PageSequence(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (parent.getName().equals("fo:root")) {
this.root = (Root)parent;
}
else {
throw new FOPException("page-sequence must be child of root, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
layoutMasterSet = root.getLayoutMasterSet();
@@ -189,7 +192,7 @@
this.firstPageNumber = (pageStart > 0) ? pageStart : 1;
} catch (NumberFormatException nfe) {
throw new FOPException("The value '" + ipnValue
- + "' is not valid for initial-page-number");
+ + "' is not valid for initial-page-number", systemId, line, column);
}
}
@@ -216,10 +219,10 @@
public void addFlow(Flow flow) throws FOPException {
if (this.flow!=null) {
- throw new FOPException("Only a single fo:flow permitted per fo:page-sequence");
+ throw new FOPException("Only a single fo:flow permitted per fo:page-sequence", systemId, line, column);
}
if (flowMap.containsKey(flow.getFlowName())) {
- throw new FOPException("flow-names must be unique within an fo:page-sequence");
+ throw new FOPException("flow-names must be unique within an fo:page-sequence", systemId, line, column);
}
this.flow = flow;
}
@@ -229,10 +232,11 @@
if (this.flow!=null) {
throw new FOPException("Static content ('"
+ staticContent.getFlowName()
- + "') is not allowed after fo:flow");
+ + "') is not allowed after fo:flow",
+ systemId, line, column);
}
if (flowMap.containsKey(staticContent.getFlowName())) {
- throw new FOPException("flow-names must be unique within an fo:page-sequence");
+ throw new FOPException("flow-names must be unique within an fo:page-sequence", systemId, line, column);
}
String flowName = staticContent.getFlowName();
if (!this.layoutMasterSet.regionNameExists(flowName)
@@ -251,7 +255,7 @@
*/
public void format(AreaTree areaTree) throws FOPException {
if (flow == null) {
- throw new FOPException("No flow in page-sequence");
+ throw new FOPException("No flow in page-sequence", systemId, line, column);
}
PageSequence previousPageSequence=this.root.getPageSequence();
if( previousPageSequence!=null ) {
@@ -301,7 +305,7 @@
this.layoutMasterSet.getPageSequenceMaster(masterName);
if (this.pageSequenceMaster==null) {
throw new FOPException("master-reference '" + masterName
- + "' for fo:page-sequence matches no simple-page-master or page-sequence-master");
+ + "' for fo:page-sequence matches no simple-page-master or page-sequence-master", systemId, line, column);
}
pageSequenceMaster.reset();
} else {
@@ -310,7 +314,7 @@
if (!flow.getFlowName().equals(region.getRegionName())) {
throw new FOPException("Flow '" + flow.getFlowName()
+ "' does not map to the region-body in page-master '"
- + currentSimplePageMaster.getMasterName() + "'");
+ + currentSimplePageMaster.getMasterName() + "'", systemId, line, column);
}
}
@@ -375,7 +379,7 @@
if (!flow.getFlowName().equals(region.getRegionName())) {
throw new FOPException("Flow '" + flow.getFlowName()
+ "' does not map to the region-body in page-master '"
- + currentSimplePageMaster.getMasterName() + "'");
+ + currentSimplePageMaster.getMasterName() + "'", systemId, line, column);
}
}
Page newPage = this.currentSimplePageMaster.getPageMaster()
1.6.2.7 +13 -10 xml-fop/src/org/apache/fop/fo/pagination/Attic/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/PageSequenceMaster.java,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -r1.6.2.6 -r1.6.2.7
--- PageSequenceMaster.java 25 Feb 2003 12:57:04 -0000 1.6.2.6
+++ PageSequenceMaster.java 11 Apr 2003 00:24:41 -0000 1.6.2.7
@@ -67,9 +67,11 @@
public class PageSequenceMaster extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new PageSequenceMaster(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new PageSequenceMaster(parent, propertyList,
+ systemId, line, column);
}
}
@@ -90,9 +92,10 @@
// references to page-masters. So the methods use the former
// terminology ('sub-sequence-specifiers', or SSS),
// but the actual FO's are MasterReferences.
- protected PageSequenceMaster(FObj parent, PropertyList propertyList)
+ protected PageSequenceMaster(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
throws FOPException {
- super(parent, propertyList);
+ super(parent, propertyList, systemId, line, column);
if (parent.getName().equals("fo:layout-master-set")) {
this.layoutMasterSet = (LayoutMasterSet)parent;
@@ -106,7 +109,7 @@
} else {
throw new FOPException("fo:page-sequence-master must be child "
+ "of fo:layout-master-set, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
subSequenceSpecifiers = new ArrayList();
currentSubSequenceNumber = -1;
@@ -143,7 +146,7 @@
currentSubSequence = getNextSubSequence();
if (currentSubSequence==null) {
throw new FOPException("no subsequences in page-sequence-master '"
- + masterName + "'");
+ + masterName + "'", systemId, line, column);
}
firstPage = true;
}
@@ -157,7 +160,7 @@
if (!canRecover) {
throw new FOPException("subsequences exhausted in page-sequence-master '"
+ masterName
- + "', cannot recover");
+ + "', cannot recover", systemId, line, column);
}
log.warn("subsequences exhausted in page-sequence-master '"
+ masterName
@@ -175,7 +178,7 @@
if (pageMaster==null) {
throw new FOPException("No simple-page-master matching '"
+ pageMasterName + "' in page-sequence-master '"
- + masterName +"'");
+ + masterName +"'", systemId, line, column);
}
return pageMaster;
}
1.5.2.4 +7 -6 xml-fop/src/org/apache/fop/fo/pagination/Attic/Region.java
Index: Region.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/Region.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- Region.java 25 Feb 2003 12:57:05 -0000 1.5.2.3
+++ Region.java 11 Apr 2003 00:24:41 -0000 1.5.2.4
@@ -65,9 +65,10 @@
private SimplePageMaster _layoutMaster;
private String _regionName;
- protected Region(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected Region(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
// regions may have name, or default
if (null == this.properties.get(PROP_REGION_NAME)) {
@@ -81,7 +82,7 @@
&&!getRegionName().equals(getDefaultRegionName())) {
throw new FOPException(PROP_REGION_NAME + " '" + _regionName
+ "' for " + this.getName()
- + " not permitted.");
+ + " not permitted.", systemId, line, column);
}
}
@@ -91,7 +92,7 @@
} else {
throw new FOPException(getName() + " must be child "
+ "of simple-page-master, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
}
1.9.2.6 +10 -7 xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionAfter.java
Index: RegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionAfter.java,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- RegionAfter.java 25 Feb 2003 12:57:05 -0000 1.9.2.5
+++ RegionAfter.java 11 Apr 2003 00:24:41 -0000 1.9.2.6
@@ -68,9 +68,11 @@
public class RegionAfter extends Region {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RegionAfter(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RegionAfter(parent, propertyList,
+ systemId, line, column);
}
}
@@ -83,9 +85,10 @@
private int precedence;
- protected RegionAfter(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected RegionAfter(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
precedence = this.properties.get("precedence").getEnum();
}
1.9.2.6 +10 -7 xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionBefore.java
Index: RegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionBefore.java,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- RegionBefore.java 25 Feb 2003 12:57:05 -0000 1.9.2.5
+++ RegionBefore.java 11 Apr 2003 00:24:41 -0000 1.9.2.6
@@ -68,9 +68,11 @@
public class RegionBefore extends Region {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RegionBefore(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RegionBefore(parent, propertyList,
+ systemId, line, column);
}
}
@@ -83,9 +85,10 @@
private int precedence;
- protected RegionBefore(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected RegionBefore(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
precedence = this.properties.get("precedence").getEnum();
}
1.11.2.6 +9 -7 xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionBody.java
Index: RegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionBody.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- RegionBody.java 25 Feb 2003 12:57:05 -0000 1.11.2.5
+++ RegionBody.java 11 Apr 2003 00:24:41 -0000 1.11.2.6
@@ -72,9 +72,10 @@
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RegionBody(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RegionBody(parent, propertyList, systemId, line, column);
}
}
@@ -85,9 +86,10 @@
public static final String REGION_CLASS = "body";
- protected RegionBody(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected RegionBody(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.3.2.6 +10 -7 xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionEnd.java
Index: RegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionEnd.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- RegionEnd.java 25 Feb 2003 12:57:05 -0000 1.3.2.5
+++ RegionEnd.java 11 Apr 2003 00:24:41 -0000 1.3.2.6
@@ -67,9 +67,11 @@
public class RegionEnd extends Region {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RegionEnd(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RegionEnd(parent, propertyList,
+ systemId, line, column);
}
}
@@ -81,9 +83,10 @@
public static final String REGION_CLASS = "end";
- protected RegionEnd(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected RegionEnd(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.3.2.6 +10 -7 xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionStart.java
Index: RegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/RegionStart.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- RegionStart.java 25 Feb 2003 12:57:05 -0000 1.3.2.5
+++ RegionStart.java 11 Apr 2003 00:24:41 -0000 1.3.2.6
@@ -67,9 +67,11 @@
public class RegionStart extends Region {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RegionStart(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RegionStart(parent, propertyList,
+ systemId, line, column);
}
}
@@ -81,9 +83,10 @@
public static final String REGION_CLASS = "start";
- protected RegionStart(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected RegionStart(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
}
public String getName() {
1.7.2.7 +12 -9 xml-fop/src/org/apache/fop/fo/pagination/Attic/RepeatablePageMasterAlternatives.java
Index: RepeatablePageMasterAlternatives.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/RepeatablePageMasterAlternatives.java,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -r1.7.2.6 -r1.7.2.7
--- RepeatablePageMasterAlternatives.java 25 Feb 2003 12:57:05 -0000 1.7.2.6
+++ RepeatablePageMasterAlternatives.java 11 Apr 2003 00:24:41 -0000 1.7.2.7
@@ -70,9 +70,11 @@
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RepeatablePageMasterAlternatives(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RepeatablePageMasterAlternatives(parent, propertyList,
+ systemId, line, column);
}
}
@@ -92,9 +94,10 @@
private ArrayList conditionalPageMasterRefs;
- public RepeatablePageMasterAlternatives(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ public RepeatablePageMasterAlternatives(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (parent.getName().equals("fo:page-sequence-master")) {
this.pageSequenceMaster = (PageSequenceMaster)parent;
@@ -102,7 +105,7 @@
} else {
throw new FOPException("A fo:repeatable-page-master-alternatives"
+ "must be child of fo:page-sequence-master, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
String mr = getProperty("maximum-repeats").getString();
@@ -117,7 +120,7 @@
}
} catch (NumberFormatException nfe) {
throw new FOPException("Invalid number for "
- + "'maximum-repeats' property");
+ + "'maximum-repeats' property", systemId, line, column);
}
}
conditionalPageMasterRefs = new ArrayList();
1.3.2.6 +13 -9 xml-fop/src/org/apache/fop/fo/pagination/Attic/RepeatablePageMasterReference.java
Index: RepeatablePageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/RepeatablePageMasterReference.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- RepeatablePageMasterReference.java 25 Feb 2003 12:57:05 -0000 1.3.2.5
+++ RepeatablePageMasterReference.java 11 Apr 2003 00:24:41 -0000 1.3.2.6
@@ -66,9 +66,11 @@
private static final int INFINITE = -1;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new RepeatablePageMasterReference(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new RepeatablePageMasterReference(parent, propertyList,
+ systemId, line, column);
}
}
@@ -80,9 +82,10 @@
private int maximumRepeats;
private int numberConsumed = 0;
- public RepeatablePageMasterReference(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ public RepeatablePageMasterReference(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (getProperty("master-reference") != null) {
this.masterName = getProperty("master-reference").getString();
if (parent.getName().equals("fo:page-sequence-master")) {
@@ -90,7 +93,7 @@
pageSequenceMaster.addSubsequenceSpecifier(this);
} else {
throw new FOPException("A fo:repeatable-page-master-reference must be child of fo:page-sequence-master, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
} else {
log.warn("A fo:repeatable-page-master-reference does not have a master-reference and so is being ignored");
@@ -107,7 +110,8 @@
}
} catch (NumberFormatException nfe) {
throw new FOPException("Invalid number '" + mr
- + "'for 'maximum-repeats' property");
+ + "'for 'maximum-repeats' property",
+ systemId, line, column);
}
}
}
1.16.2.7 +10 -8 xml-fop/src/org/apache/fop/fo/pagination/Attic/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/Root.java,v
retrieving revision 1.16.2.6
retrieving revision 1.16.2.7
diff -u -r1.16.2.6 -r1.16.2.7
--- Root.java 25 Feb 2003 12:57:05 -0000 1.16.2.6
+++ Root.java 11 Apr 2003 00:24:41 -0000 1.16.2.7
@@ -64,9 +64,10 @@
public class Root extends FObj {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new Root(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new Root(parent, propertyList, systemId, line, column);
}
}
@@ -82,13 +83,14 @@
*/
PageSequence pageSequence;
- protected Root(FObj parent,
- PropertyList propertyList) throws FOPException {
- super(parent, propertyList);
+ protected Root(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
// this.properties.get("media-usage");
if (parent != null) {
- throw new FOPException("root must be root element");
+ throw new FOPException("root must be root element", systemId, line, column);
}
}
1.15.2.9 +13 -9 xml-fop/src/org/apache/fop/fo/pagination/Attic/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/SimplePageMaster.java,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -u -r1.15.2.8 -r1.15.2.9
--- SimplePageMaster.java 25 Feb 2003 12:57:05 -0000 1.15.2.8
+++ SimplePageMaster.java 11 Apr 2003 00:24:41 -0000 1.15.2.9
@@ -74,9 +74,11 @@
private static final int FALLBACK_PAGE_WIDTH = 576000;
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new SimplePageMaster(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new SimplePageMaster(parent, propertyList,
+ systemId, line, column);
}
}
@@ -100,9 +102,10 @@
int beforeExtent, afterExtent, startExtent, endExtent;
boolean afterPrecedence = false;
- protected SimplePageMaster(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ protected SimplePageMaster(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (parent.getName().equals("fo:layout-master-set")) {
this.layoutMasterSet = (LayoutMasterSet)parent;
@@ -116,7 +119,7 @@
} else {
throw new FOPException("fo:simple-page-master must be child "
+ "of fo:layout-master-set, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
_regions = new HashMap();
@@ -212,7 +215,8 @@
if (_regions.containsKey(region.getRegionClass())) {
throw new FOPException("Only one region of class "
+ region.getRegionClass()
- + " allowed within a simple-page-master.");
+ + " allowed within a simple-page-master.",
+ systemId, line, column);
} else {
_regions.put(region.getRegionClass(), region);
}
1.4.2.6 +11 -8 xml-fop/src/org/apache/fop/fo/pagination/Attic/SinglePageMasterReference.java
Index: SinglePageMasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/SinglePageMasterReference.java,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- SinglePageMasterReference.java 25 Feb 2003 12:57:05 -0000 1.4.2.5
+++ SinglePageMasterReference.java 11 Apr 2003 00:24:42 -0000 1.4.2.6
@@ -63,9 +63,11 @@
public class SinglePageMasterReference extends PageMasterReference {
public static class Maker extends FObj.Maker {
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new SinglePageMasterReference(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new SinglePageMasterReference(parent, propertyList,
+ systemId, line, column);
}
}
@@ -79,9 +81,10 @@
private int state;
- public SinglePageMasterReference(FObj parent, PropertyList propertyList)
- throws FOPException {
- super(parent, propertyList);
+ public SinglePageMasterReference(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ super(parent, propertyList, systemId, line, column);
if (getProperty("master-reference") != null) {
this.masterName = getProperty("master-reference").getString();
if (parent.getName().equals("fo:page-sequence-master")) {
@@ -89,7 +92,7 @@
pageSequenceMaster.addSubsequenceSpecifier(this);
} else {
throw new FOPException("A fo:single-page-master-reference must be child of fo:page-sequence-master, not "
- + parent.getName());
+ + parent.getName(), systemId, line, column);
}
} else {
log.warn("A fo:single-page-master-reference does not have a master-reference and so is being ignored");
No revision
No revision
1.16.2.7 +9 -6 xml-fop/src/org/apache/fop/svg/Attic/SVGElement.java
Index: SVGElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Attic/SVGElement.java,v
retrieving revision 1.16.2.6
retrieving revision 1.16.2.7
diff -u -r1.16.2.6 -r1.16.2.7
--- SVGElement.java 10 Apr 2003 12:30:06 -0000 1.16.2.6
+++ SVGElement.java 11 Apr 2003 00:24:42 -0000 1.16.2.7
@@ -89,9 +89,11 @@
*
* @return the SVG object
*/
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new SVGElement(parent, propertyList);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new SVGElement(parent, propertyList,
+ systemId, line, column);
}
}
@@ -112,8 +114,9 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- public SVGElement(FObj parent, PropertyList propertyList) {
- super(parent, propertyList, "svg");
+ public SVGElement(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column) {
+ super(parent, propertyList, "svg", systemId, line, column);
init();
}
1.7.2.3 +9 -6 xml-fop/src/org/apache/fop/svg/Attic/SVGObj.java
Index: SVGObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/Attic/SVGObj.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- SVGObj.java 25 Feb 2003 15:08:11 -0000 1.7.2.2
+++ SVGObj.java 11 Apr 2003 00:24:42 -0000 1.7.2.3
@@ -72,9 +72,11 @@
*
* @return the svg object
*/
- public FObj make(FObj parent,
- PropertyList propertyList) throws FOPException {
- return new SVGObj(parent, propertyList, tag);
+ public FObj make(FObj parent, PropertyList propertyList,
+ String systemId, int line, int column)
+ throws FOPException {
+ return new SVGObj(parent, propertyList, tag,
+ systemId, line, column);
}
}
@@ -93,8 +95,9 @@
* @param parent the parent formatting object
* @param propertyList the explicit properties of this object
*/
- protected SVGObj(FObj parent, PropertyList propertyList, String tag) {
- super(parent, propertyList, tag);
+ protected SVGObj(FObj parent, PropertyList propertyList, String tag,
+ String systemId, int line, int column) {
+ super(parent, propertyList, tag, systemId, line, column);
}
public String getName() {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org