You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by sp...@apache.org on 2007/09/25 16:31:37 UTC
svn commit: r579260 [4/11] - in
/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./
src/documentation/content/xdocs/ src/java/org/apache/fop/apps/
src/java/org/apache/fop/area/ src/java/org/apache/fop/area/inline/
src/java/org/apache/fop/...
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableBody.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableBody.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableBody.java Tue Sep 25 07:31:06 2007
@@ -21,9 +21,7 @@
// Java
import java.util.BitSet;
-import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -31,15 +29,9 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.StaticPropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.flow.TableFObj.PendingSpan;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonRelativePosition;
/**
* Class modelling the fo:table-body object.
@@ -54,8 +46,6 @@
// private int visibility;
// End of property values
- private PropertyList savedPropertyList;
-
/**
* used for validation
*/
@@ -78,17 +68,15 @@
}
/**
- * @see FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
super.bind(pList);
- //Used by convertCellsToRows()
- savedPropertyList = pList;
}
/**
- * @see org.apache.fop.fo.FONode#processNode(String, Locator, Attributes, PropertyList)
+ * {@inheritDoc}
*/
public void processNode(String elementName, Locator locator,
Attributes attlist, PropertyList pList)
@@ -108,20 +96,18 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
getFOEventHandler().startBody(this);
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!inMarker()) {
- // clean up
- savedPropertyList = null;
pendingSpans = null;
usedColumnIndices = null;
}
@@ -136,17 +122,11 @@
+ "Expected: marker* (table-row+|table-cell+)");
getParent().removeChild(this);
}
- }
-
- /*
- if (tableCellsFound) {
- convertCellsToRows();
- }
- */
+ }
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc} String, String)
* XSL Content Model: marker* (table-row+|table-cell+)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -180,7 +160,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
protected void addChildNode(FONode child) throws FOPException {
if (!inMarker()) {
@@ -232,56 +212,19 @@
}
/**
- * If table-cells are used as direct children of a table-body|header|footer
- * they are replaced in this method by proper table-rows.
- * @throws FOPException if there's a problem binding the TableRow's
- * properties.
- */
- // TODO: This is currently unused. Why is it here?
- private void convertCellsToRows() throws FOPException {
- //getLogger().debug("Converting cells to rows...");
- List cells = new java.util.ArrayList(childNodes);
- childNodes.clear();
- Iterator i = cells.iterator();
- TableRow row = null;
- while (i.hasNext()) {
- TableCell cell = (TableCell) i.next();
- if (cell.startsRow() && (row != null)) {
- childNodes.add(row);
- row = null;
- }
- if (row == null) {
- row = new TableRow(this);
- PropertyList pList = new StaticPropertyList(row,
- savedPropertyList);
- pList.setWritingMode();
- row.bind(pList);
- }
- row.addReplacedCell(cell);
- if (cell.endsRow()) {
- childNodes.add(row);
- row = null;
- }
- }
- if (row != null) {
- childNodes.add(row);
- }
- }
-
- /**
* @return the Common Border, Padding, and Background Properties.
*/
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return commonBorderPaddingBackground;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-body";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_TABLE_BODY;
@@ -292,22 +235,11 @@
* @return true if the given table row is the first row of this body.
*/
public boolean isFirst(TableRow obj) {
- return (childNodes == null
- || (!childNodes.isEmpty()
- && childNodes.get(0) == obj));
+ return (firstChild == null
+ || firstChild == obj);
}
/**
- * @param obj table row in question
- * @return true if the given table row is the first row of this body.
- */
- public boolean isLast(TableRow obj) {
- return (childNodes == null
- || (childNodes.size() > 0
- && childNodes.get(childNodes.size() - 1) == obj));
- }
-
- /**
* Initializes list of pending row-spans; used for correctly
* assigning initial value for column-number for the
* cells of following rows
@@ -411,8 +343,8 @@
* start of row)
*/
protected boolean previousCellEndedRow() {
- if (childNodes != null) {
- FONode prevNode = (FONode) childNodes.get(childNodes.size() - 1);
+ if (firstChild != null) {
+ FONode prevNode = getChildNodes().lastNode();
if (prevNode.getNameId() == FO_TABLE_CELL) {
return ((TableCell) prevNode).endsRow();
}
@@ -432,7 +364,7 @@
}
/**
- * @see org.apache.fop.fo.flow.TableFObj#flagColumnIndices(int, int)
+ * {@inheritDoc}
*/
protected void flagColumnIndices(int start, int end) {
for (int i = start; i < end; i++) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCaption.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCaption.java Tue Sep 25 07:31:06 2007
@@ -23,27 +23,17 @@
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
-import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.KeepProperty;
-import org.apache.fop.fo.properties.LengthRangeProperty;
/**
* Class modelling the fo:table-caption object.
- * @todo needs implementation
*/
public class TableCaption extends FObj {
// The value of properties relevant for fo:table-caption.
- private CommonAccessibility commonAccessibility;
- private CommonBorderPaddingBackground commonBorderPaddingBackground;
// Unused but valid items, commented out for performance:
// private CommonAural commonAural;
// private CommonRelativePosition commonRelativePosition;
@@ -73,34 +63,23 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
- commonAccessibility = pList.getAccessibilityProps();
- commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
}
/**
- * @return the Common Border, Padding, and Background Properties.
- */
- public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
- return commonBorderPaddingBackground;
- }
-
- /**
- * Make sure content model satisfied, if so then tell the
- * FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("marker* (%block;)");
}
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (%block;)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -116,13 +95,13 @@
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-caption";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_TABLE_CAPTION;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCell.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCell.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCell.java Tue Sep 25 07:31:06 2007
@@ -23,20 +23,14 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.datatypes.Length;
-import org.apache.fop.datatypes.Numeric;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
/**
* Class modelling the fo:table-cell object.
- * @todo check need for all instance variables stored here
*/
public class TableCell extends TableFObj {
// The value of properties relevant for fo:table-cell.
@@ -73,7 +67,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -90,7 +84,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -100,13 +94,13 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (!blockItemFound) {
if (getUserAgent().validateStrictly()) {
missingChildElementError("marker* (%block;)+");
- } else if (childNodes != null && childNodes.size() > 0) {
+ } else if (firstChild != null) {
log.warn("fo:table-cell content that is not "
+ "enclosed by a fo:block will be dropped/ignored.");
}
@@ -120,7 +114,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -136,7 +130,7 @@
}
}
- /** @see org.apache.fop.fo.FObj#generatesReferenceAreas() */
+ /** {@inheritDoc} */
public boolean generatesReferenceAreas() {
return true;
}
@@ -203,13 +197,13 @@
return (endsRow == EN_TRUE);
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-cell";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public final int getNameId() {
return FO_TABLE_CELL;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableColumn.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableColumn.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableColumn.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableColumn.java Tue Sep 25 07:31:06 2007
@@ -67,7 +67,7 @@
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
@@ -111,21 +111,21 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode()
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
getFOEventHandler().startColumn(this);
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
getFOEventHandler().endColumn(this);
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc,
@@ -181,12 +181,12 @@
return numberColumnsSpanned;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-column";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_TABLE_COLUMN;
}
@@ -203,7 +203,7 @@
return defaultColumn;
}
- /** @see java.lang.Object#toString() */
+ /** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer("fo:table-column");
sb.append(" column-number=").append(getColumnNumber());
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFObj.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFObj.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFObj.java Tue Sep 25 07:31:06 2007
@@ -19,8 +19,6 @@
package org.apache.fop.fo.flow;
-import java.util.BitSet;
-import java.util.Iterator;
import java.util.List;
import org.apache.fop.apps.FOPException;
@@ -30,15 +28,13 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
-import org.apache.fop.fo.ValidationException;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.fo.properties.NumberProperty;
import org.apache.fop.fo.properties.Property;
-import org.apache.fop.fo.properties.PropertyMaker;
/**
- * Superclass for table-related FOs
+ * Common base class for table-related FOs
*/
public abstract class TableFObj extends FObj {
@@ -80,7 +76,7 @@
}
/**
- * @see FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -100,8 +96,7 @@
if (getNameId() != FO_TABLE //Separate check for fo:table in Table.java
&& getNameId() != FO_TABLE_CELL
&& getCommonBorderPaddingBackground().hasPadding(
- ValidationPercentBaseContext
- .getPseudoContextForValidationPurposes())) {
+ ValidationPercentBaseContext.getPseudoContext())) {
attributeWarning(
"padding-* properties are not applicable to " + getName()
+ ", but a non-zero value for padding was found.");
@@ -109,7 +104,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
protected void addChildNode(FONode child) throws FOPException {
if (!inMarker()
@@ -120,31 +115,13 @@
super.addChildNode(child);
}
- private void updateColumnIndex(TableCell cell)
- throws ValidationException {
+ private void updateColumnIndex(TableCell cell) {
int rowSpan = cell.getNumberRowsSpanned();
int colSpan = cell.getNumberColumnsSpanned();
int columnIndex = getCurrentColumnIndex();
+ int i;
- int i = -1;
- while (++i < colSpan) {
- if (isColumnNumberUsed(columnIndex + i)) {
- /* if column-number is already in use by another cell
- * in the current row => error!
- */
- StringBuffer errorMessage = new StringBuffer();
- errorMessage.append("fo:table-cell overlaps in column ")
- .append(columnIndex + i);
- if (locator.getLineNumber() != -1) {
- errorMessage.append(" (line #")
- .append(locator.getLineNumber()).append(", column #")
- .append(locator.getColumnNumber()).append(")");
- }
- throw new ValidationException(errorMessage.toString());
- }
- }
-
if (getNameId() == FO_TABLE_ROW) {
TableRow row = (TableRow) this;
@@ -182,7 +159,8 @@
/* pendingSpans not initialized for the first row...
*/
if (body.firstRow) {
- for (i = colSpan; --i >= 0;) {
+ for (i = colSpan;
+ --i >= 0|| body.pendingSpans.size() < cell.getColumnNumber();) {
body.pendingSpans.add(null);
}
}
@@ -326,7 +304,7 @@
}
/**
- * @see PropertyMaker#make(PropertyList)
+ * {@inheritDoc}
*/
public Property make(PropertyList propertyList)
throws PropertyException {
@@ -343,60 +321,65 @@
parent.resetColumnIndex();
}
}
- return new NumberProperty(((TableFObj) fo.getParent())
- .getCurrentColumnIndex());
- } else {
- throw new PropertyException(
- "column-number property is only allowed"
- + " on fo:table-cell or fo:table-column, not on "
- + fo.getName());
}
+ return NumberProperty.getInstance(
+ ((TableFObj) fo.getParent()).getCurrentColumnIndex());
}
+
/**
* Check the value of the column-number property.
* Return the parent's column index (initial value) in case
* of a negative or zero value
*
- * @see org.apache.fop.fo.properties.PropertyMaker#get(
- * int, PropertyList, boolean, boolean)
+ * @see org.apache.fop.fo.properties.PropertyMaker#make(PropertyList, String, FObj)
*/
- public Property get(int subpropId, PropertyList propertyList,
- boolean tryInherit, boolean tryDefault)
- throws PropertyException {
+ public Property make(PropertyList propertyList, String value, FObj fo)
+ throws PropertyException {
+ Property p = super.make(propertyList, value, fo);
- Property p = super.get(0, propertyList, tryInherit, tryDefault);
- TableFObj fo = (TableFObj) propertyList.getFObj();
TableFObj parent = (TableFObj) propertyList.getParentFObj();
- if (p != null) {
- int columnIndex = p.getNumeric().getValue();
-
- if (columnIndex <= 0) {
- log.warn("Specified negative or zero value for "
- + "column-number on " + fo.getName() + ": "
- + columnIndex + " forced to "
- + parent.getCurrentColumnIndex());
- return new NumberProperty(parent.getCurrentColumnIndex());
- }
-
+ int columnIndex = p.getNumeric().getValue();
+ if (columnIndex <= 0) {
+ log.warn("Specified negative or zero value for "
+ + "column-number on " + fo.getName() + ": "
+ + columnIndex + " forced to "
+ + parent.getCurrentColumnIndex());
+ return NumberProperty.getInstance(parent.getCurrentColumnIndex());
+ } else {
double tmpIndex = p.getNumeric().getNumericValue();
if (tmpIndex - columnIndex > 0.0) {
columnIndex = (int) Math.round(tmpIndex);
log.warn("Rounding specified column-number of "
+ tmpIndex + " to " + columnIndex);
- return new NumberProperty(columnIndex);
+ p = NumberProperty.getInstance(columnIndex);
}
-
- /* if column-number was explicitly specified, force the
- * parent's current column index to the specified value,
- * so that the updated index will be the correct initial
- * value for the next cell/column (see Rec 7.26.8)
- */
- if (propertyList.getExplicit(Constants.PR_COLUMN_NUMBER) != null) {
- parent.setCurrentColumnIndex(p.getNumeric().getValue());
+ }
+
+ parent.setCurrentColumnIndex(columnIndex);
+
+ int colSpan = propertyList.get(Constants.PR_NUMBER_COLUMNS_SPANNED)
+ .getNumeric().getValue();
+ int i = -1;
+ while (++i < colSpan) {
+ if (parent.isColumnNumberUsed(columnIndex + i)) {
+ /* if column-number is already in use by another
+ * cell/column => error!
+ */
+ StringBuffer errorMessage = new StringBuffer();
+ errorMessage.append(fo.getName() + " overlaps in column ")
+ .append(columnIndex + i);
+ org.xml.sax.Locator loc = fo.getLocator();
+ if (loc != null && loc.getLineNumber() != -1) {
+ errorMessage.append(" (line #")
+ .append(loc.getLineNumber()).append(", column #")
+ .append(loc.getColumnNumber()).append(")");
+ }
+ throw new PropertyException(errorMessage.toString());
}
}
+
return p;
}
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFooter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFooter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFooter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFooter.java Tue Sep 25 07:31:06 2007
@@ -37,14 +37,14 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
//getFOEventHandler().startBody(this);
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
// getFOEventHandler().endFooter(this);
@@ -54,12 +54,12 @@
// convertCellsToRows();
}
- /** @see org.apache.fop.fo.FObj#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-footer";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_TABLE_FOOTER;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableHeader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableHeader.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableHeader.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableHeader.java Tue Sep 25 07:31:06 2007
@@ -37,14 +37,14 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
//getFOEventHandler().startHeader(this);
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
// getFOEventHandler().endHeader(this);
@@ -54,12 +54,12 @@
// convertCellsToRows();
}
- /** @see org.apache.fop.fo.FObj#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-header";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_TABLE_HEADER;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableRow.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableRow.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableRow.java Tue Sep 25 07:31:06 2007
@@ -30,10 +30,7 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.fo.properties.CommonAural;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
-import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
@@ -56,8 +53,6 @@
// private CommonRelativePosition commonRelativePosition;
// private int visibility;
// End of property values
-
- private boolean setup = false;
protected List pendingSpans;
protected BitSet usedColumnIndices;
@@ -70,9 +65,7 @@
super(parent);
}
- /**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
- */
+ /** {@inheritDoc} */
public void bind(PropertyList pList) throws FOPException {
blockProgressionDimension
= pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
@@ -86,24 +79,7 @@
super.bind(pList);
}
- /**
- * Adds a cell to this row (skips marker handling done by
- * FObj.addChildNode().
- * Used by TableBody during the row building process when only cells are
- * used as direct children of a table-body/header/footer.
- * @param cell cell to add.
- */
- protected void addReplacedCell(TableCell cell) {
- if (childNodes == null) {
- childNodes = new java.util.ArrayList();
- }
- childNodes.add(cell);
- }
-
- /**
- * @see org.apache.fop.fo.FONode#processNode(String, Locator,
- * Attributes, PropertyList)
- */
+ /** {@inheritDoc} */
public void processNode(String elementName, Locator locator,
Attributes attlist, PropertyList pList) throws FOPException {
if (!inMarker()) {
@@ -119,7 +95,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
protected void addChildNode(FONode child) throws FOPException {
if (!inMarker()) {
@@ -157,7 +133,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -165,10 +141,10 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("(table-cell+)");
}
if (!inMarker()) {
@@ -179,7 +155,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc} String, String)
* XSL Content Model: (table-cell+)
*/
protected void validateChildNode(Locator loc, String nsURI,
@@ -266,12 +242,12 @@
return commonBorderPaddingBackground;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "table-row";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_TABLE_ROW;
}
@@ -308,7 +284,7 @@
}
/**
- * @see org.apache.fop.fo.flow.TableFObj#flagColumnIndices(int, int)
+ * {@inheritDoc}
*/
protected void flagColumnIndices(int start, int end) {
for (int i = start; i < end; i++) {
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Wrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Wrapper.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Wrapper.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Wrapper.java Tue Sep 25 07:31:06 2007
@@ -19,18 +19,15 @@
package org.apache.fop.fo.flow;
-// Java
-import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObjMixed;
-import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
import org.xml.sax.Locator;
/**
- * Implementation for fo:wrapper formatting object.
- * The wrapper object serves as
- * a property holder for its child node objects.
+ * Class modelling the fo:wrapper object.
+ * The wrapper object serves as a property holder for
+ * its child node objects.
*/
public class Wrapper extends FObjMixed {
// The value of properties relevant for fo:wrapper.
@@ -47,7 +44,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (#PCDATA|%inline;|%block;)*
* Additionally (unimplemented): "An fo:wrapper that is a child of an
* fo:multi-properties is only permitted to have children that would
@@ -67,14 +64,12 @@
}
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "wrapper";
}
- /**
- * @see org.apache.fop.fo.FObj#getNameId()
- */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_WRAPPER;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ColorProfile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ColorProfile.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ColorProfile.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ColorProfile.java Tue Sep 25 07:31:06 2007
@@ -46,7 +46,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
src = pList.get(PR_SRC).getString();
@@ -55,7 +55,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL 1.0/FOP: EMPTY (no child nodes permitted)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -70,13 +70,13 @@
return colorProfileName;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "color-profile";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_COLOR_PROFILE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java Tue Sep 25 07:31:06 2007
@@ -52,7 +52,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
masterReference = pList.get(PR_MASTER_REFERENCE).getString();
@@ -66,7 +66,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
getConcreteParent().addConditionalPageMasterReference(this);
@@ -77,7 +77,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -154,12 +154,12 @@
return this.pagePosition;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "conditional-page-master-reference";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_CONDITIONAL_PAGE_MASTER_REFERENCE;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Declarations.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Declarations.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Declarations.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Declarations.java Tue Sep 25 07:31:06 2007
@@ -20,7 +20,6 @@
package org.apache.fop.fo.pagination;
// Java
-import java.util.Iterator;
import java.util.Map;
import org.xml.sax.Locator;
@@ -51,14 +50,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
// No properties defined for fo:declarations
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL 1.0: (color-profile)+ (and non-XSL NS nodes)
* FOP/XSL 1.1: (color-profile)* (and non-XSL NS nodes)
*/
@@ -74,12 +73,11 @@
/**
* At the end of this element sort out the children into
* a hashmap of color profiles and a list of extension attachments.
- * @see org.apache.fop.fo.FONode#endOfNode()
*/
protected void endOfNode() throws FOPException {
- if (childNodes != null) {
- for (Iterator iter = childNodes.iterator(); iter.hasNext();) {
- FONode node = (FONode)iter.next();
+ if (firstChild != null) {
+ for (FONodeIterator iter = getChildNodes(); iter.hasNext();) {
+ FONode node = iter.nextNode();
if (node.getName().equals("fo:color-profile")) {
ColorProfile cp = (ColorProfile)node;
if (!"".equals(cp.getColorProfileName())) {
@@ -93,7 +91,7 @@
}
}
}
- childNodes = null;
+ firstChild = null;
}
private void addColorProfile(ColorProfile cp) {
@@ -109,14 +107,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#getName()
+ * {@inheritDoc}
*/
public String getLocalName() {
return "declarations";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_DECLARATIONS;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Flow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Flow.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Flow.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Flow.java Tue Sep 25 07:31:06 2007
@@ -46,14 +46,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
flowName = pList.get(PR_FLOW_NAME).getString();
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
if (flowName == null || flowName.equals("")) {
@@ -83,7 +83,6 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
*/
protected void endOfNode() throws FOPException {
if (!blockItemFound) {
@@ -93,7 +92,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: marker* (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -121,13 +120,13 @@
return flowName;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "flow";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_FLOW;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java Tue Sep 25 07:31:06 2007
@@ -53,14 +53,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
// No properties in layout-master-set.
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
getRoot().setLayoutMasterSet(this);
@@ -69,17 +69,17 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("(simple-page-master|page-sequence-master)+");
}
checkRegionNames();
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL/FOP: (simple-page-master|page-sequence-master)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -215,13 +215,13 @@
return false;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "layout-master-set";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_LAYOUT_MASTER_SET;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequence.java Tue Sep 25 07:31:06 2007
@@ -92,7 +92,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -112,7 +112,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode()
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
super.startOfNode();
@@ -136,7 +136,7 @@
getFOEventHandler().startPageSequence(this);
}
- /** @see org.apache.fop.fo.FONode#endOfNode() */
+ /** {@inheritDoc} */
protected void endOfNode() throws FOPException {
if (mainFlow == null) {
missingChildElementError("(title?,static-content*,flow)");
@@ -146,7 +146,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL Content Model: (title?,static-content*,flow)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -177,7 +177,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
* @todo see if addChildNode() should also be called for fo's other than
* fo:flow.
*/
@@ -501,12 +501,12 @@
return masterReference;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "page-sequence";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_PAGE_SEQUENCE;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java Tue Sep 25 07:31:06 2007
@@ -60,7 +60,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
masterName = pList.get(PR_MASTER_NAME).getString();
@@ -71,7 +71,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode()
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
subSequenceSpecifiers = new java.util.ArrayList();
@@ -80,17 +80,17 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode()
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("(single-page-master-reference|"
+ "repeatable-page-master-reference|repeatable-page-master-alternatives)+");
}
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL/FOP: (single-page-master-reference|repeatable-page-master-reference|
* repeatable-page-master-alternatives)+
*/
@@ -224,13 +224,13 @@
return pageMaster;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "page-sequence-master";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_PAGE_SEQUENCE_MASTER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java Tue Sep 25 07:31:06 2007
@@ -46,7 +46,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -55,7 +55,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL/FOP: (bookmark+)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -76,13 +76,13 @@
return indexKey;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "page-sequence-wrapper";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_PAGE_SEQUENCE_WRAPPER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Region.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Region.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Region.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Region.java Tue Sep 25 07:31:06 2007
@@ -58,7 +58,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
@@ -92,7 +92,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc} String, String)
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -131,7 +131,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#generatesReferenceAreas()
+ * {@inheritDoc}
*/
public boolean generatesReferenceAreas() {
return true;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionAfter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionAfter.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionAfter.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionAfter.java Tue Sep 25 07:31:06 2007
@@ -41,7 +41,7 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension, SimplePageMaster)
+ * {@inheritDoc}
*/
public Rectangle getViewportRectangle (FODimension reldims, SimplePageMaster spm) {
/* Special rules apply to resolving extent as values are resolved relative
@@ -83,19 +83,19 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getDefaultRegionName()
+ * {@inheritDoc}
*/
protected String getDefaultRegionName() {
return "xsl-region-after";
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "region-after";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_REGION_AFTER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBA.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBA.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBA.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBA.java Tue Sep 25 07:31:06 2007
@@ -43,7 +43,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBefore.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBefore.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBefore.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBefore.java Tue Sep 25 07:31:06 2007
@@ -40,14 +40,14 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getDefaultRegionName()
+ * {@inheritDoc}
*/
protected String getDefaultRegionName() {
return "xsl-region-before";
}
/**
- * @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension, SimplePageMaster)
+ * {@inheritDoc}
*/
public Rectangle getViewportRectangle (FODimension reldims, SimplePageMaster spm) {
/* Special rules apply to resolving extent as values are resolved relative
@@ -86,13 +86,13 @@
return vpRect;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "region-before";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_REGION_BEFORE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBody.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBody.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionBody.java Tue Sep 25 07:31:06 2007
@@ -50,7 +50,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
@@ -94,7 +94,7 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension, SimplePageMaster)
+ * {@inheritDoc}
*/
public Rectangle getViewportRectangle (FODimension reldims, SimplePageMaster spm) {
/* Special rules apply to resolving margins in the page context.
@@ -144,19 +144,19 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getDefaultRegionName()
+ * {@inheritDoc}
*/
protected String getDefaultRegionName() {
return "xsl-region-body";
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "region-body";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_REGION_BODY;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionEnd.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionEnd.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionEnd.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionEnd.java Tue Sep 25 07:31:06 2007
@@ -40,7 +40,7 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension, SimplePageMaster)
+ * {@inheritDoc}
*/
public Rectangle getViewportRectangle (FODimension reldims, SimplePageMaster spm) {
/* Special rules apply to resolving extent as values are resolved relative
@@ -81,19 +81,19 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getDefaultRegionName()
+ * {@inheritDoc}
*/
protected String getDefaultRegionName() {
return "xsl-region-end";
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "region-end";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_REGION_END;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionSE.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionSE.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionSE.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionSE.java Tue Sep 25 07:31:06 2007
@@ -42,7 +42,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionStart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionStart.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionStart.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RegionStart.java Tue Sep 25 07:31:06 2007
@@ -40,7 +40,7 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getViewportRectangle(FODimension, SimplePageMaster)
+ * {@inheritDoc}
*/
public Rectangle getViewportRectangle (FODimension reldims, SimplePageMaster spm) {
/* Special rules apply to resolving extent as values are resolved relative
@@ -78,19 +78,19 @@
}
/**
- * @see org.apache.fop.fo.pagination.Region#getDefaultRegionName()
+ * {@inheritDoc}
*/
protected String getDefaultRegionName() {
return "xsl-region-start";
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "region-start";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_REGION_START;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java Tue Sep 25 07:31:06 2007
@@ -58,14 +58,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
maximumRepeats = pList.get(PR_MAXIMUM_REPEATS);
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
conditionalPageMasterRefs = new java.util.ArrayList();
@@ -81,16 +81,16 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null) {
+ if (firstChild == null) {
missingChildElementError("(conditional-page-master-reference+)");
}
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL/FOP: (conditional-page-master-reference+)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -157,12 +157,12 @@
}
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#reset() */
+ /** {@inheritDoc} */
public void reset() {
this.numberConsumed = 0;
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#goToPrevious() */
+ /** {@inheritDoc} */
public boolean goToPrevious() {
if (numberConsumed == 0) {
return false;
@@ -172,17 +172,17 @@
}
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#hasPagePositionLast() */
+ /** {@inheritDoc} */
public boolean hasPagePositionLast() {
return this.hasPagePositionLast;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "repeatable-page-master-alternatives";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java Tue Sep 25 07:31:06 2007
@@ -54,7 +54,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
masterReference = pList.get(PR_MASTER_REFERENCE).getString();
@@ -66,7 +66,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
PageSequenceMaster pageSequenceMaster = (PageSequenceMaster) parent;
@@ -79,7 +79,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -88,7 +88,7 @@
}
/**
- * @see org.apache.fop.fo.pagination.SubSequenceSpecifier
+ * {@inheritDoc}
*/
public String getNextPageMasterName(boolean isOddPage,
boolean isFirstPage,
@@ -119,13 +119,13 @@
}
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#reset() */
+ /** {@inheritDoc} */
public void reset() {
this.numberConsumed = 0;
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#goToPrevious() */
+ /** {@inheritDoc} */
public boolean goToPrevious() {
if (numberConsumed == 0) {
return false;
@@ -135,17 +135,17 @@
}
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#hasPagePositionLast() */
+ /** {@inheritDoc} */
public boolean hasPagePositionLast() {
return false;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "repeatable-page-master-reference";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_REPEATABLE_PAGE_MASTER_REFERENCE;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Root.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Root.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Root.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Root.java Tue Sep 25 07:31:06 2007
@@ -73,7 +73,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
mediaUsage = pList.get(PR_MEDIA_USAGE).getEnum();
@@ -90,7 +90,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL 1.0 Spec: (layout-master-set,declarations?,page-sequence+)
FOP: (layout-master-set, declarations?, fox:bookmarks?, page-sequence+)
*/
@@ -281,19 +281,19 @@
}
/**
- * @see org.apache.fop.fo.FONode#getRoot()
+ * {@inheritDoc}
*/
public Root getRoot() {
return this;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "root";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_ROOT;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SideRegion.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SideRegion.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SideRegion.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SideRegion.java Tue Sep 25 07:31:06 2007
@@ -36,7 +36,7 @@
super(parent);
}
- /** @see org.apache.fop.fo.FObj#bind(PropertyList) */
+ /** {@inheritDoc} */
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
extent = pList.get(PR_EXTENT).getLength();
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Tue Sep 25 07:31:06 2007
@@ -70,7 +70,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
commonMarginBlock = pList.getMarginBlockProps();
@@ -86,7 +86,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
LayoutMasterSet layoutMasterSet = (LayoutMasterSet) parent;
@@ -103,7 +103,6 @@
/**
* Make sure content model satisfied.
- * @see org.apache.fop.fo.FONode#endOfNode
*/
protected void endOfNode() throws FOPException {
if (!hasRegionBody) {
@@ -113,7 +112,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (region-body,region-before?,region-after?,region-start?,region-end?)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -174,14 +173,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#generatesReferenceAreas()
+ * {@inheritDoc}
*/
public boolean generatesReferenceAreas() {
return true;
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
protected void addChildNode(FONode child) throws FOPException {
if (child instanceof Region) {
@@ -264,13 +263,13 @@
return referenceOrientation.getValue();
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "simple-page-master";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_SIMPLE_PAGE_MASTER;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java Tue Sep 25 07:31:06 2007
@@ -54,7 +54,7 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
masterReference = pList.get(PR_MASTER_REFERENCE).getString();
@@ -65,7 +65,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
PageSequenceMaster pageSequenceMaster = (PageSequenceMaster) parent;
@@ -73,7 +73,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -81,7 +81,7 @@
invalidChildError(loc, nsURI, localName);
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier */
+ /** {@inheritDoc} */
public String getNextPageMasterName(boolean isOddPage,
boolean isFirstPage,
boolean isLastPage,
@@ -94,14 +94,14 @@
}
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#reset() */
+ /** {@inheritDoc} */
public void reset() {
this.state = FIRST;
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#goToPrevious() */
+ /** {@inheritDoc} */
public boolean goToPrevious() {
if (state == FIRST) {
return false;
@@ -111,17 +111,17 @@
}
}
- /** @see org.apache.fop.fo.pagination.SubSequenceSpecifier#hasPagePositionLast() */
+ /** {@inheritDoc} */
public boolean hasPagePositionLast() {
return false;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "single-page-master-reference";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_SINGLE_PAGE_MASTER_REFERENCE;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/StaticContent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/StaticContent.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/StaticContent.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/StaticContent.java Tue Sep 25 07:31:06 2007
@@ -39,7 +39,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#startOfNode()
+ * {@inheritDoc}
*/
protected void startOfNode() throws FOPException {
if (getFlowName() == null || getFlowName().equals("")) {
@@ -52,17 +52,17 @@
/**
* Make sure content model satisfied, if so then tell the
* FOEventHandler that we are at the end of the flow.
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
- if (childNodes == null && getUserAgent().validateStrictly()) {
+ if (firstChild == null && getUserAgent().validateStrictly()) {
missingChildElementError("(%block;)+");
}
getFOEventHandler().endFlow(this);
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
* XSL Content Model: (%block;)+
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -72,12 +72,12 @@
}
}
- /** @see org.apache.fop.fo.FObj#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "static-content";
}
- /** @see org.apache.fop.fo.FObj#getNameId() */
+ /** {@inheritDoc} */
public int getNameId() {
return FO_STATIC_CONTENT;
}
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Title.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Title.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Title.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/Title.java Tue Sep 25 07:31:06 2007
@@ -42,7 +42,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc} String, String)
XSL/FOP: (#PCDATA|%inline;)*
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -53,14 +53,14 @@
}
/**
- * @see org.apache.fop.fo.FObj#getName()
+ * {@inheritDoc}
*/
public String getLocalName() {
return "title";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_TITLE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java Tue Sep 25 07:31:06 2007
@@ -26,7 +26,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.ValidationException;
-import org.apache.fop.fo.properties.CommonAccessibility;
/**
@@ -39,10 +38,13 @@
private ArrayList childBookmarks = new ArrayList();
// The value of properties relevant for this FO
- private CommonAccessibility commonAccessibility;
private String internalDestination;
private String externalDestination;
private boolean bShow = true; // from starting-state property
+
+ // Valid, but unused properties. Commented out for performance
+ // private CommonAccessibility commonAccessibility;
+
/**
* Create a new bookmark object.
@@ -54,10 +56,9 @@
}
/**
- * @see org.apache.fop.fo.FObj#bind(PropertyList)
+ * {@inheritDoc}
*/
public void bind(PropertyList pList) throws FOPException {
- commonAccessibility = pList.getAccessibilityProps();
externalDestination = pList.get(PR_EXTERNAL_DESTINATION).getString();
internalDestination = pList.get(PR_INTERNAL_DESTINATION).getString();
bShow = (pList.get(PR_STARTING_STATE).getEnum() == EN_SHOW);
@@ -75,7 +76,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL/FOP: (bookmark-title, bookmark*)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -94,7 +95,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (bookmarkTitle == null) {
@@ -103,7 +104,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
protected void addChildNode(FONode obj) {
if (obj instanceof BookmarkTitle) {
@@ -144,13 +145,13 @@
return childBookmarks;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "bookmark";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_BOOKMARK;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java Tue Sep 25 07:31:06 2007
@@ -60,7 +60,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL/FOP: empty
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -77,13 +77,13 @@
return title;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "bookmark-title";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_BOOKMARK_TITLE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java Tue Sep 25 07:31:06 2007
@@ -46,7 +46,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#addChildNode(FONode)
+ * {@inheritDoc}
*/
protected void addChildNode(FONode obj) {
if (obj instanceof Bookmark) {
@@ -55,7 +55,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#endOfNode
+ * {@inheritDoc}
*/
protected void endOfNode() throws FOPException {
if (bookmarks == null) {
@@ -65,7 +65,7 @@
}
/**
- * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * {@inheritDoc}
XSL/FOP: (bookmark+)
*/
protected void validateChildNode(Locator loc, String nsURI, String localName)
@@ -80,13 +80,13 @@
return bookmarks;
}
- /** @see org.apache.fop.fo.FONode#getLocalName() */
+ /** {@inheritDoc} */
public String getLocalName() {
return "bookmark-tree";
}
/**
- * @see org.apache.fop.fo.FObj#getNameId()
+ * {@inheritDoc}
*/
public int getNameId() {
return FO_BOOKMARK_TREE;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java Tue Sep 25 07:31:06 2007
@@ -31,7 +31,7 @@
public class BackgroundPositionShorthandParser extends GenericShorthandParser {
/**
- * @see org.apache.fop.fo.properties.ShorthandParser#getValueForProperty(int, Property, PropertyMaker, PropertyList)
+ * {@inheritDoc}
*/
public Property getValueForProperty(int propId,
Property property,
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java Tue Sep 25 07:31:06 2007
@@ -50,7 +50,7 @@
/**
* Check the value of the style property and return a length of 0 when
* the style is NONE.
- * @see org.apache.fop.fo.properties.PropertyMaker#get(int, PropertyList, boolean, boolean)
+ * {@inheritDoc}
*/
public Property get(int subpropId, PropertyList propertyList,
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java?rev=579260&r1=579259&r2=579260&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java Tue Sep 25 07:31:06 2007
@@ -38,7 +38,7 @@
* Stores 1 to 4 values of same type.
* Set the given property based on the number of values set.
* Example: padding, border-width, border-color, border-style, margin
- * @see org.apache.fop.fo.properties.GenericShorthandParser#convertValueForProperty(
+ * {@inheritDoc}
* int, Property, PropertyMaker, PropertyList)
*/
protected Property convertValueForProperty(int propId,
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org