foray-commit Mailing List for FOray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
1
|
2
|
3
|
|
4
|
5
|
6
|
7
|
8
|
9
(1) |
10
(20) |
|
11
|
12
(6) |
13
(22) |
14
(29) |
15
(24) |
16
(22) |
17
|
|
18
(19) |
19
(6) |
20
(22) |
21
(30) |
22
(14) |
23
(13) |
24
(9) |
|
25
(1) |
26
(21) |
27
(18) |
28
|
29
|
30
(11) |
31
(3) |
|
From: <vic...@us...> - 2007-03-31 01:28:51
|
Revision: 9056
http://svn.sourceforge.net/foray/?rev=9056&view=rev
Author: victormote
Date: 2007-03-30 18:28:52 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2007-03-31 00:58:11 UTC (rev 9055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java 2007-03-31 01:28:52 UTC (rev 9056)
@@ -37,9 +37,17 @@
*/
public class FOLineNonText implements org.axsl.foR.FOLineNonText {
+ /** The wrapped non-text item. */
private org.axsl.foR.FOLineNonText realLineNonText;
+
+ /** The FO context for this non-text item. */
private FOContext context;
+ /**
+ * Constructor.
+ * @param realLineNonText The wrapped non-text item.
+ * @param context The FO context for this non-text item.
+ */
public FOLineNonText(final org.axsl.foR.FOLineNonText realLineNonText,
final FOContext context) {
this.realLineNonText = realLineNonText;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2007-03-31 00:58:11 UTC (rev 9055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java 2007-03-31 01:28:52 UTC (rev 9056)
@@ -39,9 +39,17 @@
*/
public class FOLineText implements org.axsl.foR.FOLineText {
+ /** The wrapped text item. */
private org.axsl.foR.FOLineText realLineText;
+
+ /** The FO context for this text item. */
private FOContext context;
+ /**
+ * Constructor.
+ * @param realLineText The wrapped text item.
+ * @param context The FO context for this text item.
+ */
public FOLineText(final org.axsl.foR.FOLineText realLineText,
final FOContext context) {
this.realLineText = realLineText;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-03-31 00:58:11 UTC (rev 9055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java 2007-03-31 01:28:52 UTC (rev 9056)
@@ -104,6 +104,12 @@
return getParent();
}
+ /**
+ * Returns the effective parent of a Marker instance.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
+ * @return The parent of the RetrieveMarker instance found in the context.
+ */
private FObj effectiveMarkerParent(final FOContext context) {
if (context == null) {
/* TODO: Consider throwing an Exception. This should NOT
@@ -152,6 +158,14 @@
this.getColumn());
}
+ /**
+ * Creates a context message from a given set of Locator information, which
+ * is useful in user messages.
+ * @param systemId The path to the document.
+ * @param line The line number in systemId.
+ * @param column The column number in line.
+ * @return A String describing the location specified.
+ */
public String getContextMessage(final String systemId, final int line,
final int column) {
return " Context: " + systemId + "\n"
@@ -172,18 +186,37 @@
return parent.ancestorMarker();
}
+ /**
+ * Return the ancestor tree builder.
+ * @return The ancestor tree builder.
+ */
public FOTreeBuilder getFOTreeBuilder() {
return getParent().getFOTreeBuilder();
}
+ /**
+ * Return the logger.
+ * @return The logger.
+ */
public Log getLogger() {
return getParent().getLogger();
}
+ /**
+ * Convenience method handling some details of throwing a parsing exception.
+ * @param message The message indicating the reason for the exception.
+ * @throws FOTreeException Always, as that is the purpose of this method.
+ */
public void throwException(final String message) throws FOTreeException {
throwException(getContextMessage(), message);
}
+ /**
+ * Convenience method handling some details of throwing a parsing exception.
+ * @param contextMessage The context portion of the exception message.
+ * @param message The message indicating the reason for the exception.
+ * @throws FOTreeException Always, as that is the purpose of this method.
+ */
public void throwException(final String contextMessage,
final String message) throws FOTreeException {
final FOTreeException exception = new FOTreeException(message);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2007-03-31 00:58:11 UTC (rev 9055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2007-03-31 01:28:52 UTC (rev 9056)
@@ -269,19 +269,33 @@
throw new SAXException(new FOTreeException(fote));
}
+ /**
+ * Reset this parser for reuse.
+ */
public void reset() {
currentFObj = null;
rootFObj = null;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean hasData() {
return rootFObj != null;
}
+ /**
+ * Returns the logger.
+ * @return The logger.
+ */
public Log getLogger() {
return this.logger;
}
+ /**
+ * Returns the line number currently showing in the SAX Locator.
+ * @return The line number currently showing in the SAX Locator.
+ */
private int getLine() {
int line = -1;
if (locator != null) {
@@ -290,6 +304,10 @@
return line;
}
+ /**
+ * Returns the column number currently showing in the SAX Locator.
+ * @return The column number currently showing in the SAX Locator.
+ */
private int getColumn() {
int column = -1;
if (locator != null) {
@@ -371,18 +389,34 @@
}
}
+ /**
+ * Return the FO namespace instance.
+ * @return The FO namespace instance.
+ */
public NamespaceFO getFONamespace() {
return getTreeServer().getFONamespace();
}
+ /**
+ * Return the Extension namespace instance.
+ * @return The Extension namespace instance.
+ */
public NamespaceExtensions getExtensionNamespace() {
return getTreeServer().getExtensionNamespace();
}
+ /**
+ * Return the SVG namespace instance.
+ * @return The SVG namespace instance.
+ */
public NamespaceSVG getSVGNamespace() {
return getTreeServer().getSVGNamespace();
}
+ /**
+ * Return the XML namespace instance.
+ * @return The XML namespace instance.
+ */
public NamespaceXML getXMLNamespace() {
return getTreeServer().getXMLNamespace();
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2007-03-31 00:58:11 UTC (rev 9055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2007-03-31 01:28:52 UTC (rev 9056)
@@ -35,6 +35,8 @@
*/
public abstract class FObjMixed extends FObj {
+ /** The text buffer used to accumulate the text portion of the mixed
+ * content. */
private StringBuilder textBuffer;
/**
@@ -51,6 +53,10 @@
super(parent, propertyList, systemId, line, column);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
protected void addCharacters(final char data[], final int start,
final int length, final String systemId, final int line,
final int column) {
@@ -60,6 +66,9 @@
textBuffer.append(data, start, length);
}
+ /**
+ * Flushes any remaining text into an FOText item.
+ */
protected void finalizeText() {
if (! this.shouldCreateFOText()) {
return;
@@ -70,6 +79,11 @@
textBuffer.setLength(0);
}
+ /**
+ * Indicates whether an FOText item should be created from the buffer.
+ * @return True iff an FOText item should be created from the buffer
+ * contents.
+ */
private boolean shouldCreateFOText() {
if (textBuffer == null) {
return false;
@@ -94,11 +108,18 @@
*/
public abstract boolean blockMustEnclosePCDATA();
+ /**
+ * {@inheritDoc}
+ */
protected void end() throws FOTreeException {
finalizeText();
textBuffer = null;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
protected void addChild(final FONode child) {
/*
* Before adding the element child, see if there is any text in the
@@ -110,14 +131,26 @@
super.addChild(child);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public boolean canContainBlock() {
return true;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public boolean canContainInline() {
return true;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public boolean canContainPCDATA() {
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2007-03-31 00:58:11 UTC (rev 9055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2007-03-31 01:28:52 UTC (rev 9056)
@@ -55,6 +55,8 @@
/**
* Returns the width of the content.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return The width, in millipoints, of the content of this object, as
* reported by the content itself.
*/
@@ -62,6 +64,8 @@
/**
* Returns the height of the content.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return The height, in millipoints, of the content of this object, as
* reported by the content itself.
*/
@@ -109,6 +113,8 @@
* Converts a quantity of pixels to a length in millipoints, using the
* value passed in pixelsPerInch.
* @param pixels The quantity of pixels to be converted to millipoints.
+ * @param pixelsPerInch The resolution, in pixels-per-inch, at which the
+ * conversion should take place.
* @return The millipoint equivalent of pixels.
*/
public static int pixelsToMillipoints(final int pixels,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2007-03-31 00:58:11 UTC (rev 9055)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2007-03-31 01:28:52 UTC (rev 9056)
@@ -139,6 +139,16 @@
* This is pretending to be a SAX Handler for the start of an element.
* Control is passed here from FOTreeBuilder while foreign XML is being
* processed.
+ * @param namespaceURI The Namespace URI, or the empty string if the element
+ * has no Namespace URI or if Namespace processing is not being performed.
+ * @param localName The local name (without prefix), or the empty string if
+ * Namespace processing is not being performed.
+ * @param rawName The qualified name (with prefix), or the empty string if
+ * qualified names are not available.
+ * @param attlist The attributes attached to the element. If there are no
+ * attributes, it shall be an empty Attributes object.
+ * @exception org.xml.sax.SAXException Any SAX exception, possibly wrapping
+ * another exception.
*/
public void startElement(final String namespaceURI, final String localName,
final String rawName, final Attributes attlist)
@@ -172,6 +182,14 @@
* This is pretending to be a SAX Handler for the end of an element.
* Control is passed here from FOTreeBuilder while foreign XML is being
* processed.
+ * @param uri The Namespace URI, or the empty string if the element has no
+ * Namespace URI or if Namespace processing is not being performed.
+ * @param localName The local name (without prefix), or the empty string if
+ * Namespace processing is not being performed.
+ * @param rawName The qualified name (with prefix), or the empty string if
+ * qualified names are not available.
+ * @exception org.xml.sax.SAXException Any SAX exception, possibly wrapping
+ * another exception.
*/
public void endElement(final String uri, final String localName,
final String rawName) throws SAXException {
@@ -200,14 +218,27 @@
* an element.
* Control is passed here from FOTreeBuilder while foreign XML is being
* processed.
+ * @param data The characters.
+ * @param start The start position in the character array.
+ * @param length The number of characters to use from the character array.
*/
protected void characters(final char[] data, final int start,
final int length) {
this.stringBuffer.append(data, start, length);
}
+ /**
+ * Returns the intrinsic content width of the foreign XML item.
+ * @return The intrinsic content width of the foreign XML item,
+ * in millipoints.
+ */
public abstract int intrinsicContentWidth();
+ /**
+ * Returns the intrinsic content height of the foreign XML item.
+ * @return The intrinsic content height of the foreign XML item,
+ * in millipoints.
+ */
public abstract int intrinsicContentHeight();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-31 00:58:11
|
Revision: 9055
http://svn.sourceforge.net/foray/?rev=9055&view=rev
Author: victormote
Date: 2007-03-30 17:58:11 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyException.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyListUnparsed.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FOTreeBuilder.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -66,38 +66,52 @@
/** The root of the formatting object tree. */
private Root rootFObj = null;
+ /** The SAX locator. */
private Locator locator;
- /**
- * Collection of objects that have registered to be notified about
- * FOTreeEvent firings.
- */
+ /** Collection of objects that have registered to be notified about
+ * FOTreeEvent firings. */
private List<FOTreeListener> foTreeListeners
= new ArrayList<FOTreeListener>();
- /**
- * Keeps a count of how many FOTreeListeners have requested notification
- * of FObj-complete events.
- */
+ /** Keeps a count of how many FOTreeListeners have requested notification
+ * of FObj-complete events. */
private int qtyFObjListeners = 0;
+ /** Indicates whether we are currently inside foreign XML. */
private ForeignXML activeForeignXML = null;
+ /** The parent server. */
private FOrayFOTreeServer server;
+ /** The logger. */
private Log logger;
+ /** The graphic server. */
private GraphicServer graphicServer;
+
+ /** The text server. */
private TextServer textServer;
+
+ /** The font consumer. */
private FontConsumer fontConsumer;
+
+ /** The paths to search when looking for graphics. */
private URL[] graphicSearchPath;
+
+ /** Indicates whether graphics should be cached. */
private boolean cachingGraphics;
- /** The last sequential index assigned. */
- /* Zero is reserved for Root, but that value is hard-coded, and not obtained
- * from this variable, so we initialize the variable to zero.*/
+ /** The last sequential index assigned. Zero is reserved for Root, but that
+ * value is hard-coded, and not obtained from this variable, so we
+ * initialize the variable to zero.*/
private int lastSequentialIndex = 0;
+ /**
+ * Constructor.
+ * @param server The parent server.
+ * @param logger The logger.
+ */
public FOTreeBuilder(final FOrayFOTreeServer server, final Log logger) {
this.server = server;
this.logger = logger;
@@ -106,6 +120,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void characters(final char[] data, final int start, final int length)
throws SAXException {
if (activeForeignXML != null) {
@@ -127,6 +142,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void endElement(final String uri, final String localName,
final String rawName) throws SAXException {
if (activeForeignXML != null) {
@@ -155,17 +171,26 @@
/**
* {@inheritDoc}
*/
+ @Override
public void startDocument() throws SAXException {
// Allow the FOTreeBuilder to be reused
rootFObj = null;
getLogger().info("Begin parsing the Formatting Object (FO) input.");
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void endDocument() throws SAXException {
getLogger().info("End parsing the Formatting Object (FO) input.");
notifyDocumentComplete();
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void setDocumentLocator(final Locator locator) {
this.locator = locator;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -62,16 +62,30 @@
*/
public abstract class FObj extends FONode implements org.axsl.foR.FObj {
- /* TODO: Consider making this an array to minimize casting, and to save
- * memory, at the expense of processing time. (Use ArrayList during parsing,
- * then convert to array when parsing is complete.)*/
+ /** The children of this object. */
private List<FONode> children = new ArrayList<FONode>();
+ /** The property list for this object. */
private PropertyList propertyList;
+
+ /** The path to the document from which this object was parsed, if any. */
private String systemId;
+
+ /** The line number in {@link #systemId} at which this object was parsed. */
private int line;
+
+ /** The column number in {@link #line} at which this object was parsed. */
private int column;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
protected FObj(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
// Register the parent as the parent of this.
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -37,6 +37,15 @@
private StringBuilder textBuffer;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
protected FObjMixed(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -39,6 +39,15 @@
public abstract class FObjScaled extends FObj
implements org.axsl.foR.FObjScaled {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public FObjScaled(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Namespace.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -48,6 +48,9 @@
private int errorCount = 0;
+ /**
+ * Constructor.
+ */
public Namespace() {
}
@@ -64,6 +67,18 @@
*/
public abstract String getTypicalPrefix();
+ /**
+ * Parse an element in this namespace.
+ * @param localName The local name of the element.
+ * @param currentFObj The current FObj, that is, the parent of the one
+ * being parsed.
+ * @param list The property list into which properties for the new FObj
+ * should be placed.
+ * @param locator The SAX locator.
+ * @param builder The FO Tree builder.
+ * @return The newly-created FObj instance.
+ * @throws FOTreeException For parsing errors.
+ */
public FObj parseElement(final String localName,
final FObj currentFObj, final PropertyList list,
final Locator locator,
@@ -76,7 +91,18 @@
return fobj;
}
- public abstract FObj parseElementForNS(
+ /**
+ * The namespace-specific logic for paring an element.
+ * @param localName The local name of the element.
+ * @param currentFObj The current FObj, that is, the parent of the one
+ * being parsed.
+ * @param list The property list into which properties for the new FObj
+ * should be placed.
+ * @param locator The SAX locator.
+ * @return The newly-created FObj instance.
+ * @throws FOTreeException For parsing errors.
+ */
+ protected abstract FObj parseElementForNS(
String localName, FObj currentFObj, PropertyList list,
Locator locator) throws FOTreeException;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyException.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyException.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyException.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -32,8 +32,14 @@
* Exception class for handling errors during property parsing.
*/
public class PropertyException extends Exception {
+
+ /** Constant needed for serialization. */
static final long serialVersionUID = 613178531358859549L;
+ /**
+ * Constructor.
+ * @param detail The detail exception message.
+ */
public PropertyException(final String detail) {
super(detail);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -289,6 +289,8 @@
/**
* See XSL-FO 1.0, Section 5.5.6.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return True iff this should be underlined.
*/
public boolean getUnderlineScore(final FOContext context) {
@@ -301,6 +303,8 @@
/**
* See XSL-FO 1.0, Section 5.5.6.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return True iff this should be overlined.
*/
public boolean getOverlineScore(final FOContext context) {
@@ -313,6 +317,8 @@
/**
* See XSL-FO 1.0, Section 5.5.6.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return True iff this should be through-scored (i.e. a line drawn
* through, as if it were crossed out).
*/
@@ -326,6 +332,8 @@
/**
* See XSL-FO 1.0, Section 5.5.6.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return True iff this should be through-scored (i.e. a line drawn
* through, as if it were crossed out).
*/
@@ -339,6 +347,8 @@
/**
* Common logic for retrieving margin values.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param absoluteDirection One of WritingModeDT.DIRECTION_TOP,
* WritingModeDT.DIRECTION_BOTTOM, WritingModeDT.DIRECTION_LEFT,
* WritingModeDT.DIRECTION_RIGHT.
@@ -369,6 +379,8 @@
/**
* Determines whether a corresponding margin property exists for a
* relative direction.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param relativeDirection The relative Direction to be tested, one of
* WritingModeDT.DIRECTION_BEFORE, WritingModeDT.DIRECTION_AFTER,
* WritingModeDT.DIRECTION_LEFT, or WritingModeDT.DIRECTION_RIGHT.
@@ -511,6 +523,8 @@
/**
* Returns the start-indent value.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param ipdContainingRA The inline-progression-dimension of the containing
* reference area, in millipoints. This is used when the property value is
* a percentage.
@@ -1105,6 +1119,8 @@
* that the line-height property can take are expressions of a multiplier
* of the font-size for the object. This includes the keyword "normal",
* a <em>number</em>, and a <em>percentage</em>.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return The line-height multiplier value, expressed as a float. For
* example, if the line-height should be computed
*/
@@ -1124,6 +1140,8 @@
/**
* Returns the line-height.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param rangeID One of MINIMUM, OPTIMUM, OR MAXIMUM.
* @return The line-height, in millipoints.
*/
@@ -1437,6 +1455,8 @@
/**
* Returns the scaling factor for the width.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return The scaling factor that should be applied to the intrinsic
* width of the content.
*/
@@ -1448,6 +1468,8 @@
/**
* Returns the scaling factor for the height.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return The scaling factor that should be applied to the intrinsic
* height of the content.
*/
@@ -1482,6 +1504,8 @@
/**
* Returns the minimum leader length.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param parentAreaContentIPD The IPD of the content-rectangle of the
* parent area, per XSL-FO 1.0, Sec. 7.21.4. This value is needed for
* computations that are percent-based, but is ignored for others.
@@ -1494,6 +1518,8 @@
/**
* Returns the optimum leader length.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param parentAreaContentIPD The IPD of the content-rectangle of the
* parent area, per XSL-FO 1.0, Sec. 7.21.4. This value is needed for
* computations that are percent-based, but is ignored for others.
@@ -1531,6 +1557,8 @@
/**
* Returns the leader pattern width.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param ipdCRParent
* @return -1 for "use-font-metrics".
*/
@@ -1595,6 +1623,8 @@
/**
* Main method for getting Relative Dimension information (inline-
* progression-dimension & block-progression-dimension).
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param parentAreaCRDimension Per XSL-FO Std 1.0, Section 7.14.5, "the
* corresponding dimension of the closest area ancestor that was generated
* by a block-level formatting object." Used only when the
@@ -1883,6 +1913,8 @@
/**
* Returns the border width.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param direction
* @param isOuterEdge For "before" and "start", set this to "true" if the
* area for which this width is computed "is-first" in the reference area.
@@ -1925,6 +1957,8 @@
/**
* Returns the padding width.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param direction
* @param isOuterEdge For "before" and "start", set this to "true" if the
* area for which this width is computed "is-first" in the reference area.
@@ -2115,6 +2149,8 @@
/**
* Returns the leading.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @param rangeID One of MINIMUM, OPTIMUM, or MAXIMUM.
* @return The leading, in millipoints.
*/
@@ -2146,6 +2182,8 @@
/**
* Returns the inline progression direction for odd-numbered lines.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return One of DIRECTION_TOP_TO_BOTTOM, DIRECTION_BOTTOM_TO_TOP,
* DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
* the writing-mode.
@@ -2156,6 +2194,8 @@
/**
* Returns the inline progression direction for even-numbered lines.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return One of DIRECTION_TOP_TO_BOTTOM, DIRECTION_BOTTOM_TO_TOP,
* DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
* the writing-mode.
@@ -2166,6 +2206,8 @@
/**
* Returns the block progression direction.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return One of DIRECTION_TOP_TO_BOTTOM, DIRECTION_BOTTOM_TO_TOP,
* DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
* the writing-mode.
@@ -2176,6 +2218,8 @@
/**
* Returns the shift direction for odd-numbered lines.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return One of DIRECTION_TOP_TO_BOTTOM, DIRECTION_BOTTOM_TO_TOP,
* DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
* the writing-mode.
@@ -2186,6 +2230,8 @@
/**
* Returns the shift direction for even-numbered lines.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return One of DIRECTION_TOP_TO_BOTTOM, DIRECTION_BOTTOM_TO_TOP,
* DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
* the writing-mode.
@@ -3272,6 +3318,8 @@
/**
* Tells which axis (horizontal or vertical) is the block-progression axis.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
* is invalid.
*/
@@ -3281,6 +3329,8 @@
/**
* Tells which axis (horizontal or vertical) is the inline-progression axis.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
* @return Either AXIS_HORIZONTAL or AXIS_VERTICAL, or -1 if writing-mode
* is invalid.
*/
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyListUnparsed.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyListUnparsed.java 2007-03-31 00:24:24 UTC (rev 9054)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyListUnparsed.java 2007-03-31 00:58:11 UTC (rev 9055)
@@ -39,13 +39,23 @@
*/
public class PropertyListUnparsed extends PropertyList {
+ /** The unparsed attributes that make up the properties in this list. */
private Attributes attributes;
+ /**
+ * Constructor.
+ * @param attr The unparsed attributes that make up the properties in this
+ * list.
+ */
public PropertyListUnparsed(final Attributes attr) {
super();
attributes = attr;
}
+ /**
+ * Return the unparsed attributes.
+ * @return The unparsed attributes.
+ */
public Attributes getAttributes() {
return attributes;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-31 00:24:24
|
Revision: 9054
http://svn.sourceforge.net/foray/?rev=9054&view=rev
Author: victormote
Date: 2007-03-30 17:24:24 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/AbstractFoProperty.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2007-03-30 23:46:12 UTC (rev 9053)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/Property.java 2007-03-31 00:24:24 UTC (rev 9054)
@@ -65,27 +65,60 @@
public Property(final PropertyList propertyList) {
}
+ /**
+ * Constructor used when the property value has already been parsed.
+ * @param propertyList The PropertyList instance to which this Property
+ * will be added.
+ * @param value This property's value.
+ */
public Property(final PropertyList propertyList,
final PropertyValue value) {
this(propertyList);
this.value = value;
}
+ /**
+ * Sets the value for this property.
+ * @param value The new value.
+ */
public void setPropertyValue(final PropertyValue value) {
this.value = value;
}
+ /**
+ * Returns the value for this property.
+ * @return The value for this property.
+ */
public final PropertyValue value() {
return value;
}
+ /**
+ * Returns the type of this property.
+ * @return The type of this property.
+ */
public abstract PropertyType getPropertyType();
+ /**
+ * Convenience method which returns an exception indicating that the value
+ * of this property does not meet the properties requirements.
+ * @param value The unparsed property value.
+ * @param propertyList The property list of the parent FObj.
+ * @return The newly-constructed exception.
+ */
protected PropertyException unexpectedValue(final String value,
final PropertyList propertyList) {
return unexpectedValue(value, propertyList, null);
}
+ /**
+ * Convenience method which returns an exception indicating that the value
+ * of this property does not meet the properties requirements.
+ * @param value The unparsed property value.
+ * @param propertyList The property list of the parent FObj.
+ * @param reason The reason for the failure.
+ * @return The newly-constructed exception.
+ */
protected PropertyException unexpectedValue(final String value,
final PropertyList propertyList, final String reason) {
return new PropertyException(unexpectedValueMessage(reason, value,
@@ -129,6 +162,11 @@
return buffer.toString();
}
+ /**
+ * Creates a string indicating that the passed property name is not valid.
+ * @param propertyName The name of the property that is not valid.
+ * @return A string indicating that the passed property name is not valid.
+ */
public static String invalidPropertyName(final String propertyName) {
return "Invalid property: " + propertyName + "'.";
}
@@ -169,8 +207,21 @@
return pv;
}
+ /**
+ * Returns the valid keywords for this property.
+ * @return The valid keywords for this property.
+ */
protected abstract FoValue[] getValidKeywords();
+ /**
+ * Checks the keywords for this property, returning an appropriate property
+ * value if a keyword is detected.
+ * @param validKeywords The array of valid keywords.
+ * @param possibleKeyword The token to be evaluated against the valid
+ * keywords.
+ * @return If <code>possibleKeyword</code> is found in the validKeywords,
+ * return an appropriate property value instance, otherwise returns null.
+ */
protected PropertyKeyword checkKeywords(final FoValue[] validKeywords,
final String possibleKeyword) {
if (validKeywords == null
@@ -186,6 +237,14 @@
return null;
}
+ /**
+ * Searches an array of keywords to see if a keyword candidate is found in
+ * that list.
+ * @param possibleKeyword The candidate keyword being tested.
+ * @param validKeywords The array of valid keywords.
+ * @return If found, returns the index into <code>validKeywords</code>,
+ * otherwise returns -1.
+ */
public static int getKeywordIndex(final FoValue possibleKeyword,
final FoValue[] validKeywords) {
if (validKeywords == null) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/AbstractFoProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/AbstractFoProperty.java 2007-03-30 23:46:12 UTC (rev 9053)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/AbstractFoProperty.java 2007-03-31 00:24:24 UTC (rev 9054)
@@ -35,18 +35,30 @@
import org.axsl.common.FoProperty;
/**
- * Superclass for properties in the "xml:" namespace.
+ * Superclass for properties in the "fo:" namespace.
*/
public abstract class AbstractFoProperty extends Property {
+ /** This property's type. */
private FoProperty foPropertyType;
+ /**
+ * Constructor for properties whose value has not yet been established.
+ * @param propertyList The parent object's list of properties.
+ * @param foPropertyType The property type of this property.
+ */
public AbstractFoProperty(final PropertyList propertyList,
final FoProperty foPropertyType) {
super(propertyList);
this.foPropertyType = foPropertyType;
}
+ /**
+ * Constructor for properties with a known value.
+ * @param propertyList The parent object's list of properties.
+ * @param foPropertyType The property type of this property.
+ * @param value The value of this property.
+ */
public AbstractFoProperty(final PropertyList propertyList,
final FoProperty foPropertyType, final PropertyValue value) {
super(propertyList, value);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java 2007-03-30 23:46:12 UTC (rev 9053)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/NamespaceFO.java 2007-03-31 00:24:24 UTC (rev 9054)
@@ -46,24 +46,39 @@
*/
public class NamespaceFO extends Namespace {
+ /**
+ * Constructor.
+ */
public NamespaceFO() {
super();
}
+ /**
+ * {@inheritDoc}
+ */
public String getNamespaceURI() {
return "http://www.w3.org/1999/XSL/Format";
}
+ /**
+ * {@inheritDoc}
+ */
public String getTypicalPrefix() {
return "fo";
}
+ /**
+ * {@inheritDoc}
+ */
public FObj parseElementForNS(final String localName,
final FObj currentFObj, final PropertyList list,
final Locator locator) throws FOTreeException {
return ObjectMakerFO.makeObject(localName, currentFObj, list, locator);
}
+ /**
+ * {@inheritDoc}
+ */
public void parseAttributes(final PropertyList propertyList,
final Attributes attlist, final FObj currentFObj,
final Locator locator, final FOTreeBuilder builder)
@@ -77,6 +92,9 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
public Property parseAttributeForNS(final Attributes attributes,
final String attributeName, final String attributeValue,
final PropertyList propertyList, final Locator locator)
@@ -93,6 +111,9 @@
return property;
}
+ /**
+ * {@inheritDoc}
+ */
protected PropertyList createNewPropertyList(final String localName,
final Attributes attlist) {
return new PropertyList();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2007-03-30 23:46:12 UTC (rev 9053)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2007-03-31 00:24:24 UTC (rev 9054)
@@ -63,6 +63,7 @@
*/
public final class PropertyParser extends PropertyTokenizer {
+ /** The function list of the parent FObj of the expression being parsed. */
private PropertyList propertyList;
/** Stack of functions being evaluated. */
@@ -116,8 +117,9 @@
}
/**
- * Try to parse an addition or subtraction expression and return the
- * resulting Property.
+ * Parse an addition or subtraction expression.
+ * @return The expression parsed.
+ * @throws PropertyException For errors parsing the expression.
*/
private ExprAdditive parseAdditiveExpr() throws PropertyException {
// Evaluate and put result on the operand stack
@@ -142,8 +144,9 @@
}
/**
- * Try to parse a multiply, divide or modulo expression and return
- * the resulting Property.
+ * Parse a multiply, divide or modulo expression.
+ * @return The expression parsed.
+ * @throws PropertyException For errors parsing the expression.
*/
private ExprMultiplicative parseMultiplicativeExpr()
throws PropertyException {
@@ -171,8 +174,9 @@
}
/**
- * Try to parse a unary minus expression and return the
- * resulting Property.
+ * Parse a unary minus expression.
+ * @return The expression parsed.
+ * @throws PropertyException For errors parsing the expression.
*/
private ExprUnary parseUnaryExpr() throws PropertyException {
if (getCurrentToken() == TOK_MINUS) {
@@ -184,8 +188,10 @@
/**
- * Checks that the current token is a right parenthesis
- * and throws an exception if this isn't the case.
+ * Checks that the current token is a right parenthesis and throws an
+ * exception if this isn't the case.
+ * @throws PropertyException If the current token is not a right
+ * parenthesis.
*/
private void expectRpar() throws PropertyException {
if (getCurrentToken() != TOK_RPAR) {
@@ -195,12 +201,13 @@
}
/**
- * Try to parse a primary expression and return the
- * resulting Property.
+ * Parse a primary expression.
* A primary expression is either a parenthesized expression or an
* expression representing a primitive Property datatype, such as a
* string literal, an NCname, a number or a unit expression, or a
* function call expression.
+ * @return The expression parsed.
+ * @throws PropertyException For errors parsing the expression.
*/
private ExprPrimary parsePrimaryExpr() throws PropertyException {
ExprPrimary prop;
@@ -276,6 +283,11 @@
return prop;
}
+ /**
+ * Parse an inner expression.
+ * @return The expression parsed.
+ * @throws PropertyException For errors parsing the expression.
+ */
private ExprInner parseInnerExpression() throws PropertyException {
final ExprAdditive expr = parseAdditiveExpr();
if (expr instanceof ExprNumeric) {
@@ -423,6 +435,10 @@
ExprNumeric.OPERATION_MOD);
}
+ /**
+ * Pushes a function onto the stack of functions being evaluated.
+ * @param func The function to push onto the stack.
+ */
public void pushFunction(final Function func) {
if (stkFunction == null) {
stkFunction = new Stack<Function>();
@@ -430,6 +446,9 @@
stkFunction.push(func);
}
+ /**
+ * Pops an item off of the function stack.
+ */
public void popFunction() {
if (stkFunction != null) {
stkFunction.pop();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java 2007-03-30 23:46:12 UTC (rev 9053)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java 2007-03-31 00:24:24 UTC (rev 9054)
@@ -33,28 +33,62 @@
/**
* Class to tokenize XSL FO property expression.
- * This class is heavily based on the epxression tokenizer in James Clark's
+ * This class is heavily based on the expression tokenizer in James Clark's
* XT, an XSLT processor.
*/
class PropertyTokenizer {
+ /** Constant indicating end-of-file. */
static final int TOK_EOF = 0;
+
+ /** Constant indicating an NCName. */
static final int TOK_NCNAME = TOK_EOF + 1;
+
+ /** Constant indicating the multiplication symbol. */
static final int TOK_MULTIPLY = TOK_NCNAME + 1;
+
+ /** Constant indicating a left parentheses. */
static final int TOK_LPAR = TOK_MULTIPLY + 1;
+
+ /** Constant indicating a right parentheses. */
static final int TOK_RPAR = TOK_LPAR + 1;
+
+ /** Constant indicating a literal. */
static final int TOK_LITERAL = TOK_RPAR + 1;
+
+ /** Constant indicating a number. */
static final int TOK_NUMBER = TOK_LITERAL + 1;
+
+ /** Constant indicating a left parentheses at the start of a function. */
static final int TOK_FUNCTION_LPAR = TOK_NUMBER + 1;
+
+ /** Constant indicating a plus sign. */
static final int TOK_PLUS = TOK_FUNCTION_LPAR + 1;
+
+ /** Constant indicating a minus sign. */
static final int TOK_MINUS = TOK_PLUS + 1;
+
+ /** Constant indicating a mod operation. */
static final int TOK_MOD = TOK_MINUS + 1;
+
+ /** Constant indicating a division operation. */
static final int TOK_DIV = TOK_MOD + 1;
+
static final int TOK_NUMERIC = TOK_DIV + 1;
+
+ /** Constant indicating a comma. */
static final int TOK_COMMA = TOK_NUMERIC + 1;
+
+ /** Constant indicating a percent. */
static final int TOK_PERCENT = TOK_COMMA + 1;
+
+ /** Constant indicating a color specification. */
static final int TOK_COLORSPEC = TOK_PERCENT + 1;
+
+ /** Constant indicating a float. */
static final int TOK_FLOAT = TOK_COLORSPEC + 1;
+
+ /** Constant indicating an integer. */
static final int TOK_INTEGER = TOK_FLOAT + 1;
private static final int CS = 1;
@@ -109,8 +143,13 @@
private String currentTokenValue = null;
private int currentTokenStartIndex = 0;
+
+ /** The current expression being parsed. */
private /* final */ String expr;
+
private int exprIndex = 0;
+
+ /** The length, in chars, of {@link expr}. */
private int exprLength;
@@ -329,6 +368,8 @@
/**
* Return a boolean value indicating whether the following non-whitespace
* character is an opening parenthesis.
+ * @return True iff The following non-whitespace character is an opening
+ * parenthesis.
*/
private boolean followingParen() {
for (int i = exprIndex; i < exprLength; i++) {
@@ -351,7 +392,8 @@
/**
* Return a boolean value indicating whether the argument is a
* decimal digit (0-9).
- * @param c The character to check
+ * @param c The character to check.
+ * @return True iff the test character is a decimal digit.
*/
private static boolean isDigit(final char c) {
return c > 0
@@ -362,7 +404,8 @@
/**
* Return a boolean value indicating whether the argument is a
* hexadecimal digit (0-9, A-F, a-f).
- * @param c The character to check
+ * @param c The character to check.
+ * @return True iff the test character is a hexadecimal digit.
*/
private static boolean isHexDigit(final char c) {
return c > 0
@@ -373,7 +416,8 @@
/**
* Return a boolean value indicating whether the argument is a valid name
* start character, ie. can start a NAME as defined by XSL.
- * @param c The character to check
+ * @param c The character to check.
+ * @return True iff The test character is a valid start-of-name character.
*/
private static boolean isNameStartChar(final char c) {
return c >= WKConstants.MAX_7_BIT_UNSIGNED_VALUES
@@ -384,7 +428,8 @@
/**
* Return a boolean value indicating whether the argument is a valid name
* character, ie. can occur in a NAME as defined by XSL.
- * @param c The character to check
+ * @param c The character to check.
+ * @return True iff The test character is a valid name character.
*/
private static boolean isNameChar(final char c) {
return c > WKConstants.MAX_7_BIT_UNSIGNED_VALUES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 23:46:11
|
Revision: 9053
http://svn.sourceforge.net/foray/?rev=9053&view=rev
Author: victormote
Date: 2007-03-30 16:46:12 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2007-03-30 23:36:11 UTC (rev 9052)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2007-03-30 23:46:12 UTC (rev 9053)
@@ -80,13 +80,17 @@
/**
* Constructor.
- * @param parentFO the parent formatting object
- * @param propertyList the explicit properties of this object
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
*/
- public ForeignXML(final FObj parentFO,
- final PropertyListUnparsed propertyList, final String tag,
+ public ForeignXML(final FObj parent,
+ final PropertyListUnparsed propertyList,
final String systemId, final int line, final int column) {
- super(parentFO, propertyList, systemId, line, column);
+ super(parent, propertyList, systemId, line, column);
this.domDocument = createDOMDocument();
this.currentElement = domDocument.getDocumentElement();
processAttributes(this.currentElement, propertyList.getAttributes());
@@ -116,10 +120,17 @@
*/
protected abstract Document createDOMDocument();
+ /**
+ * Returns the DOM Document accumulated within this foreign XML.
+ * @return The DOM Document.
+ */
public Document getDocument() {
return domDocument;
}
+ /**
+ * {@inheritDoc}
+ */
public String getName() {
return "foreign-xml";
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java 2007-03-30 23:36:11 UTC (rev 9052)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java 2007-03-30 23:46:12 UTC (rev 9053)
@@ -91,14 +91,23 @@
return;
}
+ /**
+ * {@inheritDoc}
+ */
public String getName() {
return "continued-label";
}
+ /**
+ * {@inheritDoc}
+ */
public Namespace getNamespace() {
return this.getFOTreeBuilder().getExtensionNamespace();
}
+ /**
+ * {@inheritDoc}
+ */
public Object acceptProxyFactory(final ProxyFactory factory) {
return factory.makeProxy(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2007-03-30 23:36:11 UTC (rev 9052)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2007-03-30 23:46:12 UTC (rev 9053)
@@ -76,8 +76,7 @@
= (PropertyListUnparsed) propertyList;
switch (enumeration) {
default: {
- return new SVGElement(parent, propertyListUnparsed,
- enumeration.toSVG(), systemId, line,
+ return new SVGElement(parent, propertyListUnparsed, systemId, line,
column);
}
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java 2007-03-30 23:36:11 UTC (rev 9052)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java 2007-03-30 23:46:12 UTC (rev 9053)
@@ -57,19 +57,25 @@
public class SVGElement extends ForeignXML
implements org.axsl.foR.svg.SVGElement {
+ /** The Batik bridge context for this element. */
private BridgeContext bridgeContext = null;
+
+ /** The Batik unit processor context for this element. */
private UnitProcessor.Context unitProcessorContext = null;
/**
* Constructor.
- *
- * @param parent the parent formatting object
- * @param propertyList the explicit properties of this object
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
*/
public SVGElement(final FObj parent,
- final PropertyListUnparsed propertyList, final String tag,
+ final PropertyListUnparsed propertyList,
final String systemId, final int line, final int column) {
- super(parent, propertyList, tag, systemId, line, column);
+ super(parent, propertyList, systemId, line, column);
}
/**
@@ -117,10 +123,18 @@
return (SVGDocument) this.getDocument();
}
+ /**
+ * Returns the root element of the ancestor SVG document.
+ * @return The root element of the ancestor SVG document.
+ */
public Element getSVGRoot() {
return getSVGDocument().getRootElement();
}
+ /**
+ * Returns the Batik bridge context for this element.
+ * @return The Batik bridge context for this element.
+ */
public BridgeContext getBridgeContext() {
if (this.bridgeContext == null) {
this.bridgeContext = this.makeBridgeContext();
@@ -140,6 +154,10 @@
return new BridgeContext(userAgent);
}
+ /**
+ * Returns the Batik unit processor context for this element.
+ * @return The Batik unit processor context for this element.
+ */
public UnitProcessor.Context getUnitProcessorContext() {
if (this.unitProcessorContext == null) {
this.unitProcessorContext = UnitProcessor.createContext(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 23:36:13
|
Revision: 9052
http://svn.sourceforge.net/foray/?rev=9052&view=rev
Author: victormote
Date: 2007-03-30 16:36:11 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SubSequenceSpecifier.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -39,6 +39,15 @@
*/
public abstract class AbstractFlow extends FObj {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
protected AbstractFlow(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -38,6 +38,15 @@
*/
public abstract class AbstractPageMaster extends FObj {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public AbstractPageMaster(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -42,6 +42,15 @@
public abstract class AbstractTableBody extends FObj
implements org.axsl.foR.fo.AbstractTableBody {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public AbstractTableBody(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -43,6 +43,15 @@
*/
public class BasicLink extends FObjMixed implements org.axsl.foR.fo.BasicLink {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public BasicLink(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class BidiOverride extends FObj
implements org.axsl.foR.fo.BidiOverride {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public BidiOverride(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -48,6 +48,15 @@
*/
public class Block extends FObjMixed implements org.axsl.foR.fo.Block {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Block(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class BlockContainer extends FObj
implements org.axsl.foR.fo.BlockContainer {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public BlockContainer(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,16 @@
* A "bookmark" object in XSL-FO.
*/
public class Bookmark extends FObj implements org.axsl.foR.fo.Bookmark {
+
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Bookmark(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -43,6 +43,15 @@
public class BookmarkTitle extends FObjMixed
implements org.axsl.foR.fo.BookmarkTitle {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public BookmarkTitle(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class BookmarkTree extends FObj
implements org.axsl.foR.fo.BookmarkTree {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public BookmarkTree(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -42,6 +42,15 @@
*/
public class Character extends FObj implements org.axsl.foR.fo.Character {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Character(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class ColorProfile extends FObj
implements org.axsl.foR.fo.ColorProfile {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public ColorProfile(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
*/
public class ConditionalPageMasterReference extends FObj {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public ConditionalPageMasterReference(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class Declarations extends FObj
implements org.axsl.foR.fo.Declarations {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Declarations(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -64,6 +64,15 @@
* then the Graphic could not be resolved. */
private boolean makeGraphicAttempted = false;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public ExternalGraphic(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -40,6 +40,15 @@
*/
public class Float extends FObj implements org.axsl.foR.fo.Float {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Float(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -40,6 +40,15 @@
*/
public class Flow extends AbstractFlow implements org.axsl.foR.fo.Flow {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Flow(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -40,6 +40,15 @@
*/
public class Footnote extends FObj implements org.axsl.foR.fo.Footnote {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Footnote(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class FootnoteBody extends FObj
implements org.axsl.foR.fo.FootnoteBody {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public FootnoteBody(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class InitialPropertySet extends FObj
implements org.axsl.foR.fo.InitialPropertySet {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public InitialPropertySet(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
*/
public class Inline extends FObjMixed implements org.axsl.foR.fo.Inline {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Inline(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class InlineContainer extends FObj
implements org.axsl.foR.fo.InlineContainer {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public InlineContainer(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -46,6 +46,15 @@
public class InstreamForeignObject extends FObjScaled
implements org.axsl.foR.fo.InstreamForeignObject {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public InstreamForeignObject(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -55,6 +55,15 @@
*/
private Map<String, String> regionMap;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public LayoutMasterSet(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -44,6 +44,15 @@
*/
public class Leader extends FObjMixed implements org.axsl.foR.fo.Leader {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Leader(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -40,6 +40,15 @@
*/
public class ListBlock extends FObj implements org.axsl.foR.fo.ListBlock {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public ListBlock(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
*/
public class ListItem extends FObj implements org.axsl.foR.fo.ListItem {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public ListItem(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -42,6 +42,15 @@
public class ListItemBody extends FObj
implements org.axsl.foR.fo.ListItemBody {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public ListItemBody(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -42,6 +42,15 @@
public class ListItemLabel extends FObj
implements org.axsl.foR.fo.ListItemLabel {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public ListItemLabel(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -45,6 +45,15 @@
*/
public class Marker extends FObjMixed implements org.axsl.foR.fo.Marker {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Marker(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
*/
public class MultiCase extends FObj implements org.axsl.foR.fo.MultiCase {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public MultiCase(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class MultiProperties extends FObj
implements org.axsl.foR.fo.MultiProperties {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public MultiProperties(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class MultiPropertySet extends FObj
implements org.axsl.foR.fo.MultiPropertySet {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public MultiPropertySet(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class MultiSwitch extends FObj
implements org.axsl.foR.fo.MultiSwitch {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public MultiSwitch(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -42,6 +42,15 @@
public class MultiToggle extends FObj
implements org.axsl.foR.fo.MultiToggle {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public MultiToggle(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -45,6 +45,15 @@
private static final byte QTY_PLACEHOLDER_DIGITS = 3;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public PageNumber(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -47,6 +47,15 @@
private static final byte QTY_PLACEHOLDER_DIGITS = 3;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public PageNumberCitation(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -65,6 +65,15 @@
/** The object containing the template for the use of page masters. */
private PageSequenceTemplate pageSequenceTemplate;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public PageSequence(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -44,12 +44,15 @@
*/
public class PageSequenceMaster extends FObj implements PageSequenceTemplate {
- // The terminology may be confusing. A 'page-sequence-master' consists
- // of a sequence of what the XSL spec refers to as
- // 'sub-sequence-specifiers'. These are, in fact, simple or complex
- // references to page-masters. So the methods use the former
- // terminology ('sub-sequence-specifiers', or SSS),
- // but the actual FO's are MasterReferences.
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public PageSequenceMaster(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -40,6 +40,15 @@
*/
public abstract class Region extends FObj implements org.axsl.foR.fo.Region {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
protected Region(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class RegionAfter extends Region
implements org.axsl.foR.fo.RegionAfter {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RegionAfter(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -42,6 +42,15 @@
public class RegionBefore extends Region
implements org.axsl.foR.fo.RegionBefore {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RegionBefore(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class RegionBody extends Region
implements org.axsl.foR.fo.RegionBody {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RegionBody(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -40,6 +40,15 @@
*/
public class RegionEnd extends Region implements org.axsl.foR.fo.RegionEnd {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RegionEnd(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -42,6 +42,15 @@
public class RegionStart extends Region
implements org.axsl.foR.fo.RegionStart {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RegionStart(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -43,6 +43,15 @@
*/
public class RepeatablePMAlternatives extends SubSequenceSpecifier {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RepeatablePMAlternatives(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -43,6 +43,15 @@
*/
public class RepeatablePMReference extends SubSequenceSpecifier {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RepeatablePMReference(final FObj parent,
final PropertyList propertyList, final String systemId,
final int line, final int column) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -41,6 +41,15 @@
public class RetrieveMarker extends FObj
implements org.axsl.foR.fo.RetrieveMarker {
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public RetrieveMarker(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -67,6 +67,15 @@
*/
private Map<String, FObj> unmatchedReferences = new HashMap<String, FObj>();
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public Root(final FObj parent, final PropertyList propertyList,
final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2007-03-30 23:18:58 UTC (rev 9051)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2007-03-30 23:36:11 UTC (rev 9052)
@@ -54,6 +54,15 @@
private RegionEnd regionEnd;
private RegionBody regionBody;
+ /**
+ * Constructor.
+ * @param parent The parent FObj.
+ * @param propertyList The property list for this FObj.
+ * @param systemId The system-id indicating the location of this object
+ * in the source document.
+ * @param line The line number of this object in the source document.
+ * @param column The column number of this object in the source document.
+ */
public SimplePageMaster(final FObj parent, final PropertyList propertyList,
final...
[truncated message content] |
|
From: <vic...@us...> - 2007-03-30 23:18:57
|
Revision: 9051
http://svn.sourceforge.net/foray/?rev=9051&view=rev
Author: victormote
Date: 2007-03-30 16:18:58 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Convert a FOray integral array to an aXSL enumeration of Extension elements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java
trunk/foray/scripts/checkstyle-suppressions.xml
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java 2007-03-30 22:59:52 UTC (rev 9050)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java 2007-03-30 23:18:58 UTC (rev 9051)
@@ -32,54 +32,22 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.foray.obj.ContinuedLabel;
+import org.axsl.common.ExtensionObject;
+
import org.xml.sax.Locator;
-import java.util.Arrays;
-
/**
* Factory class for creating formatting objects in the "foray" namespace.
*/
public final class ObjectMakerExtensions {
- public static final byte CONTINUED_LABEL = 1;
-
/**
- * Keep this list sorted alphabetically, so that we can use a binary
- * search on it.
- */
- private static final String[] OBJECT_NAME_LIST = {
- "", // Use element 0 as a default
- "continued-label",
- };
-
- /**
* Private Constructor. This is a utility class and should never be
* instantiated.
*/
private ObjectMakerExtensions() { }
/**
- * Converts an object name to its integral equivalent.
- * @param objectName The object name to be enumerated.
- * @return The enumerated value of the object name.
- */
- public static byte enumerateObjectName(final String objectName) {
- return (byte) Arrays.binarySearch(OBJECT_NAME_LIST, objectName);
- }
-
- /**
- * Converts an object name enumeration to its String equivalent.
- * @param enumeration The object name enumeration.
- * @return The object name as a String.
- */
- public static String expandObjectNameEnumeration(final byte enumeration) {
- if (enumeration < 1 || enumeration > (OBJECT_NAME_LIST.length - 1)) {
- return OBJECT_NAME_LIST[0];
- }
- return OBJECT_NAME_LIST[enumeration];
- }
-
- /**
* Converts an unparsed extension element into an FObj instance that can be
* added to the FO Tree.
* @param objectName The unparsed extension element name.
@@ -90,7 +58,8 @@
*/
public static FObj makeObject(final String objectName, final FObj parent,
final PropertyList propertyList, final Locator locator) {
- final byte enumeration = enumerateObjectName(objectName);
+ final ExtensionObject enumeration = ExtensionObject.extensionValueOf(
+ objectName);
String systemId = null;
int line = 0;
int column = 0;
Modified: trunk/foray/scripts/checkstyle-suppressions.xml
===================================================================
--- trunk/foray/scripts/checkstyle-suppressions.xml 2007-03-30 22:59:52 UTC (rev 9050)
+++ trunk/foray/scripts/checkstyle-suppressions.xml 2007-03-30 23:18:58 UTC (rev 9051)
@@ -13,7 +13,7 @@
<suppress checks="Javadoc[MV].*"
files="org.foray.fotree.fo.prop.*"/>
<suppress checks="Javadoc[MV].*"
- files="org.foray.fotree.fo.value.*"/>
+ files="org.foray.fotree.value.*"/>
<suppress checks="Javadoc[MV].*"
files="org.foray.pdf.*"/>
<suppress checks="Javadoc[MV].*"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 22:59:53
|
Revision: 9050
http://svn.sourceforge.net/foray/?rev=9050&view=rev
Author: victormote
Date: 2007-03-30 15:59:52 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/.project
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
trunk/foray/scripts/checkstyle-suppressions.xml
Modified: trunk/foray/foray-fotree/.project
===================================================================
--- trunk/foray/foray-fotree/.project 2007-03-30 22:42:35 UTC (rev 9049)
+++ trunk/foray/foray-fotree/.project 2007-03-30 22:59:52 UTC (rev 9050)
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
</natures>
</projectDescription>
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2007-03-30 22:42:35 UTC (rev 9049)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2007-03-30 22:59:52 UTC (rev 9050)
@@ -106,6 +106,15 @@
*/
private ObjectMakerFO() { }
+ /**
+ * Converts an unparsed XSL-FO element into an FObj instance that can be
+ * added to the FO Tree.
+ * @param objectName The unparsed XSL-FO element name.
+ * @param parent The parent FObj.
+ * @param propertyList The property list of the parent FObj.
+ * @param locator The SAX Locator object.
+ * @return The new FObj instance for this XSL-FO element.
+ */
public static FObj makeObject(final String objectName, final FObj parent,
final PropertyList propertyList, final Locator locator) {
final FoObject enumeration = FoObject.xslValueOf(objectName);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java 2007-03-30 22:42:35 UTC (rev 9049)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java 2007-03-30 22:59:52 UTC (rev 9050)
@@ -79,6 +79,15 @@
return OBJECT_NAME_LIST[enumeration];
}
+ /**
+ * Converts an unparsed extension element into an FObj instance that can be
+ * added to the FO Tree.
+ * @param objectName The unparsed extension element name.
+ * @param parent The parent FObj.
+ * @param propertyList The property list of the parent FObj.
+ * @param locator The SAX Locator object.
+ * @return The new FObj instance for this extension element.
+ */
public static FObj makeObject(final String objectName, final FObj parent,
final PropertyList propertyList, final Locator locator) {
final byte enumeration = enumerateObjectName(objectName);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java 2007-03-30 22:42:35 UTC (rev 9049)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java 2007-03-30 22:59:52 UTC (rev 9050)
@@ -48,31 +48,41 @@
*/
public class NamespaceSVG extends Namespace {
+ /**
+ * Constructor.
+ * @param parserClassName The class to be used to parse the SVG.
+ */
public NamespaceSVG(final String parserClassName) {
super();
- // this sets the parser that will be used
- // by default (SVGBrokenLinkProvider)
- // normally the user agent value is used
-// FOTreeBuilder builder = this.getParent();
-// FOTreeControl control = builder.getFOTreeControl();
-// String parserClassName = control.getParserClassName();
XMLResourceDescriptor.setXMLParserClassName(parserClassName);
}
+ /**
+ * {@inheritDoc}
+ */
public String getNamespaceURI() {
return "http://www.w3.org/2000/svg";
}
+ /**
+ * {@inheritDoc}
+ */
public String getTypicalPrefix() {
return "svg";
}
+ /**
+ * {@inheritDoc}
+ */
public FObj parseElementForNS(final String localName,
final FObj currentFObj, final PropertyList list,
final Locator locator) throws FOTreeException {
return ObjectMakerSVG.makeObject(localName, currentFObj, list, locator);
}
+ /**
+ * {@inheritDoc}
+ */
public void parseAttributes(final PropertyList propertyList,
final Attributes attlist, final FObj currentFObj,
final Locator locator, final FOTreeBuilder builder) {
@@ -83,17 +93,21 @@
return;
}
- /*
- * This method is required by the abstract superclass Namespace, but is not
- * used, because the parseAttributes method does all of the work.
+ /**
+ * {@inheritDoc}
*/
public Property parseAttributeForNS(final Attributes attributes,
final String attributeName, final String attributeValue,
final PropertyList propertyList, final Locator locator)
throws PropertyException {
+ /* This method is required by the abstract superclass Namespace, but is
+ * not used, because the parseAttributes method does all of the work. */
return null;
}
+ /**
+ * {@inheritDoc}
+ */
protected PropertyList createNewPropertyList(final String localName,
final Attributes attlist) {
return new PropertyListUnparsed(attlist);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2007-03-30 22:42:35 UTC (rev 9049)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2007-03-30 22:59:52 UTC (rev 9050)
@@ -48,6 +48,15 @@
*/
private ObjectMakerSVG() { }
+ /**
+ * Converts an unparsed SVG element into an FObj instance that can be added
+ * to the FO Tree.
+ * @param objectName The unparsed SVG element name.
+ * @param parent The parent FObj.
+ * @param propertyList The property list of the parent FObj.
+ * @param locator The SAX Locator object.
+ * @return The new FObj instance for this SVG element.
+ */
public static FObj makeObject(final String objectName, final FObj parent,
final PropertyList propertyList, final Locator locator) {
final SvgObject enumeration = SvgObject.svgValueOf(objectName);
Modified: trunk/foray/scripts/checkstyle-suppressions.xml
===================================================================
--- trunk/foray/scripts/checkstyle-suppressions.xml 2007-03-30 22:42:35 UTC (rev 9049)
+++ trunk/foray/scripts/checkstyle-suppressions.xml 2007-03-30 22:59:52 UTC (rev 9050)
@@ -9,8 +9,12 @@
<!-- Suppress partially-implemented checks where not yet implemented. -->
<suppress checks="Javadoc[MV].*"
+ files="org.foray.fotree.fo.obj.*"/>
+ <suppress checks="Javadoc[MV].*"
files="org.foray.fotree.fo.prop.*"/>
<suppress checks="Javadoc[MV].*"
+ files="org.foray.fotree.fo.value.*"/>
+ <suppress checks="Javadoc[MV].*"
files="org.foray.pdf.*"/>
<suppress checks="Javadoc[MV].*"
files="org.foray.render.*"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 22:42:35
|
Revision: 9049
http://svn.sourceforge.net/foray/?rev=9049&view=rev
Author: victormote
Date: 2007-03-30 15:42:35 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Convert a FOray integral array to an aXSL enumeration of SVG elements.
Modified Paths:
--------------
trunk/foray/foray-fotree/.project
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
trunk/foray/scripts/checkstyle-suppressions.xml
Modified: trunk/foray/foray-fotree/.project
===================================================================
--- trunk/foray/foray-fotree/.project 2007-03-30 21:41:07 UTC (rev 9048)
+++ trunk/foray/foray-fotree/.project 2007-03-30 22:42:35 UTC (rev 9049)
@@ -10,14 +10,8 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
</natures>
</projectDescription>
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2007-03-30 21:41:07 UTC (rev 9048)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java 2007-03-30 22:42:35 UTC (rev 9049)
@@ -33,154 +33,24 @@
import org.foray.fotree.PropertyListUnparsed;
import org.foray.fotree.svg.obj.SVGElement;
+import org.axsl.common.SvgObject;
+
import org.xml.sax.Locator;
-import java.util.Arrays;
-
/**
* Factory class for creating formatting objects in the "svg" namespace.
*/
public final class ObjectMakerSVG {
- public static final byte A = 1;
- public static final byte ALTGLYPH = 2;
- public static final byte ANIMATE = 3;
- public static final byte ANIMATECOLOR = 4;
- public static final byte ANIMATEMOTION = 5;
- public static final byte ANIMATETRANSFORM = 6;
- public static final byte CIRCLE = 7;
- public static final byte CLIPPATH = 8;
- public static final byte CURSOR = 9;
- public static final byte DEFS = 10;
- public static final byte DESC = 11;
- public static final byte ELLIPSE = 12;
- public static final byte FEFLOOD = 13;
- public static final byte FEGAUSSIANBLUR = 14;
- public static final byte FEMERGE = 15;
- public static final byte FEMERGENODE = 16;
- public static final byte FEOFFSET = 17;
- public static final byte FILTER = 18;
- public static final byte FONT = 19;
- public static final byte FONT_FACE = 20;
- public static final byte FONT_FACE_SRC = 21;
- public static final byte FONT_FACE_URI = 22;
- public static final byte G = 23;
- public static final byte GLYPH = 24;
- public static final byte HKERN = 25;
- public static final byte IMAGE = 26;
- public static final byte LINE = 27;
- public static final byte LINEARGRADIENT = 28;
- public static final byte MARKER = 29;
- public static final byte MASK = 30;
- public static final byte MISSING_GLYPH = 31;
- public static final byte PATH = 32;
- public static final byte PATTERN = 33;
- public static final byte POLYGON = 34;
- public static final byte POLYLINE = 35;
- public static final byte RADIALGRADIENT = 36;
- public static final byte RECT = 37;
- public static final byte SET = 38;
- public static final byte STOP = 39;
- public static final byte STYLE = 40;
- public static final byte SVG = 41;
- public static final byte SWITCH = 42;
- public static final byte SYMBOL = 43;
- public static final byte TEXT = 44;
- public static final byte TEXTPATH = 45;
- public static final byte TITLE = 46;
- public static final byte TREF = 47;
- public static final byte TSPAN = 48;
- public static final byte USE = 49;
- public static final byte VKERN = 50;
-
/**
- * Keep this list sorted alphabetically, so that we can use a binary
- * search on it.
- */
- private static final String[] OBJECT_NAME_LIST = {
- "", // Use element 0 as a default
- "a",
- "altGlyph",
- "animate",
- "animateColor",
- "animateMotion",
- "animateTransform",
- "circle",
- "clipPath",
- "cursor",
- "defs",
- "desc",
- "ellipse",
- "feFlood",
- "feGaussianBlur",
- "feMerge",
- "feMergeNode",
- "feOffset",
- "filter",
- "font",
- "font-face",
- "font-face-src",
- "font-face-uri",
- "g",
- "glyph",
- "hkern",
- "image",
- "line",
- "linearGradient",
- "marker",
- "mask",
- "missing-glyph",
- "path",
- "pattern",
- "polygon",
- "polyline",
- "radialGradient",
- "rect",
- "set",
- "stop",
- "style",
- "svg",
- "switch",
- "symbol",
- "text",
- "textPath",
- "title",
- "tref",
- "tspan",
- "use",
- "vkern",
- };
-
- /**
* Private constructor. This is a utility class and should never be
* instantiated.
*/
private ObjectMakerSVG() { }
- /**
- * Converts an object name to its integral equivalent.
- * @param objectName The object name to be enumerated.
- * @return The enumerated value of the object name.
- */
- public static byte enumerateObjectName(final String objectName) {
- return (byte) Arrays.binarySearch(OBJECT_NAME_LIST, objectName);
- }
-
- /**
- * Converts an object name enumeration to its String equivalent.
- * @param enumeration The object name enumeration.
- * @return The object name as a String.
- */
- public static String expandObjectNameEnumeration(final byte enumeration) {
- if (enumeration < 1 || enumeration > (OBJECT_NAME_LIST.length - 1)) {
- return OBJECT_NAME_LIST[0];
- }
- return OBJECT_NAME_LIST[enumeration];
- }
-
public static FObj makeObject(final String objectName, final FObj parent,
final PropertyList propertyList, final Locator locator) {
- final byte enumeration = enumerateObjectName(objectName);
+ final SvgObject enumeration = SvgObject.svgValueOf(objectName);
String systemId = null;
int line = 0;
int column = 0;
@@ -189,7 +59,7 @@
line = locator.getLineNumber();
column = locator.getColumnNumber();
}
- if (enumeration < 1 || enumeration >= OBJECT_NAME_LIST.length) {
+ if (enumeration == null) {
return null;
}
// The PropertyList must be of the unparsed variety
@@ -198,7 +68,7 @@
switch (enumeration) {
default: {
return new SVGElement(parent, propertyListUnparsed,
- expandObjectNameEnumeration(enumeration), systemId, line,
+ enumeration.toSVG(), systemId, line,
column);
}
}
Modified: trunk/foray/scripts/checkstyle-suppressions.xml
===================================================================
--- trunk/foray/scripts/checkstyle-suppressions.xml 2007-03-30 21:41:07 UTC (rev 9048)
+++ trunk/foray/scripts/checkstyle-suppressions.xml 2007-03-30 22:42:35 UTC (rev 9049)
@@ -9,7 +9,7 @@
<!-- Suppress partially-implemented checks where not yet implemented. -->
<suppress checks="Javadoc[MV].*"
- files="org.foray.fotree.*"/>
+ files="org.foray.fotree.fo.prop.*"/>
<suppress checks="Javadoc[MV].*"
files="org.foray.pdf.*"/>
<suppress checks="Javadoc[MV].*"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 21:41:06
|
Revision: 9048
http://svn.sourceforge.net/foray/?rev=9048&view=rev
Author: victormote
Date: 2007-03-30 14:41:07 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java 2007-03-30 21:12:21 UTC (rev 9047)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java 2007-03-30 21:41:07 UTC (rev 9048)
@@ -168,6 +168,14 @@
return enumerated;
}
+ /**
+ * Makes a property in this namespace.
+ * @param propertyFullName The unparsed property name.
+ * @param attributeValue The unparsed property value.
+ * @param propertyList The list of properties of the parent object.
+ * @return The parsed Property instance.
+ * @throws PropertyException For errors in the property or its value.
+ */
public static Property makeProperty(final String propertyFullName,
final String attributeValue, final PropertyList propertyList)
throws PropertyException {
@@ -1123,12 +1131,12 @@
/**
* Checks to see if the property has already been created. If it has, and
* if it is a compound property, sets the value for this component.
- * @param propertyList
- * @param enumeration
- * @param propertyFullName
- * @param attributeValue
- * @return True if the property was successfully processed here (i.e. no
- * further processing is necessary), false otherwise.
+ * @param propertyList The list of properties of the parent object.
+ * @param enumeration The parsed property type.
+ * @param propertyFullName The full unparsed name of the property.
+ * @param attributeValue The unparsed property value.
+ * @return The parsed property.
+ * @throws PropertyException For errors in the property or its value.
*/
private static Property checkCompoundProperty(
final PropertyList propertyList, final FoProperty enumeration,
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java 2007-03-30 21:12:21 UTC (rev 9047)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java 2007-03-30 21:41:07 UTC (rev 9048)
@@ -46,18 +46,30 @@
*/
public class NamespaceExtensions extends Namespace {
+ /**
+ * Constructor.
+ */
public NamespaceExtensions() {
super();
}
+ /**
+ * {@inheritDoc}
+ */
public String getNamespaceURI() {
return "http://org.foray/fo-extensions/2004";
}
+ /**
+ * {@inheritDoc}
+ */
public String getTypicalPrefix() {
return "foray";
}
+ /**
+ * {@inheritDoc}
+ */
public FObj parseElementForNS(final String localName,
final FObj currentFObj, final PropertyList list,
final Locator locator) throws FOTreeException {
@@ -65,6 +77,9 @@
locator);
}
+ /**
+ * {@inheritDoc}
+ */
public void parseAttributes(final PropertyList propertyList,
final Attributes attlist, final FObj currentFObj,
final Locator locator, final FOTreeBuilder builder)
@@ -78,6 +93,9 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
public Property parseAttributeForNS(final Attributes attributes,
final String attributeName, final String attributeValue,
final PropertyList propertyList, final Locator locator)
@@ -90,6 +108,9 @@
attributeValue, propertyList);
}
+ /**
+ * {@inheritDoc}
+ */
protected PropertyList createNewPropertyList(final String localName,
final Attributes attlist) {
return new PropertyList();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java 2007-03-30 21:12:21 UTC (rev 9047)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/PropertyMakerXML.java 2007-03-30 21:41:07 UTC (rev 9048)
@@ -40,19 +40,7 @@
*/
public final class PropertyMakerXML {
- public static final short OFFSET_FROM_PROPERTY_NAME_LIST = 500;
- public static final short LANG = 501;
-
/**
- * Keep this list sorted alphabetically, so that we can use a binary
- * search on it.
- */
- private static final String[] PROPERTY_NAME_LIST = {
- "", // Use element 0 as a default
- "lang",
- };
-
- /**
* Private constructor. This is a utility class and should never be
* instantiated.
*/
@@ -71,19 +59,13 @@
}
/**
- * Converts a property name enumeration to its String equivalent.
- * @param enumeration The property name enumeration.
- * @return The property name as a String.
+ * Makes a property in this namespace.
+ * @param propertyFullName The unparsed property name.
+ * @param attributeValue The unparsed property value.
+ * @param propertyList The list of properties of the parent object.
+ * @return The parsed Property instance.
+ * @throws PropertyException For errors in the property or its value.
*/
- public static String expandPropertyNameEnumeration(
- final short enumeration) {
- final int index = enumeration - OFFSET_FROM_PROPERTY_NAME_LIST;
- if (index < 1 || index > (PROPERTY_NAME_LIST.length - 1)) {
- return PROPERTY_NAME_LIST[0];
- }
- return PROPERTY_NAME_LIST[index];
- }
-
public static Property makeProperty(final String propertyFullName,
final String attributeValue, final PropertyList propertyList)
throws PropertyException {
@@ -113,12 +95,12 @@
/**
* Checks to see if the property has already been created. If it has, and
* if it is a compound property, sets the value for this component.
- * @param propertyList
- * @param enumeration
- * @param propertyFullName
- * @param attributeValue
- * @return True if the property was successfully processed here (i.e. no
- * further processing is necessary), false otherwise.
+ * @param propertyList The list of properties of the parent object.
+ * @param enumeration The parsed property type.
+ * @param propertyFullName The full unparsed name of the property.
+ * @param attributeValue The unparsed property value.
+ * @return The parsed property.
+ * @throws PropertyException For errors in the property or its value.
*/
private static Property checkCompoundProperty(
final PropertyList propertyList,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 21:12:25
|
Revision: 9047
http://svn.sourceforge.net/foray/?rev=9047&view=rev
Author: victormote
Date: 2007-03-30 14:12:21 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Remove no-longer-needed methods.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java 2007-03-30 21:08:46 UTC (rev 9046)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/NamespaceExtensions.java 2007-03-30 21:12:21 UTC (rev 9047)
@@ -36,7 +36,6 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.PropertyMakerFO;
-import org.axsl.common.FoProperty;
import org.axsl.foR.FOTreeException;
import org.xml.sax.Attributes;
@@ -91,26 +90,9 @@
attributeValue, propertyList);
}
- public byte enumerateElement(final String localName) {
- return ObjectMakerExtensions.enumerateObjectName(localName);
- }
-
- public FoProperty enumerateAttribute(final String attributeName) {
- /*
- * Right now, all extension attributes are also attributes that are
- * handled by the FO namespace, so we just use those.
- */
- return PropertyMakerFO.enumeratePropertyName(attributeName);
- }
-
protected PropertyList createNewPropertyList(final String localName,
final Attributes attlist) {
return new PropertyList();
}
- public String getPropertyName(final short propertyType) {
- // Has no properties in its namespace.
- return null;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java 2007-03-30 21:08:46 UTC (rev 9046)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/NamespaceSVG.java 2007-03-30 21:12:21 UTC (rev 9047)
@@ -94,25 +94,9 @@
return null;
}
- public byte enumerateElement(final String localName) {
- return ObjectMakerSVG.enumerateObjectName(localName);
- }
-
- public short enumerateAttribute(final String attributeName) {
- /*
- * Right now, we are not parsing the SVG attributes at all.
- */
- return -1;
- }
-
protected PropertyList createNewPropertyList(final String localName,
final Attributes attlist) {
return new PropertyListUnparsed(attlist);
}
- public String getPropertyName(final short propertyType) {
- // Ignore for this namespace.
- return null;
- }
-
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java 2007-03-30 21:08:46 UTC (rev 9046)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java 2007-03-30 21:12:21 UTC (rev 9047)
@@ -35,7 +35,6 @@
import org.foray.fotree.PropertyException;
import org.foray.fotree.PropertyList;
-import org.axsl.common.XmlPropertyType;
import org.axsl.foR.FOTreeException;
import org.xml.sax.Attributes;
@@ -101,15 +100,6 @@
return property;
}
- public byte enumerateElement(final String localName) {
- // This isn't needed for the xml: namespace.
- return -1;
- }
-
- public XmlPropertyType enumerateAttribute(final String attributeName) {
- return PropertyMakerXML.enumeratePropertyName(attributeName);
- }
-
/**
* {@inheritDoc}
*/
@@ -118,8 +108,4 @@
return new PropertyList();
}
- public String getPropertyName(final short propertyType) {
- return PropertyMakerXML.expandPropertyNameEnumeration(propertyType);
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 21:08:45
|
Revision: 9046
http://svn.sourceforge.net/foray/?rev=9046&view=rev
Author: victormote
Date: 2007-03-30 14:08:46 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/AbstractXmlProperty.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java
trunk/foray/foray-fotree/src/javatest/org/foray/fotree/value/TestDtLength.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/AbstractXmlProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/AbstractXmlProperty.java 2007-03-30 20:52:22 UTC (rev 9045)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/AbstractXmlProperty.java 2007-03-30 21:08:46 UTC (rev 9046)
@@ -38,14 +38,24 @@
*/
public abstract class AbstractXmlProperty extends Property {
+ /** The specific property type. */
private XmlPropertyType propertyType;
+ /**
+ * Constructor.
+ * @param propertyList The property list for the parent object.
+ * @param propertyType The enumerated value for this property.
+ */
public AbstractXmlProperty(final PropertyList propertyList,
final XmlPropertyType propertyType) {
super(propertyList);
this.propertyType = propertyType;
}
+ /**
+ * Returns the specific type for this property.
+ * @return The specific type for this property.
+ */
public XmlPropertyType getPropertyType() {
return this.propertyType;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java 2007-03-30 20:52:22 UTC (rev 9045)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/NamespaceXML.java 2007-03-30 21:08:46 UTC (rev 9046)
@@ -46,18 +46,31 @@
* prefix.
*/
public class NamespaceXML extends Namespace {
+
+ /**
+ * Constructor.
+ */
public NamespaceXML() {
super();
}
+ /**
+ * {@inheritDoc}
+ */
public String getNamespaceURI() {
return "http://www.w3.org/XML/1998/namespace";
}
+ /**
+ * {@inheritDoc}
+ */
public String getTypicalPrefix() {
return "xml";
}
+ /**
+ * {@inheritDoc}
+ */
public FObj parseElementForNS(final String localName,
final FObj currentFObj, final PropertyList list,
final Locator locator) throws FOTreeException {
@@ -65,6 +78,9 @@
return null;
}
+ /**
+ * {@inheritDoc}
+ */
public void parseAttributes(final PropertyList propertyList,
final Attributes attlist, final FObj currentFObj,
final Locator locator, final FOTreeBuilder builder) {
@@ -72,6 +88,9 @@
return;
}
+ /**
+ * {@inheritDoc}
+ */
public Property parseAttributeForNS(final Attributes attributes,
final String attributeName, final String attributeValue,
final PropertyList propertyList, final Locator locator)
@@ -91,6 +110,9 @@
return PropertyMakerXML.enumeratePropertyName(attributeName);
}
+ /**
+ * {@inheritDoc}
+ */
protected PropertyList createNewPropertyList(final String localName,
final Attributes attlist) {
return new PropertyList();
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2007-03-30 20:52:22 UTC (rev 9045)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2007-03-30 21:08:46 UTC (rev 9046)
@@ -51,10 +51,19 @@
*/
public class Lang extends AbstractXmlProperty {
+ /** The valid keywords for this property. */
private static final FoValue[] VALID_KEYWORDS = {
FoValue.INHERIT,
};
+ /**
+ * Constructor.
+ * @param propertyList The property list for the parent object.
+ * @param enumeration The enumerated value for this property.
+ * @param propertyFullName The full name of this property.
+ * @param attributeValue The parsed property value.
+ * @throws PropertyException For an invalid property value.
+ */
public Lang(final PropertyList propertyList,
final XmlPropertyType enumeration,
final String propertyFullName, final String attributeValue)
@@ -64,6 +73,14 @@
attributeValue));
}
+ /**
+ * Converts the string property value into a parsed value.
+ * @param propertyList The property list for the parent object.
+ * @param propertyFullName The full name of this property.
+ * @param value The parsed property value.
+ * @throws PropertyException For an invalid property value.
+ * @return The parsed property value.
+ */
private PropertyValue createPropertyValue(final PropertyList propertyList,
final String propertyFullName, final String value)
throws PropertyException {
@@ -145,16 +162,29 @@
return null;
}
+ /**
+ * Return the Country, if any, embedded in this property.
+ * @return The country embedded in this property, or null if none is
+ * embedded.
+ */
public Country getCountry() {
final PropertyCollection collection = (PropertyCollection) value();
return (Country) collection.findProperty(FoProperty.COUNTRY);
}
+ /**
+ * Return the Language, if any, embedded in this property.
+ * @return The language embedded in this property, or null if none is
+ * embedded.
+ */
public Language getLanguage() {
final PropertyCollection collection = (PropertyCollection) value();
return (Language) collection.findProperty(FoProperty.LANGUAGE);
}
+ /**
+ * {@inheritDoc}
+ */
protected FoValue[] getValidKeywords() {
return VALID_KEYWORDS;
}
Modified: trunk/foray/foray-fotree/src/javatest/org/foray/fotree/value/TestDtLength.java
===================================================================
--- trunk/foray/foray-fotree/src/javatest/org/foray/fotree/value/TestDtLength.java 2007-03-30 20:52:22 UTC (rev 9045)
+++ trunk/foray/foray-fotree/src/javatest/org/foray/fotree/value/TestDtLength.java 2007-03-30 21:08:46 UTC (rev 9046)
@@ -35,7 +35,10 @@
*/
public class TestDtLength extends TestCase {
+ /** A bogus point size to use when we don't care what it is. */
private static final byte POINT_SIZE_DONT_CARE = 12;
+
+ /** A bogus percentage base to use when we don't care what it is. */
private static final byte PERCENT_BASE_DONT_CARE = 1;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 20:52:21
|
Revision: 9045
http://svn.sourceforge.net/foray/?rev=9045&view=rev
Author: victormote
Date: 2007-03-30 13:52:22 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Use standard validation.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2007-03-30 20:21:06 UTC (rev 9044)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2007-03-30 20:52:22 UTC (rev 9045)
@@ -75,10 +75,7 @@
* {@inheritDoc}
*/
protected void validateDescendants() throws FOTreeException {
- if (this.getChildren().size() < 1) {
- this.throwException(getFullName()
- + " must have at least one child");
- }
+ this.validateAtLeastOneChild();
/* The content model requires that all children be %block content. */
for (int i = 0; i < this.getChildren().size(); i++) {
final FObj fobj = (FObj) this.getChildren().get(i);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 20:21:05
|
Revision: 9044
http://svn.sourceforge.net/foray/?rev=9044&view=rev
Author: victormote
Date: 2007-03-30 13:21:06 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Partial fix for cells spanning multiple rows.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2007-03-30 19:53:24 UTC (rev 9043)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2007-03-30 20:21:06 UTC (rev 9044)
@@ -60,7 +60,7 @@
private List<AreaNode> children = new ArrayList<AreaNode>();
/** The progression dimension used by the content of this cell. This is not
- * the same as the cells progression dimension, because that is controlled
+ * the same as the cell's progression dimension, because that is controlled
* by the parent row. */
private int contentPD = 0;
@@ -278,7 +278,23 @@
public int crBPD() {
/* Table cell is inside a row container, which keeps track of the BPD
* for all (non-spanning) cells in the row. */
- return this.getParent().getProgressionDimension();
+ int bpd = 0;
+ /* TODO: This computation needs to consider borders and padding. */
+ TableRowContainer rowArea = this.getParent();
+ bpd += rowArea.getProgressionDimension();
+ int rowsRemaining = this.traitNumberRowsSpanned() - 1;
+ while (rowsRemaining > 0) {
+ final TableRowContainer nextRow = (TableRowContainer)
+ rowArea.getNextSibling();
+ if (nextRow == null) {
+ rowsRemaining = 0;
+ } else {
+ bpd += nextRow.getProgressionDimension();
+ rowArea = nextRow;
+ rowsRemaining --;
+ }
+ }
+ return bpd;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-30 19:53:23
|
Revision: 9043
http://svn.sourceforge.net/foray/?rev=9043&view=rev
Author: victormote
Date: 2007-03-30 12:53:24 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
Make more readable in spots.
Modified Paths:
--------------
trunk/foray/resource/fo-examples/tables/headfoot.fo
Modified: trunk/foray/resource/fo-examples/tables/headfoot.fo
===================================================================
--- trunk/foray/resource/fo-examples/tables/headfoot.fo 2007-03-27 23:27:19 UTC (rev 9042)
+++ trunk/foray/resource/fo-examples/tables/headfoot.fo 2007-03-30 19:53:24 UTC (rev 9043)
@@ -1,1316 +1,1287 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fo:root
+ SYSTEM "http://xep.xattic.com/xep/resources/validators/dtd/fo.dtd">
+
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master
- margin-right="1.0in"
- margin-left="1.0in"
- margin-bottom=".5in"
- margin-top=".5in"
- page-width="8.5in"
- page-height="6in"
- master-name="first">
- <fo:region-body margin-top=".5in" margin-bottom=".5in"/>
- <fo:region-before extent=".5in"/>
- <fo:region-after extent=".5in"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="first">
- <fo:static-content flow-name="xsl-region-before">
- <fo:block line-height="14pt" font-size="10pt"
- text-align="end">table examples</fo:block>
- </fo:static-content>
- <fo:static-content flow-name="xsl-region-after">
- <fo:block line-height="14pt" font-size="10pt"
- text-align="end">Page <fo:page-number/></fo:block>
- </fo:static-content>
+<fo:layout-master-set>
+ <fo:simple-page-master
+ margin-right="1.0in"
+ margin-left="1.0in"
+ margin-bottom=".5in"
+ margin-top=".5in"
+ page-width="8.5in"
+ page-height="6in"
+ master-name="first">
+ <fo:region-body margin-top=".5in" margin-bottom=".5in"/>
+ <fo:region-before extent=".5in"/>
+ <fo:region-after extent=".5in"/>
+ </fo:simple-page-master>
+</fo:layout-master-set>
- <fo:flow flow-name="xsl-region-body">
+<fo:page-sequence master-reference="first">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block line-height="14pt" font-size="10pt"
+ text-align="end">table examples</fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block line-height="14pt" font-size="10pt"
+ text-align="end">Page <fo:page-number/></fo:block>
+ </fo:static-content>
-<fo:block space-before.optimum="1cm">Table 1: with header</fo:block>
+ <fo:flow flow-name="xsl-region-body">
-<fo:table table-layout="fixed">
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
+ <fo:block space-before.optimum="1cm">Table 1: with header</fo:block>
- <fo:table-header>
- <fo:table-row background-color="#F7F24D">
- <fo:table-cell border-width="1pt" border-color="black">
- <fo:block font-weight="bold" text-align="center"
- vertical-align="middle">Col A</fo:block>
- </fo:table-cell>
- <fo:table-cell border-width="1pt" border-color="black">
- <fo:block font-weight="bold" text-align="center"
- vertical-align="middle">Col B</fo:block>
- </fo:table-cell>
- <fo:table-cell border-width="1pt" border-color="black">
- <fo:block font-weight="bold" text-align="center"
- vertical-align="middle">Col C</fo:block>
- </fo:table-cell>
- <fo:table-cell border-width="1pt" border-color="black">
- <fo:block font-weight="bold" text-align="center"
- vertical-align="middle">Col D</fo:block>
- </fo:table-cell>
- <fo:table-cell border-width="1pt" border-color="black">
- <fo:block font-weight="bold" text-align="center"
- vertical-align="middle">Col E</fo:block>
- </fo:table-cell>
- <fo:table-cell border-width="1pt" border-color="black">
- <fo:block font-weight="bold" text-align="center"
- vertical-align="middle">Col F</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-header>
+ <fo:table table-layout="fixed">
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:1
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:2
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:3
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:4
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:5
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:6
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:7
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
-</fo:table>
+ <fo:table-header>
+ <fo:table-row background-color="#F7F24D">
+ <fo:table-cell border-width="1pt" border-color="black">
+ <fo:block font-weight="bold" text-align="center"
+ vertical-align="middle">Col A</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-width="1pt" border-color="black">
+ <fo:block font-weight="bold" text-align="center"
+ vertical-align="middle">Col B</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-width="1pt" border-color="black">
+ <fo:block font-weight="bold" text-align="center"
+ vertical-align="middle">Col C</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-width="1pt" border-color="black">
+ <fo:block font-weight="bold" text-align="center"
+ vertical-align="middle">Col D</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-width="1pt" border-color="black">
+ <fo:block font-weight="bold" text-align="center"
+ vertical-align="middle">Col E</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-width="1pt" border-color="black">
+ <fo:block font-weight="bold" text-align="center"
+ vertical-align="middle">Col F</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
-<fo:block space-before.optimum="1cm">Table 2: with footer</fo:block>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">A:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">B:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">C:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">D:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">E:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+vertical-align="middle">F:1</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">A:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">B:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">C:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">D:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">E:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+vertical-align="middle">F:2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">A:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">B:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">C:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">D:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">E:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+vertical-align="middle">F:3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">A:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">B:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">C:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">D:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">E:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+vertical-align="middle">F:4</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">A:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">B:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">C:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">D:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">E:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+vertical-align="middle">F:5</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">A:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">B:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">C:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">D:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">E:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+vertical-align="middle">F:6</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">A:7</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">B:7</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">C:7</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">D:7</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+vertical-align="middle">E:7</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+vertical-align="middle">F:7</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
-<fo:table table-layout="fixed">
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
+ <fo:block space-before.optimum="1cm">Table 2: with footer</fo:block>
- <fo:table-footer>
- <fo:table-row>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col A
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col B
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col C
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col D
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col E
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col F
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-footer>
+ <fo:table table-layout="fixed">
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:1
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:1
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:2
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:2
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:3
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:3
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:4
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:4
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:5
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:5
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:6
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:6
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- A:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- B:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- C:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- D:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
- E:7
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle">
- F:7
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center"
+vertical-align="middle" border-width="1pt" border-color="black"
+background-color="#F7F24D">Col A</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center"
+vertical-align="middle" border-width="1pt" border-color="black"
+background-color="#F7F24D">Col B</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center"
+vertical-align="middle" border-width="1pt" border-color="black"
+background-color="#F7F24D">Col C</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center"
+vertical-align="middle" border-width="1pt" border-color="black"
+background-color="#F7F24D">Col D</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center"
+vertical-align="middle" border-width="1pt" border-color="black"
+background-color="#F7F24D">
+ Col E
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col F
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ A:1
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ B:1
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ C:1
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ D:1
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ E:1
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle">
+ F:1
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ A:2
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ B:2
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ C:2
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ D:2
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ E:2
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle">
+ F:2
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ A:3
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ B:3
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ C:3
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ D:3
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ E:3
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle">
+ F:3
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ A:4
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ B:4
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ C:4
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ D:4
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ E:4
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle">
+ F:4
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ A:5
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ B:5
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ C:5
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ D:5
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ E:5
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle">
+ F:5
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ A:6
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ B:6
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ C:6
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ D:6
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ E:6
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle">
+ F:6
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ A:7
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ B:7
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ C:7
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ D:7
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center" vertical-align="middle">
+ E:7
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle">
+ F:7
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
</fo:table>
<fo:block space-before.optimum="1cm">Table 3: with header and footer. Row 1 has
keep-with-next="always".</fo:block>
<fo:table table-layout="fixed">
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
- <fo:table-header>
- <fo:table-row>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col A
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col B
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col C
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col D
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col E
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col F
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-header>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col A
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col B
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col C
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col D
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col E
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col F
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
- <fo:table-footer>
- <fo:table-row>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col A
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col B
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col C
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col D
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col E
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block font-weight="bold" text-align="center" vertical-align="middle"
- border-width="1pt" border-color="black" background-color="#F7F24D">
- Col F
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-footer>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col A
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col B
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col C
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col D
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col E
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block font-weight="bold" text-align="center" vertical-align="middle"
+ border-width="1pt" border-color="black" background-color="#F7F24D">
+ Col F
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
- <fo:table-body>
- <fo:table-row keep-with-next="always">
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">A:1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">B:1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">C:1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">D:1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">E:1</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center"
- vertical-align="middle">F:1</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">A:2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">B:2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">C:2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">D:2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">E:2</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center"
- vertical-align="middle">F:2</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">A:3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">B:3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">C:3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">D:3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">E:3</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center"
- vertical-align="middle">F:3</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle" line-height="2in">A:4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle" line-height="2in">B:4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle" line-height="2in">C:4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle" line-height="2in">D:4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle" line-height="2in">E:4</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center" vertical-align="middle"
- line-height="2in">F:4</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">A:5</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">B:5</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">C:5</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">E:5</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">E:5</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center"
- vertical-align="middle">F:5</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">A:6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">B:6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">C:6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">D:6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block border-right-width="0.5pt" text-align="center"
- vertical-align="middle">E:6</fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <fo:block text-align="center"
- vertical-align="middle">F:6</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
+ <fo:table-body>
+ <fo:table-row keep-with-next="always">
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">A:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">B:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">C:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">D:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">E:1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+ vertical-align="middle">F:1</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">A:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">B:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">C:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">D:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">E:2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+ vertical-align="middle">F:2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">A:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">B:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">C:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">D:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">E:3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+ vertical-align="middle">F:3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle" line-height="2in">A:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle" line-height="2in">B:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle" line-height="2in">C:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle" line-height="2in">D:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle" line-height="2in">E:4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center" vertical-align="middle"
+ line-height="2in">F:4</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">A:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">B:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">C:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">E:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">E:5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+ vertical-align="middle">F:5</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">A:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">B:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">C:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">D:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block border-right-width="0.5pt" text-align="center"
+ vertical-align="middle">E:6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block text-align="center"
+ vertical-align="middle">F:6</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
</fo:table>
<fo:block space-before.optimum="1cm">Table 4: cells spanning
columns</fo:block>
<fo:table table-layout="fixed">
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-column column-width="2cm"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell
- border-width="0.5pt"
- border-style="solid"
- border-color="black"
- text-align="center"
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-column column-width="2cm"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell
+ border-width="0.5pt"
+ border-style="solid"
+ border-color="black"
+ text-align="center"
vertical-align="middle"
- number-columns-spanned="1"
+ number-columns-spanned="1"
background-color="#FF6AC0">
- <fo:block> 1 to 1</fo:block>
- </fo:table-cell>
- <fo:table-cell
- border-width="0.5pt"
- border-style="solid"
- border-color="black"
- text-align="center"
+ <fo:block> 1 to 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell
+ border-width="0.5pt"
+ border-style="solid"
+ border-color="black"
+ text-align="center"
vertical-align="middle"
- number-columns-spanned="5"
+ number-columns-spanned="5"
background-color="#9BF2E9">
- <fo:block> 2 to 6</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell
- border-width="0.5pt"
- border-style="solid"
- border-color="black"
- text-align="center"
+ <fo:block> 2 to 6</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell
+ border-width="0.5pt"
+ border-style="solid"
+ border-color="black"
+ text-align="center"
vertical-align="middle"
- number-columns-spanned="2"
+ number-columns-spanned="2"
background-color="#FF6AC0">
- <fo:block> 1 to 2</fo:block>
- </fo:table-cell>
- <fo:table-cell
- border-width="0.5pt"
- border-style="solid"
- border-color="black"
- text-align="center"
+ <fo:block> 1 to 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell
+ border-width="0.5pt"
+ border-style="solid"
+ border-color="black"
+ text-align="center"
vertical-align="middle"
- number-columns-spanned="4"
+ number-columns-spanned="4"
background-color="#9BF2E9">
- <fo:block> 3 to 6</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
+ <fo:block> 3 to 6</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
</fo:table>
+ <fo:block space-before.optimum="1cm">Table 5: cells spanning rows</fo:block>
- <fo:block space-before.optimum="1cm">
- Table 5: cells spanning rows
- </fo:block>
+ <fo:table table-layout="fixed">
+ <fo:table-column column-width="48pt"/>
+ <fo:table-column column-width="48pt"/>
+ <fo:table-column column-width="48pt"/>
+ <fo:table-column column-width="48pt"/>
+ <fo:table-column column-width="48pt"/>
+ <fo:table-column column-width="48pt"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:bl...
[truncated message content] |
|
From: <vic...@us...> - 2007-03-27 23:27:18
|
Revision: 9042
http://svn.sourceforge.net/foray/?rev=9042&view=rev
Author: victormote
Date: 2007-03-27 16:27:19 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Conform to axsl changes making MarkerContent extend Area.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java 2007-03-27 22:55:30 UTC (rev 9041)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java 2007-03-27 23:27:19 UTC (rev 9042)
@@ -48,7 +48,7 @@
private FOLinkage generatedBy;
/** The parent of this node. */
- private AreaNode parent;
+ private Area parent;
/** The children of this node. */
private List<AreaNode> children = new ArrayList<AreaNode>();
@@ -114,7 +114,7 @@
/**
* {@inheritDoc}
*/
- public AreaNode getParent() {
+ public Area getParent() {
return this.parent;
}
@@ -122,7 +122,12 @@
* {@inheritDoc}
*/
public void setParent(final AreaNode node) throws AreaWException {
- this.parent = node;
+ if (node instanceof Area) {
+ this.parent = (Area) node;
+ } else {
+ throw new AreaWException("Parent of MarkerContent must be an "
+ + "Area.");
+ }
}
/**
@@ -164,4 +169,25 @@
return this;
}
+ /**
+ * {@inheritDoc}
+ */
+ public int crBPD() {
+ return this.getParent().crBPD();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int crIPD() {
+ return this.getParent().crIPD();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int pdAvailable() {
+ return this.getParent().pdAvailable();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 22:55:29
|
Revision: 9041
http://svn.sourceforge.net/foray/?rev=9041&view=rev
Author: victormote
Date: 2007-03-27 15:55:30 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Add test to make sure that retrieve-marker has no children.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-27 22:50:57 UTC (rev 9040)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-27 22:55:30 UTC (rev 9041)
@@ -203,12 +203,21 @@
return true;
}
+ /**
+ * Ensures that this has no children by throwing an exception if it does.
+ * @throws FOTreeException If this has any children.
+ */
public void validateEmptyContent() throws FOTreeException {
if (this.getChildCount() > 0) {
throwException(this.getFullName() + " has NO content.");
}
}
+ /**
+ * Ensures that this has at least one child by throwing an exception if it
+ * does not.
+ * @throws FOTreeException If this has no children.
+ */
public void validateAtLeastOneChild() throws FOTreeException {
if (this.getChildCount() < 1) {
throwException(this.getFullName() + " must have at least one "
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-27 22:50:57 UTC (rev 9040)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-27 22:55:30 UTC (rev 9041)
@@ -82,7 +82,7 @@
* {@inheritDoc}
*/
protected void validateDescendants() throws FOTreeException {
- return;
+ this.validateEmptyContent();
}
public String getName() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 22:50:58
|
Revision: 9040
http://svn.sourceforge.net/foray/?rev=9040&view=rev
Author: victormote
Date: 2007-03-27 15:50:57 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Rename method for clarity.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-27 22:49:22 UTC (rev 9039)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-27 22:50:57 UTC (rev 9040)
@@ -320,11 +320,11 @@
* @return The ancestor {@link Flow}, or null if this object does not
* descend from a {@link Flow}.
*/
- public Flow getFlow(final FOContext context) {
+ public Flow ancestorFlow(final FOContext context) {
if (getParent() == null) {
return null;
}
- return effectiveParent(context).getFlow(context);
+ return effectiveParent(context).ancestorFlow(context);
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-27 22:49:22 UTC (rev 9039)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-27 22:50:57 UTC (rev 9040)
@@ -113,7 +113,7 @@
* @return this, because this is the ancestor flow object.
*/
@Override
- public Flow getFlow(final FOContext context) {
+ public Flow ancestorFlow(final FOContext context) {
return this;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2007-03-27 22:49:22 UTC (rev 9039)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2007-03-27 22:50:57 UTC (rev 9040)
@@ -55,7 +55,7 @@
*/
protected void validateAncestry() throws FOTreeException {
// Validate that we are inside an fo:flow.
- if (getFlow(null) == null) {
+ if (ancestorFlow(null) == null) {
throwException(getFullName() + " must be descendant of fo:flow.");
}
// Validate that there is not content before this and other markers.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 22:49:21
|
Revision: 9039
http://svn.sourceforge.net/foray/?rev=9039&view=rev
Author: victormote
Date: 2007-03-27 15:49:22 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Validate that retrieve-marker is a descendant of static-content.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-27 22:22:45 UTC (rev 9038)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-03-27 22:49:22 UTC (rev 9039)
@@ -29,6 +29,8 @@
package org.foray.fotree;
import org.foray.common.XMLCharacter;
+import org.foray.fotree.fo.obj.Flow;
+import org.foray.fotree.fo.obj.StaticContent;
import org.foray.fotree.fo.obj.Table;
import org.axsl.common.AbsoluteAxis;
@@ -311,7 +313,14 @@
return effectiveParent(context).getContainingBlock(context);
}
- public org.axsl.foR.fo.Flow getFlow(final FOContext context) {
+ /**
+ * Returns the ancestor {@link Flow}, if any.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
+ * @return The ancestor {@link Flow}, or null if this object does not
+ * descend from a {@link Flow}.
+ */
+ public Flow getFlow(final FOContext context) {
if (getParent() == null) {
return null;
}
@@ -319,6 +328,20 @@
}
/**
+ * Returns the ancestor {@link StaticContent}, if any.
+ * @param context An object that knows how to resolve FO Tree context
+ * issues.
+ * @return The ancestor {@link StaticContent}, or null if this object does
+ * not descend from a {@link StaticContent}.
+ */
+ public StaticContent ancestorStaticContent(final FOContext context) {
+ if (getParent() == null) {
+ return null;
+ }
+ return effectiveParent(context).ancestorStaticContent(context);
+ }
+
+ /**
* {@inheritDoc}
*/
public Table getNearestTable(final FOContext context) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-27 22:22:45 UTC (rev 9038)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2007-03-27 22:49:22 UTC (rev 9039)
@@ -48,6 +48,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void validateProperties() throws FOTreeException {
super.validateProperties();
/* Make sure that this flow name can be laid out on every page that can
@@ -107,10 +108,12 @@
}
/**
+ * {@inheritDoc}
* Overrides the method in FObj, because this is the object being sought.
* @return this, because this is the ancestor flow object.
*/
- public org.axsl.foR.fo.Flow getFlow(final FOContext context) {
+ @Override
+ public Flow getFlow(final FOContext context) {
return this;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-27 22:22:45 UTC (rev 9038)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-03-27 22:49:22 UTC (rev 9039)
@@ -50,6 +50,10 @@
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
+ if (this.ancestorStaticContent(null) == null) {
+ throwException(getFullName() + " must be descendant of "
+ + "static-content.");
+ }
return;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java 2007-03-27 22:22:45 UTC (rev 9038)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java 2007-03-27 22:49:22 UTC (rev 9039)
@@ -31,6 +31,7 @@
import org.foray.fotree.FObj;
import org.foray.fotree.PropertyList;
+import org.axsl.foR.FOContext;
import org.axsl.foR.FOTreeException;
import org.axsl.foR.ProxyFactory;
@@ -86,4 +87,14 @@
return factory.makeProxy(this);
}
+ /**
+ * {@inheritDoc}
+ * Overrides the method in FObj, because this is the object being sought.
+ * @return This, because this is the ancestor static-content object.
+ */
+ @Override
+ public StaticContent ancestorStaticContent(final FOContext context) {
+ return this;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 22:22:44
|
Revision: 9038
http://svn.sourceforge.net/foray/?rev=9038&view=rev
Author: victormote
Date: 2007-03-27 15:22:45 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Move the layout code to the correct class.
Modified Paths:
--------------
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2007-03-27 22:14:04 UTC (rev 9037)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractFlowPL.java 2007-03-27 22:22:45 UTC (rev 9038)
@@ -28,16 +28,10 @@
package org.foray.pioneer;
-import org.axsl.areaW.Area;
-import org.axsl.areaW.AreaWException;
-import org.axsl.areaW.RegionRABody;
-import org.axsl.foR.FObj;
import org.axsl.foR.fo.AbstractFlow;
import org.axsl.foR.fo.Flow;
-import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.fo.StaticContent;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -93,81 +87,4 @@
this.progressSnapshot = progressSnapshot;
}
- /**
- * {@inheritDoc}
- */
- public Status layout(final Area area, final RetrieveMarker retrieveMarker)
- throws AreaWException {
- if (getProgress() == FONodePL.START) {
- setProgress(0);
- }
-
- // flow is *always* laid out into a BodyAreaContainer
- final RegionRABody bac = (RegionRABody) area;
-
- boolean prevChildMustKeepWithNext = false;
- final int numChildren = getFONode().getChildren().size();
- for (int i = getProgress(); i < numChildren; i++) {
- final FObj fo = (FObj) getFONode().getChildren().get(i);
-
- if (bac.getMainRA().isBalancingRequired(fo)) {
- // reset the the just-done span area in preparation
- // for a backtrack for balancing
- bac.getMainRA().resetSpanArea();
-
- rollback(getProgressSnapshot());
- // one less because of the "continue"
- i = getProgress() - 1;
- continue;
- }
- // current column area
- final Area currentArea = bac.getMainRA().getNormalFlow(fo);
- if (bac.getMainRA().isNewSpanArea()) {
- setProgress(i);
- setProgressSnapshot(getProgressSnapshot(new
- ArrayList<Integer>()));
- }
-
- setStatus(getLayoutProxy(fo).layout(currentArea, retrieveMarker));
-
- if (getStatus().isIncomplete()) {
- if (prevChildMustKeepWithNext
- && (getStatus().laidOutNone())) {
- setProgress(i - 1);
- final FObj prevChild =
- (FObj) getFONode().getChildren().get(getProgress());
- final FObjPL prevChildPL = (FObjPL) getLayoutProxy(
- prevChild);
- prevChildPL.resetProgress();
- setStatus(Status.AREA_FULL_SOME);
- return getStatus();
- // should probably return AREA_FULL_NONE if first
- // or perhaps an entirely new status code
- }
- if (bac.getMainRA().isLastColumn()) {
- if (getStatus() == Status.FORCE_COLUMN_BREAK) {
- setProgress(i);
- // same thing
- setStatus(Status.FORCE_PAGE_BREAK);
- return getStatus();
- }
- setProgress(i);
- return getStatus();
- }
- // not the last column, but could be page breaks
- if (getStatus().isPageBreak()) {
- setProgress(i);
- return getStatus();
- }
- i--;
- }
- if (getStatus() == Status.KEEP_WITH_NEXT) {
- prevChildMustKeepWithNext = true;
- } else {
- prevChildMustKeepWithNext = false;
- }
- }
- return getStatus();
- }
-
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2007-03-27 22:14:04 UTC (rev 9037)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FlowPL.java 2007-03-27 22:22:45 UTC (rev 9038)
@@ -28,8 +28,15 @@
package org.foray.pioneer;
+import org.axsl.areaW.Area;
+import org.axsl.areaW.AreaWException;
+import org.axsl.areaW.RegionRABody;
+import org.axsl.foR.FObj;
import org.axsl.foR.fo.Flow;
+import org.axsl.foR.fo.RetrieveMarker;
+import java.util.ArrayList;
+
/**
* Pioneer Layout for {@link Flow}.
*/
@@ -55,4 +62,81 @@
return this.realFONode;
}
+ /**
+ * {@inheritDoc}
+ */
+ public Status layout(final Area area, final RetrieveMarker retrieveMarker)
+ throws AreaWException {
+ if (getProgress() == FONodePL.START) {
+ setProgress(0);
+ }
+
+ // flow is *always* laid out into a BodyAreaContainer
+ final RegionRABody bac = (RegionRABody) area;
+
+ boolean prevChildMustKeepWithNext = false;
+ final int numChildren = getFONode().getChildren().size();
+ for (int i = getProgress(); i < numChildren; i++) {
+ final FObj fo = (FObj) getFONode().getChildren().get(i);
+
+ if (bac.getMainRA().isBalancingRequired(fo)) {
+ // reset the the just-done span area in preparation
+ // for a backtrack for balancing
+ bac.getMainRA().resetSpanArea();
+
+ rollback(getProgressSnapshot());
+ // one less because of the "continue"
+ i = getProgress() - 1;
+ continue;
+ }
+ // current column area
+ final Area currentArea = bac.getMainRA().getNormalFlow(fo);
+ if (bac.getMainRA().isNewSpanArea()) {
+ setProgress(i);
+ setProgressSnapshot(getProgressSnapshot(new
+ ArrayList<Integer>()));
+ }
+
+ setStatus(getLayoutProxy(fo).layout(currentArea, retrieveMarker));
+
+ if (getStatus().isIncomplete()) {
+ if (prevChildMustKeepWithNext
+ && (getStatus().laidOutNone())) {
+ setProgress(i - 1);
+ final FObj prevChild =
+ (FObj) getFONode().getChildren().get(getProgress());
+ final FObjPL prevChildPL = (FObjPL) getLayoutProxy(
+ prevChild);
+ prevChildPL.resetProgress();
+ setStatus(Status.AREA_FULL_SOME);
+ return getStatus();
+ // should probably return AREA_FULL_NONE if first
+ // or perhaps an entirely new status code
+ }
+ if (bac.getMainRA().isLastColumn()) {
+ if (getStatus() == Status.FORCE_COLUMN_BREAK) {
+ setProgress(i);
+ // same thing
+ setStatus(Status.FORCE_PAGE_BREAK);
+ return getStatus();
+ }
+ setProgress(i);
+ return getStatus();
+ }
+ // not the last column, but could be page breaks
+ if (getStatus().isPageBreak()) {
+ setProgress(i);
+ return getStatus();
+ }
+ i--;
+ }
+ if (getStatus() == Status.KEEP_WITH_NEXT) {
+ prevChildMustKeepWithNext = true;
+ } else {
+ prevChildMustKeepWithNext = false;
+ }
+ }
+ return getStatus();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 22:14:04
|
Revision: 9037
http://svn.sourceforge.net/foray/?rev=9037&view=rev
Author: victormote
Date: 2007-03-27 15:14:04 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Conform to axsl change renaming method.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -1220,7 +1220,7 @@
/**
* {@inheritDoc}
*/
- public abstract int progressionDimensionAvailable();
+ public abstract int pdAvailable();
/**
* {@inheritDoc}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -48,7 +48,7 @@
/**
* {@inheritDoc}
*/
- public int progressionDimensionAvailable() {
+ public int pdAvailable() {
int dimension = brBPD();
final List<AreaNode> children = getChildren();
for (int i = 0; i < children.size(); i++) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -292,8 +292,8 @@
/**
* {@inheritDoc}
*/
- public int progressionDimensionAvailable() {
- return getParentArea().progressionDimensionAvailable();
+ public int pdAvailable() {
+ return getParentArea().pdAvailable();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -118,11 +118,11 @@
/**
* {@inheritDoc}
*/
- public int progressionDimensionAvailable() {
+ public int pdAvailable() {
/* The amount of space available to the footnote area is what is
* available in the body region. */
final Area parentArea = this.getParentArea();
- return parentArea.progressionDimensionAvailable();
+ return parentArea.pdAvailable();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -121,9 +121,9 @@
case START:
return 0;
case END:
- return this.progressionDimensionAvailable();
+ return this.pdAvailable();
case CENTER:
- return this.progressionDimensionAvailable() / 2;
+ return this.pdAvailable() / 2;
case JUSTIFY:
return 0;
case NOT_A_KEYWORD: {
@@ -208,7 +208,7 @@
* as possible.
*/
private void optimizeLeaders() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -303,7 +303,7 @@
* Optimize the specified word-spacing.
*/
private void optimizeSpecifiedWordSpacing() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -388,7 +388,7 @@
* Optimize the specified word-spacing.
*/
private void optimizeSpecifiedLetterSpacing() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -474,7 +474,7 @@
* Optimize this line for implied word-spacing.
*/
private void optimizeImpliedWordSpacing() {
- final int unusedSpace = this.progressionDimensionAvailable();
+ final int unusedSpace = this.pdAvailable();
// If line is already justified, no optimization possible.
if (unusedSpace == 0) {
return;
@@ -658,7 +658,7 @@
* What LineArea needs to report here is its own content rectangle IPD
* less the amount used by its children.
*/
- public int progressionDimensionAvailable() {
+ public int pdAvailable() {
// First, get the total usable line length.
int dimension = crIPD();
// Now, subtract the amount already used by children.
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -107,7 +107,7 @@
final int sizeNextLineArea = this.traitFontSize()
+ this.traitHalfLeadingOpt();
if (sizeNextLineArea
- > this.progressionDimensionAvailable()) {
+ > this.pdAvailable()) {
if (allowOverflow) {
final NormalBlockArea newArea = (NormalBlockArea)
this.getOverflowArea(this);
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -280,7 +280,7 @@
+ blockArea.traitGeneratedBy().traitHalfLeadingOpt(this);
if (nf.bpdUsedByChildren()
+ sizeNextLine
- <= this.progressionDimensionAvailable()) {
+ <= this.pdAvailable()) {
return true;
}
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2007-03-27 22:08:16 UTC (rev 9036)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ExternalGraphicPL.java 2007-03-27 22:14:04 UTC (rev 9037)
@@ -67,7 +67,7 @@
area.nearestGeneratedByBlockLevelFO();
final int height = realFONode.viewportBPD(area,
parentForDimensions.crBPD());
- if (area.progressionDimensionAvailable()
+ if (area.pdAvailable()
< (height + realFONode.traitSpaceBeforeOptimum(area))) {
return Status.AREA_FULL_NONE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 22:08:15
|
Revision: 9036
http://svn.sourceforge.net/foray/?rev=9036&view=rev
Author: victormote
Date: 2007-03-27 15:08:16 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Conform to axsl changes removing method.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-03-27 21:36:20 UTC (rev 9035)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-03-27 22:08:16 UTC (rev 9036)
@@ -304,7 +304,11 @@
}
/**
- * {@inheritDoc}
+ * Returns the "absolute-position" trait for this Area.
+ * @return The "absolute-position" trait, one of
+ * {@link FoValue#AUTO},
+ * {@link FoValue#ABSOLUTE}, or
+ * {@link FoValue#FIXED}.
*/
public FoValue traitAbsolutePosition() {
return traitGeneratedBy().traitAbsolutePosition(this);
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2007-03-27 21:36:20 UTC (rev 9035)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java 2007-03-27 22:08:16 UTC (rev 9036)
@@ -31,9 +31,7 @@
import org.axsl.areaW.AbstractTableContainer;
import org.axsl.areaW.Area;
import org.axsl.areaW.AreaWException;
-import org.axsl.areaW.BlockContainerRA;
import org.axsl.areaW.TableArea;
-import org.axsl.common.FoValue;
import org.axsl.foR.FOContext;
import org.axsl.foR.FONode;
import org.axsl.foR.fo.AbstractTableBody;
@@ -92,30 +90,6 @@
}
/**
- * Return true if the passed area is on the left edge of its nearest
- * absolute AreaContainer (generally a page column).
- * @param inputArea The area to be tested.
- * @return True iff the passed area is one the left edge.
- */
- private boolean startsAC(final Area inputArea) {
- Area area = inputArea;
- Area parent = null;
-
- while ((parent = area.getParentArea()) != null &&
- parent.hasChildren() == false) {
- // The area will be the first non-space child in its parent
- // Note: it's not added yet!
- if (parent instanceof BlockContainerRA &&
- ((BlockContainerRA) parent).traitAbsolutePosition()
- == FoValue.ABSOLUTE) {
- return true;
- }
- area = parent;
- }
- return false;
- }
-
- /**
* {@inheritDoc}
*/
public abstract AbstractTableBody getFONode();
@@ -205,8 +179,7 @@
}
/* Tell the row whether it is at the top of this area: if so, the
- * row should not honor keep-together.
- */
+ * row should not honor keep-together. */
boolean bRowStartsArea = i == getProgress();
if (bRowStartsArea == false && keepWith.size() > 0) {
if (node.getChildren().indexOf(keepWith.get(0))
@@ -214,7 +187,7 @@
bRowStartsArea = true;
}
}
- rowPL.setIgnoreKeepTogether(bRowStartsArea && startsAC(tableArea));
+ rowPL.setIgnoreKeepTogether(bRowStartsArea);
Status status = rowPL.layout(areaContainer, retrieveMarker);
if (status.isIncomplete()) {
// BUG!!! don't distinguish between break-before and after!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 21:36:20
|
Revision: 9035
http://svn.sourceforge.net/foray/?rev=9035&view=rev
Author: victormote
Date: 2007-03-27 14:36:20 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Implement new axsl method, and use it to handle table-omit-header-at-break.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-03-27 21:13:50 UTC (rev 9034)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-03-27 21:36:20 UTC (rev 9035)
@@ -202,10 +202,9 @@
}
/**
- * Indicates whether this is the first child of this area's "generated-by".
- * @return True iff this is the first child of this area's "generated-by".
+ * {@inheritDoc}
*/
- protected boolean isFirstChildOfGeneratedBy() {
+ public boolean isFirstChildOfGeneratedBy() {
return this.getNormalLinkage().isFirstGeneratedBy(this);
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-03-27 21:13:50 UTC (rev 9034)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-03-27 21:36:20 UTC (rev 9035)
@@ -122,15 +122,22 @@
final TableArea tableArea = bcArea.makeTableArea(table,
retrieveMarker);
- /* Process the table header. */
- Status status = layoutTableHeader(tableArea, retrieveMarker);
- if (status.isIncomplete()) {
- this.resetAll(tableArea);
- return Status.AREA_FULL_NONE;
+ Status status = null;
+
+ /* Process the table header if we are on the first page/column, or if
+ * we are not to omit at breaks. */
+ if (tableArea.isFirstChildOfGeneratedBy()
+ || ! this.table.traitTableOmitHeaderAtBreak(tableArea)) {
+ status = layoutTableHeader(tableArea, retrieveMarker);
+ if (status.isIncomplete()) {
+ this.resetAll(tableArea);
+ return Status.AREA_FULL_NONE;
+ }
}
/* See if the table footer will fit.
- * The AreaTree is responsible to keep the order and position of the
+ * We don't really want the footer to come before the body, but the
+ * AreaTree is responsible to keep the order and position of the
* Areas correct. */
status = layoutTableFooter(tableArea, retrieveMarker);
if (status.isIncomplete()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 21:14:02
|
Revision: 9034
http://svn.sourceforge.net/foray/?rev=9034&view=rev
Author: victormote
Date: 2007-03-27 14:13:50 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Add the body area before the footer area if there is one.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-03-27 20:51:23 UTC (rev 9033)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-03-27 21:13:50 UTC (rev 9034)
@@ -178,7 +178,15 @@
final TableBodyContainer bodyContainer
= TableBodyContainer.makeTableBodyContainer(tableBody, this,
retrieveMarker);
- this.children.add(bodyContainer);
+ if (this.getFooterArea() == null) {
+ /* If there is not yet a footer area, add it to the end. */
+ this.children.add(bodyContainer);
+ } else {
+ /* If there is a footer area, it is the last child, and we must
+ * place the body area before it.*/
+ final int lastIndex = this.children.size() - 1;
+ this.children.add(lastIndex, bodyContainer);
+ }
return bodyContainer;
}
@@ -579,4 +587,23 @@
return (Table) this.getLinkage().getFONode();
}
+ /**
+ * Returns the child footer area, if any.
+ * @return The child footer area, or null if there is no footer child.
+ */
+ private TableFooterContainer getFooterArea() {
+ if (this.children == null) {
+ return null;
+ }
+ if (this.children.size() < 1) {
+ return null;
+ }
+ /* If there is one, it must the last child. */
+ final int lastIndex = this.children.size() - 1;
+ if (this.children.get(lastIndex) instanceof TableFooterContainer) {
+ return (TableFooterContainer) this.children.get(lastIndex);
+ }
+ return null;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 20:51:26
|
Revision: 9033
http://svn.sourceforge.net/foray/?rev=9033&view=rev
Author: victormote
Date: 2007-03-27 13:51:23 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
More cleanup of table layout.
Modified Paths:
--------------
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-03-27 20:07:09 UTC (rev 9032)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-03-27 20:51:23 UTC (rev 9033)
@@ -97,23 +97,20 @@
return Status.FORCE_PAGE_BREAK_EVEN;
}
- }
-
- final TableArea tableArea = bcArea.makeTableArea(table,
- retrieveMarker);
-
- /* Process the marker children. */
- for (int i = getProgress(); i < table.qtyMarkerChildren(); i++) {
- final FONode fo = table.getChildren().get(i);
- if (fo instanceof Marker) {
- final MarkerPL markerPL = (MarkerPL) getLayoutProxy(fo);
- markerPL.layout(area, retrieveMarker);
- this.setProgress(i);
- } else {
- throw new AreaWException("Marker object expected.");
+ /* Process the marker children. */
+ for (int i = getProgress(); i < table.qtyMarkerChildren(); i++) {
+ final FONode fo = table.getChildren().get(i);
+ if (fo instanceof Marker) {
+ final MarkerPL markerPL = (MarkerPL) getLayoutProxy(fo);
+ markerPL.layout(area, retrieveMarker);
+ this.setProgress(i);
+ } else {
+ throw new AreaWException("Marker object expected.");
+ }
}
}
+ /* For now, we bail out if the columns widths are not specified. */
if (this.table.numberOfColumns() == 0) {
getLayout().getLogger().warn("Current implementation of tables "
+ "requires a table-column for each column, "
@@ -122,30 +119,29 @@
return Status.OK;
}
- boolean addedFooter = false;
+ final TableArea tableArea = bcArea.makeTableArea(table,
+ retrieveMarker);
+ /* Process the table header. */
+ Status status = layoutTableHeader(tableArea, retrieveMarker);
+ if (status.isIncomplete()) {
+ this.resetAll(tableArea);
+ return Status.AREA_FULL_NONE;
+ }
+
+ /* See if the table footer will fit.
+ * The AreaTree is responsible to keep the order and position of the
+ * Areas correct. */
+ status = layoutTableFooter(tableArea, retrieveMarker);
+ if (status.isIncomplete()) {
+ this.resetAll(tableArea);
+ return Status.AREA_FULL_NONE;
+ }
+
+ /* Process the table body(s). */
for (int i = getProgress(); i < table.getChildren().size(); i++) {
final FONode fo = table.getChildren().get(i);
if (fo instanceof TableBody) {
- Status status = layoutTableHeader(tableArea, retrieveMarker);
- TableFooter tf = table.getTableFooter();
- if (table.getTableFooter() != null
- && ! table.traitTableOmitFooterAtBreak(area)
- && ! addedFooter) {
- tf = table.getTableFooter();
- final TableFooterPL tfPL = (TableFooterPL)
- this.getLayoutProxy(tf);
- status = tfPL.layout(tableArea, retrieveMarker);
- tf = table.getTableFooter();
- final TableFooterPL footerPL = (TableFooterPL)
- this.getLayoutProxy(tf);
- if (status.isIncomplete()) {
- return Status.AREA_FULL_NONE;
- }
- addedFooter = true;
- footerPL.resetProgress();
- }
-
status = getLayoutProxy(fo).layout(tableArea,
retrieveMarker);
if (status.isIncomplete()) {
@@ -165,7 +161,7 @@
&& table.traitTableOmitFooterAtBreak(area)) {
final TableFooter tf = table.getTableFooter();
final TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tf);
- final Status status = tfPL.layout(tableArea, retrieveMarker);
+ status = tfPL.layout(tableArea, retrieveMarker);
if (status.isIncomplete()) {
// this is a problem since we need to remove a row
// from the last table body and place it on the
@@ -215,15 +211,44 @@
}
final TableHeaderPL tableHeaderPL = (TableHeaderPL) getLayoutProxy(th);
final Status status = tableHeaderPL.layout(tableArea, retrieveMarker);
+ /* Reset the progress so that it can be reused on the next page if
+ * necessary. */
+ tableHeaderPL.resetProgress();
if (status.isIncomplete()) {
- tableHeaderPL.resetProgress();
return Status.AREA_FULL_NONE;
}
- tableHeaderPL.resetProgress();
return status;
}
/**
+ * Lays out the table footer into the table area.
+ * @param tableArea The table area into which the table footer should be
+ * laid out.
+ * @param retrieveMarker The retrieve-marker.
+ * @return The status of the table footer layout.
+ * @throws AreaWException For errors.
+ */
+ private Status layoutTableFooter(final TableArea tableArea,
+ final RetrieveMarker retrieveMarker) throws AreaWException {
+ final TableFooter tf = table.getTableFooter();
+ if (tf == null) {
+ return Status.OK;
+ }
+ /* Don't worry about traitTableOmitFooterAtBreak here. That is handled
+ * elsewhere. */
+ final TableFooterPL tableFooterPL = (TableFooterPL)
+ this.getLayoutProxy(tf);
+ final Status status = tableFooterPL.layout(tableArea, retrieveMarker);
+ /* Reset the progress so that it can be reused on the next page if
+ * necessary. */
+ tableFooterPL.resetProgress();
+ if (status.isIncomplete()) {
+ return Status.AREA_FULL_NONE;
+ }
+ return status;
+ }
+
+ /**
* Rolls back all layout for this table on the current page.
* @param tableArea The table area which should be wiped clean.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-03-27 20:07:10
|
Revision: 9032
http://svn.sourceforge.net/foray/?rev=9032&view=rev
Author: victormote
Date: 2007-03-27 13:07:09 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Move table header layout to new method.
Modified Paths:
--------------
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-03-27 19:39:23 UTC (rev 9031)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2007-03-27 20:07:09 UTC (rev 9032)
@@ -122,46 +122,13 @@
return Status.OK;
}
- boolean addedHeader = false;
boolean addedFooter = false;
for (int i = getProgress(); i < table.getChildren().size(); i++) {
final FONode fo = table.getChildren().get(i);
- if (fo instanceof Marker) {
- final MarkerPL markerPL = (MarkerPL) getLayoutProxy(fo);
- markerPL.layout(area, retrieveMarker);
- continue;
- }
if (fo instanceof TableBody) {
- TableHeader th = table.getTableHeader();
- TableHeaderPL tableHeaderPL = null;
- if (th != null) {
- tableHeaderPL = (TableHeaderPL) getLayoutProxy(th);
- }
+ Status status = layoutTableHeader(tableArea, retrieveMarker);
TableFooter tf = table.getTableFooter();
- TableFooterPL tableFooterPL = null;
- if (tf != null) {
- tableFooterPL = (TableFooterPL) getLayoutProxy(tf);
- }
- Status status;
- if (table.getTableHeader() != null && !addedHeader) {
- /*
- * TODO: This seems to duplicate code above.
- */
- th = table.getTableHeader();
- final TableHeaderPL thPL = (TableHeaderPL)
- this.getLayoutProxy(th);
- status = thPL.layout(tableArea, retrieveMarker);
- th = table.getTableHeader();
- final TableHeaderPL headerPL = (TableHeaderPL)
- this.getLayoutProxy(th);
- if (status.isIncomplete()) {
- headerPL.resetProgress();
- return Status.AREA_FULL_NONE;
- }
- addedHeader = true;
- headerPL.resetProgress();
- }
if (table.getTableFooter() != null
&& ! table.traitTableOmitFooterAtBreak(area)
&& ! addedFooter) {
@@ -186,13 +153,7 @@
status = Status.AREA_FULL_SOME;
if (this.bodyCount == 0
&& status == Status.AREA_FULL_NONE) {
- if (table.getTableHeader() != null) {
- tableHeaderPL.removeLayout(tableArea);
- }
- if (table.getTableFooter() != null) {
- tableFooterPL.removeLayout(tableArea);
- }
- resetProgress();
+ resetAll(tableArea);
}
return status;
}
@@ -238,14 +199,51 @@
return Status.OK;
}
-// // FIXME: this seems odd.
-// public int getTableFooterYPosition(final FOContext context,
-// final TableFooter tFooter) {
-// final TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tFooter);
-// return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(context);
-// }
+ /**
+ * Lays out the table header into the table area.
+ * @param tableArea The table area into which the table header should be
+ * laid out.
+ * @param retrieveMarker The retrieve-marker.
+ * @return The status of the table header layout.
+ * @throws AreaWException For errors.
+ */
+ private Status layoutTableHeader(final TableArea tableArea,
+ final RetrieveMarker retrieveMarker) throws AreaWException {
+ final TableHeader th = table.getTableHeader();
+ if (th == null) {
+ return Status.OK;
+ }
+ final TableHeaderPL tableHeaderPL = (TableHeaderPL) getLayoutProxy(th);
+ final Status status = tableHeaderPL.layout(tableArea, retrieveMarker);
+ if (status.isIncomplete()) {
+ tableHeaderPL.resetProgress();
+ return Status.AREA_FULL_NONE;
+ }
+ tableHeaderPL.resetProgress();
+ return status;
+ }
/**
+ * Rolls back all layout for this table on the current page.
+ * @param tableArea The table area which should be wiped clean.
+ */
+ private void resetAll(final TableArea tableArea) {
+ final TableHeader header = table.getTableHeader();
+ if (header != null) {
+ final TableHeaderPL tableHeaderPL = (TableHeaderPL)
+ this.getLayoutProxy(header);
+ tableHeaderPL.removeLayout(tableArea);
+ }
+ final TableFooter footer = table.getTableFooter();
+ if (footer != null) {
+ final TableFooterPL tableFooterPL = (TableFooterPL)
+ this.getLayoutProxy(footer);
+ tableFooterPL.removeLayout(tableArea);
+ }
+ resetProgress();
+ }
+
+ /**
* {@inheritDoc}
*/
public Table getFONode() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|