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 je...@apache.org on 2008/07/25 14:46:22 UTC
svn commit: r679781 [9/34] - in
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign: ./
examples/embedding/java/embedding/ examples/embedding/java/embedding/events/
examples/embedding/java/embedding/intermediate/
examples/embedding/java/embedding/model/ e...
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/EffRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/EffRow.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/EffRow.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/EffRow.java Fri Jul 25 05:44:20 2008
@@ -34,19 +34,19 @@
* the row as well as some additional values.
*/
public class EffRow {
-
+
/** Indicates that the row is the first in a table-body */
public static final int FIRST_IN_PART = GridUnit.FIRST_IN_PART;
/** Indicates that the row is the last in a table-body */
public static final int LAST_IN_PART = GridUnit.LAST_IN_PART;
-
+
private List gridUnits = new java.util.ArrayList();
private int index;
/** One of HEADER, FOOTER, BODY */
private int bodyType;
private MinOptMax height;
private MinOptMax explicitHeight;
-
+
/**
* Creates a new effective row instance.
* @param index index of the row
@@ -70,45 +70,45 @@
public int getIndex() {
return this.index;
}
-
+
/**
- * @return an indicator what type of body this EffRow is in (one of HEADER, FOOTER, BODY
+ * @return an indicator what type of body this EffRow is in (one of HEADER, FOOTER, BODY
* as found on TableRowIterator)
*/
public int getBodyType() {
return this.bodyType;
}
-
+
/** @return the table-row FO for this EffRow, or null if there is no table-row. */
public TableRow getTableRow() {
return getGridUnit(0).getRow();
}
-
+
/**
* Returns the calculated height for this EffRow, including the cells'
* bpds/paddings/borders, and the table's border-separation.
- *
+ *
* @return the row's height
*/
public MinOptMax getHeight() {
return this.height;
}
-
+
/**
* Sets the calculated height for this EffRow, including everything (cells' bpds,
* paddings, borders, and border-separation).
- *
+ *
* @param mom the calculated height
*/
public void setHeight(MinOptMax mom) {
this.height = mom;
}
-
+
/** @return the explicit height of the EffRow (as specified through properties) */
public MinOptMax getExplicitHeight() {
return this.explicitHeight;
}
-
+
/**
* Sets the height for this row that resulted from the explicit height properties specified
* by the user.
@@ -117,12 +117,12 @@
public void setExplicitHeight(MinOptMax mom) {
this.explicitHeight = mom;
}
-
+
/** @return the list of GridUnits for this EffRow */
public List getGridUnits() {
return gridUnits;
}
-
+
/**
* Returns the grid unit at a given position.
* @param column index of the grid unit in the row (zero based)
@@ -131,9 +131,9 @@
public GridUnit getGridUnit(int column) {
return (GridUnit)gridUnits.get(column);
}
-
+
/**
- * Returns the grid unit at a given position. In contrast to getGridUnit() this
+ * Returns the grid unit at a given position. In contrast to getGridUnit() this
* method returns null if there's no grid unit at the given position. The number of
* grid units for row x can be smaller than the number of grid units for row x-1.
* @param column index of the grid unit in the row (zero based)
@@ -167,7 +167,7 @@
/**
* Returns the strength of the keep constraint if the enclosing (if any) fo:table-row element
* of this row, or if any of the cells starting on this row, have keep-with-previous set.
- *
+ *
* @return the strength of the keep-with-previous constraint
*/
public int getKeepWithPreviousStrength() {
@@ -189,7 +189,7 @@
/**
* Returns the strength of the keep constraint if the enclosing (if any) fo:table-row element
* of this row, or if any of the cells ending on this row, have keep-with-next set.
- *
+ *
* @return the strength of the keep-with-next constraint
*/
public int getKeepWithNextStrength() {
@@ -224,7 +224,7 @@
}
return strength;
}
-
+
/**
* Returns the break class for this row. This is a combination of break-before set on
* the first children of any cells starting on this row.
@@ -233,7 +233,7 @@
* belongs to a group of spanned rows (see XSL-FO 1.1, 7.20.2).
* <p><strong>Note:</strong> this works only after getNextKuthElements on the
* corresponding TableCellLM have been called!</p>
- *
+ *
* @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN}, {@link
* Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, {@link Constants#EN_ODD_PAGE}
*/
@@ -257,7 +257,7 @@
* belongs to a group of spanned rows (see XSL-FO 1.1, 7.20.1).
* <p><strong>Note:</strong> this works only after getNextKuthElements on the
* corresponding TableCellLM have been called!</p>
- *
+ *
* @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN}, {@link
* Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, {@link Constants#EN_ODD_PAGE}
*/
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/GridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/GridUnit.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/GridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/GridUnit.java Fri Jul 25 05:44:20 2008
@@ -78,7 +78,7 @@
/**
* Creates a new grid unit.
- *
+ *
* @param table the containing table
* @param colSpanIndex index of this grid unit in the span, in column direction
* @param rowSpanIndex index of this grid unit in the span, in row direction
@@ -90,7 +90,7 @@
/**
* Creates a new grid unit.
- *
+ *
* @param cell table cell which occupies this grid unit
* @param colSpanIndex index of this grid unit in the span, in column direction
* @param rowSpanIndex index of this grid unit in the span, in row direction
@@ -103,7 +103,7 @@
/**
* Creates a new grid unit.
- *
+ *
* @param primary the before-start grid unit of the cell containing this grid unit
* @param colSpanIndex index of this grid unit in the span, in column direction
* @param rowSpanIndex index of this grid unit in the span, in row direction
@@ -161,7 +161,7 @@
/**
* Returns the fo:table-row element (if any) this grid unit belongs to.
- *
+ *
* @return the row containing this grid unit, or null if there is no fo:table-row
* element in the corresponding table-part
*/
@@ -175,7 +175,7 @@
/**
* Returns the before-start grid unit of the cell containing this grid unit.
- *
+ *
* @return the before-start grid unit of the cell containing this grid unit.
*/
public PrimaryGridUnit getPrimary() {
@@ -184,7 +184,7 @@
/**
* Is this grid unit the before-start grid unit of the cell?
- *
+ *
* @return true if this grid unit is the before-start grid unit of the cell
*/
public boolean isPrimary() {
@@ -193,7 +193,7 @@
/**
* Does this grid unit belong to an empty cell?
- *
+ *
* @return true if this grid unit belongs to an empty cell
*/
public boolean isEmpty() {
@@ -227,7 +227,7 @@
/**
* Returns the resolved border-before of this grid unit, in the collapsing-border
* model.
- *
+ *
* @param which one of {@link ConditionalBorder#NORMAL},
* {@link ConditionalBorder#LEADING_TRAILING} or {@link ConditionalBorder#REST}
* @return the corresponding border
@@ -249,7 +249,7 @@
/**
* Returns the resolved border-after of this grid unit, in the collapsing-border
* model.
- *
+ *
* @param which one of {@link ConditionalBorder#NORMAL},
* {@link ConditionalBorder#LEADING_TRAILING} or {@link ConditionalBorder#REST}
* @return the corresponding border
@@ -271,7 +271,7 @@
/**
* Returns the resolved border-start of this grid unit, in the collapsing-border
* model.
- *
+ *
* @return the corresponding border
*/
public BorderInfo getBorderStart() {
@@ -281,7 +281,7 @@
/**
* Returns the resolved border-end of this grid unit, in the collapsing-border
* model.
- *
+ *
* @return the corresponding border
*/
public BorderInfo getBorderEnd() {
@@ -291,7 +291,7 @@
/**
* Resolve collapsing borders for the given cell. Used in case of the collapsing
* border model.
- *
+ *
* @param other neighbouring grid unit
* @param side the side to resolve (one of
* CommonBorderPaddingBackground.BEFORE|AFTER|START|END)
@@ -327,7 +327,7 @@
/**
* For the given side, integrates in the conflict resolution the border segment of the
* given parent element.
- *
+ *
* @param side the side to consider (either CommonBorderPaddingBackground.BEFORE or
* AFTER)
* @param parent a table element whose corresponding border coincides on the given
@@ -351,7 +351,7 @@
/**
* For the given side, integrates in the conflict resolution the border segment of the
* given parent element.
- *
+ *
* @param side the side to consider (one of
* CommonBorderPaddingBackground.BEFORE|AFTER|START|END)
* @param parent a table element whose corresponding border coincides on the given side
@@ -376,7 +376,7 @@
/**
* For the given side, integrates in the conflict resolution the given border segment.
- *
+ *
* @param side the side to consider (one of CommonBorderPaddingBackground.START|END)
* @param segment a border specification to integrate at the given side
*/
@@ -409,7 +409,7 @@
/**
* Returns a flag for this GridUnit.
- *
+ *
* @param which the requested flag
* @return the value of the flag
*/
@@ -419,7 +419,7 @@
/**
* Sets a flag on a GridUnit.
- *
+ *
* @param which the flag to set
* @param value the new value for the flag
*/
@@ -433,7 +433,7 @@
/**
* Sets the given flag on this grid unit.
- *
+ *
* @param which the flag to set
*/
public void setFlag(int which) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PendingSpan.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PendingSpan.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PendingSpan.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
/**
* Constructor
- *
+ *
* @param rows number of rows spanned
*/
public PendingSpan(int rows) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java Fri Jul 25 05:44:20 2008
@@ -75,7 +75,7 @@
/**
* Returns the fo:table-header/footer/body element containing this cell.
- *
+ *
* @return the enclosing table part
*/
public TablePart getTablePart() {
@@ -119,7 +119,7 @@
* border model the border-separation is included. In the collapsing model only half
* of them is counted, since the other halves belong to the neighbouring cells; also,
* the returned value is the maximum of the segments of each applicable grid unit.
- *
+ *
* @return the sum of the before and after border widths
*/
public int getBeforeAfterBorderWidth() {
@@ -133,7 +133,7 @@
* model only half of the border is counted, since the other half belongs to the
* preceding cell; also, the returned value is the maximum of the segments of each
* applicable grid unit.
- *
+ *
* @param rowIndex index of the span for which the border must be computed, 0-based
* @param which one of {@link ConditionalBorder#NORMAL},
* {@link ConditionalBorder#LEADING_TRAILING} or {@link ConditionalBorder#REST}
@@ -179,7 +179,7 @@
* model only half of the border is counted, since the other half belongs to the
* following cell; also, the returned value is the maximum of the segments of each
* applicable grid unit.
- *
+ *
* @param rowIndex index of the span for which the border must be computed, 0-based
* @param which one of {@link ConditionalBorder#NORMAL},
* {@link ConditionalBorder#LEADING_TRAILING} or {@link ConditionalBorder#REST}
@@ -222,7 +222,7 @@
/**
* Returns the width of the before-after for the last row-span of this cell. See
* {@link #getAfterBorderWidth(int, int)}.
- *
+ *
* @param which one of {@link ConditionalBorder#NORMAL},
* {@link ConditionalBorder#LEADING_TRAILING} or {@link ConditionalBorder#REST}
* @return the after border width
@@ -264,7 +264,7 @@
* enclosing table part, of the first row spanned by the cell. Note that if the table
* has several table-body children, then the index grows continuously across them;
* they are considered to form one single part, the "body of the table".
- *
+ *
* @return the index of the row this grid unit belongs to, 0-based.
*/
public int getRowIndex() {
@@ -273,7 +273,7 @@
/**
* Returns the index of the column this grid unit belongs to.
- *
+ *
* @return the column index, 0-based
*/
public int getColIndex() {
@@ -331,7 +331,7 @@
/**
* Returns the strength of the keep constraint if the first child block (or its descendants)
* of this cell has keep-with-previous.
- *
+ *
* @return the keep-with-previous strength
*/
public int getKeepWithPreviousStrength() {
@@ -349,7 +349,7 @@
/**
* Returns the strength of the keep constraint if the last child block (or its descendants) of
* this cell has keep-with-next.
- *
+ *
* @return the keep-with-next strength
*/
public int getKeepWithNextStrength() {
@@ -366,7 +366,7 @@
/**
* Returns the class of the before break for the first child element of this cell.
- *
+ *
* @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN}, {@link
* Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, {@link Constants#EN_ODD_PAGE}
*/
@@ -376,7 +376,7 @@
/**
* Don't use, reserved for TableCellLM. TODO
- *
+ *
* @param breakBefore the breakBefore to set
*/
public void setBreakBefore(int breakBefore) {
@@ -385,7 +385,7 @@
/**
* Returns the class of the before after for the last child element of this cell.
- *
+ *
* @return one of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN}, {@link
* Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE}, {@link Constants#EN_ODD_PAGE}
*/
@@ -395,7 +395,7 @@
/**
* Don't use, reserved for TableCellLM. TODO
- *
+ *
* @param breakAfter the breakAfter to set
*/
public void setBreakAfter(int breakAfter) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@
/**
* Creates and initialises a new builder for the given table.
- *
+ *
* @param t a table
*/
protected RowGroupBuilder(Table t) {
@@ -43,14 +43,14 @@
/**
* Adds a table-cell to the current row-group, creating {@link GridUnit}s accordingly.
- *
+ *
* @param cell the cell to add
*/
abstract void addTableCell(TableCell cell);
/**
* Receives notification of the start of an fo:table-row element.
- *
+ *
* @param tableRow the row being started
*/
abstract void startTableRow(TableRow tableRow);
@@ -66,17 +66,17 @@
* Receives notification of the end of the current row, when the source contains no
* fo:table-row element. If the current row finishes the row group, the
* {@link TablePart#addRowGroup(List)} method of the given table part will be called.
- *
+ *
* <p>If the source does contain explicit fo:table-row elements, then the
* {@link #endTableRow()} method will be called instead.</p>
- *
+ *
* @param part the part containing the current row
*/
abstract void endRow(TablePart part);
/**
* Receives notification of the start of a table-header/footer/body.
- *
+ *
* @param part the part being started
*/
abstract void startTablePart(TablePart part);
@@ -85,14 +85,14 @@
* Receives notification of the end of a table-header/footer/body. The current
* row-group is checked for emptiness. This row group builder is reset for handling
* further possible table parts.
- *
+ *
* @throws ValidationException if a row-spanning cell overflows the given table part
*/
abstract void endTablePart() throws ValidationException;
/**
* Receives notification of the end of the table.
- *
+ *
* @throws ValidationException if a row-spanning cell overflows one of the table's parts
*/
abstract void endTable() throws ValidationException;
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/SeparateBorderResolver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/SeparateBorderResolver.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/SeparateBorderResolver.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/SeparateBorderResolver.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/Table.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -224,7 +224,7 @@
/** {@inheritDoc} */
public void finalizeNode() throws FOPException {
-
+
if (!tableBodyFound) {
missingChildElementError(
"(marker*,table-column*,table-header?,table-footer?"
@@ -246,9 +246,9 @@
this.propList = null;
rowGroupBuilder = null;
}
-
+
}
-
+
/** {@inheritDoc} */
protected void addChildNode(FONode child) throws FOPException {
@@ -274,7 +274,7 @@
} else {
rowGroupBuilder = new VariableColRowGroupBuilder(this);
}
-
+
}
switch (childId) {
case FO_TABLE_FOOTER:
@@ -309,7 +309,7 @@
* Creates the appropriate number of additional implicit columns to match the given
* column number. Used when the table has no explicit column: the number of columns is
* then determined by the row that has the most columns.
- *
+ *
* @param columnNumber the table must at least have this number of column
* @throws FOPException if there was an error creating the property list for implicit
* columns
@@ -339,7 +339,7 @@
/**
* Adds a column to the columns List, and updates the columnIndex
* used for determining initial values for column-number
- *
+ *
* @param col the column to add
*/
private void addColumnNode(TableColumn col) {
@@ -385,7 +385,7 @@
/**
* Returns the column at the given index.
- *
+ *
* @param index index of the column to be retrieved, 0-based
* @return the corresponding column (may be an implicitly created column)
*/
@@ -395,7 +395,7 @@
/**
* Returns the number of columns of this table.
- *
+ *
* @return the number of columns, implicit or explicit, in this table
*/
public int getNumberOfColumns() {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
// private KeepProperty keepWithPrevious;
// private int textAlign;
// End of property values
-
+
static boolean notImplementedWarningGiven = false;
/** used for FO validation */
@@ -86,7 +86,7 @@
* {@inheritDoc}
* <br>XSL Content Model: marker* table-caption? table
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableBody.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableBody.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableBody.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCaption.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCaption.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCaption.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCaption.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -82,7 +82,7 @@
* {@inheritDoc}
* <br>XSL Content Model: marker* (%block;)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("marker")) {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCell.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCell.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCell.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCell.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -108,7 +108,7 @@
/** {@inheritDoc} */
public void finalizeNode() throws FOPException {
-
+
if (!blockItemFound) {
missingChildElementError("marker* (%block;)+", true);
}
@@ -118,9 +118,9 @@
getUserAgent().getEventBroadcaster());
eventProducer.startEndRowUnderTableRowWarning(this, getLocator());
}
-
+
}
-
+
/**
* {@inheritDoc}
* <br>XSL Content Model: marker* (%block;)+
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -94,7 +94,7 @@
/**
* Returns the enclosing table-header/footer/body of this container.
- *
+ *
* @return <code>this</code> for TablePart, or the parent element for TableRow
*/
abstract TablePart getTablePart();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableColumn.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableColumn.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableColumn.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableColumn.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableEventProducer.java Fri Jul 25 05:44:20 2008
@@ -33,7 +33,7 @@
/** Provider class for the event producer. */
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -83,7 +83,7 @@
*/
void footerOrderCannotRecover(Object source, String elementName, Locator loc)
throws ValidationException;
-
+
/**
* starts-row/ends-row for fo:table-cells non-applicable for children of an fo:table-row
* @param source the event source
@@ -93,7 +93,7 @@
void startEndRowUnderTableRowWarning(Object source, Locator loc);
/**
- * Column-number or number of cells in the row overflows the number of fo:table-column
+ * Column-number or number of cells in the row overflows the number of fo:table-column
* specified for the table.
* @param source the event source
* @param loc the location of the error or null
@@ -166,5 +166,5 @@
void breakIgnoredDueToRowSpanning(Object source, String elementName, boolean breakBefore,
Locator loc);
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFObj.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFObj.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFObj.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -234,7 +234,7 @@
setCollapsedBorders();
}
}
-
+
/**
* Prepares the borders of this element if the collapsing-border model is in use.
* Conflict resolution with parent elements is done where applicable.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFooter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFooter.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFooter.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableFooter.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableHeader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableHeader.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableHeader.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableHeader.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TablePart.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TablePart.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TablePart.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TablePart.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -79,7 +79,7 @@
public void processNode(String elementName, Locator locator,
Attributes attlist, PropertyList pList)
throws FOPException {
-
+
super.processNode(elementName, locator, attlist, pList);
if (!inMarker()) {
Table t = getTable();
@@ -94,7 +94,7 @@
}
columnNumberManager = new ColumnNumberManager();
}
-
+
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/TableRow.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -118,7 +118,7 @@
columnNumberManager = null;
}
}
-
+
/**
* {@inheritDoc} String, String)
* <br>XSL Content Model: (table-cell+)
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@
private static interface Event {
/**
* Plays this event
- *
+ *
* @param rowGroupBuilder the delegate builder which will actually create the row
* groups
* @throws ValidationException if a row-spanning cell overflows its parent body
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/AbstractPageSequence.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
* <code>fox:external-document</code></a> extension object.
*/
public abstract class AbstractPageSequence extends FObj {
-
+
// The value of properties relevant for fo:page-sequence.
protected Numeric initialPageNumber;
protected int forcePageCount;
@@ -81,7 +81,7 @@
*/
public void initPageNumber() {
int pageNumberType = 0;
-
+
if (initialPageNumber.getEnum() != 0) {
// auto | auto-odd | auto-even.
startingPageNumber = getRoot().getEndingPageNumberOfPreviousSequence() + 1;
@@ -143,7 +143,7 @@
public Numeric getInitialPageNumber() {
return initialPageNumber;
}
-
+
/**
* Get the value of the <code>reference-orientation</code> property.
* @return the "reference-orientation" property
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ColorProfile.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ColorProfile.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ColorProfile.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ColorProfile.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,7 +60,7 @@
* {@inheritDoc}
* <br>XSL 1.0/FOP: EMPTY (no child nodes permitted)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
invalidChildError(loc, nsURI, localName);
@@ -78,7 +78,7 @@
public String getLocalName() {
return "color-profile";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_COLOR_PROFILE}
@@ -86,26 +86,26 @@
public int getNameId() {
return FO_COLOR_PROFILE;
}
-
- /**
+
+ /**
* Get src attribute
- *
+ *
* @return value of color-profile src attribute
*/
public String getSrc() {
return this.src;
}
-
+
/**
* Get rendering-intent attribute
- *
+ *
* Returned value is one of
* Constants.EN_AUTO
* Constants.EN_PERCEPTUAL
* Constants.EN_RELATIVE_COLOMETRIC
* Constants.EN_SATURATION
* Constants.EN_ABSOLUTE_COLORMETRIC
- *
+ *
* @return Rendering intent attribute
*/
public int getRenderingIntent() {
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
/**
* Class modelling the <a href="http://www.w3.org/TR/xsl/#fo_conditional-page-master-reference">
* <code>fo:conditional-page-master-reference</code></a> object.
- *
+ *
* This is a reference to a page master with a set of conditions.
* The conditions must be satisfied for the referenced master to
* be used.
@@ -45,7 +45,7 @@
private int oddOrEven;
private int blankOrNotBlank;
// End of property values
-
+
/**
* Create a ConditionalPageMasterReference instance that is a
* child of the given {@link FONode}.
@@ -65,7 +65,7 @@
if (masterReference == null || masterReference.equals("")) {
missingPropertyError("master-reference");
- }
+ }
}
/** {@inheritDoc} */
@@ -76,12 +76,12 @@
private RepeatablePageMasterAlternatives getConcreteParent() {
return (RepeatablePageMasterAlternatives) parent;
}
-
+
/**
* {@inheritDoc}
* <br>XSL Content Model: empty
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
invalidChildError(loc, nsURI, localName);
}
@@ -158,7 +158,7 @@
public String getMasterReference() {
return masterReference;
}
-
+
/**
* Get the value for the <code>page-position</code> property.
* @return the page-position property value
@@ -166,12 +166,12 @@
public int getPagePosition() {
return this.pagePosition;
}
-
+
/** {@inheritDoc} */
public String getLocalName() {
return "conditional-page-master-reference";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_CONDITIONAL_PAGE_MASTER_REFERENCE}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Declarations.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Declarations.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Declarations.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Declarations.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -61,7 +61,7 @@
* <br>XSL 1.0: (color-profile)+ (and non-XSL NS nodes)
* <br>FOP/XSL 1.1: (color-profile)* (and non-XSL NS nodes)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (!localName.equals("color-profile")) {
@@ -88,7 +88,7 @@
cp.getName(), "color-profile-name", locator);
}
} else {
- log.debug("Ignoring element " + node.getName()
+ log.debug("Ignoring element " + node.getName()
+ " inside fo:declarations.");
}
}
@@ -112,7 +112,7 @@
public String getLocalName() {
return "declarations";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_DECLARATIONS}
@@ -120,13 +120,13 @@
public int getNameId() {
return FO_DECLARATIONS;
}
-
+
/**
* Return ColorProfile with given name.
- *
- * @param cpName Name of ColorProfile, i.e. the value of the color-profile-name attribute of
+ *
+ * @param cpName Name of ColorProfile, i.e. the value of the color-profile-name attribute of
* the fo:color-profile element
- * @return The org.apache.fop.fo.pagination.ColorProfile object associated with this
+ * @return The org.apache.fop.fo.pagination.ColorProfile object associated with this
* color-profile-name or null
*/
public ColorProfile getColorProfile(String cpName) {
@@ -136,6 +136,6 @@
}
return profile;
}
-
-
+
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Flow.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Flow.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Flow.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Flow.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
// The value of properties relevant for fo:flow.
private String flowName;
// End of property values
-
+
/** used for FO validation */
private boolean blockItemFound = false;
@@ -53,7 +53,7 @@
super.bind(pList);
flowName = pList.get(PR_FLOW_NAME).getString();
}
-
+
/** {@inheritDoc} */
protected void startOfNode() throws FOPException {
if (flowName == null || flowName.equals("")) {
@@ -92,7 +92,7 @@
* {@inheritDoc}
* <br>XSL Content Model: marker* (%block;)+
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("marker")) {
@@ -124,7 +124,7 @@
public String getLocalName() {
return "flow";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_FLOW}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -81,11 +81,11 @@
* {@inheritDoc}
* <br>XSL/FOP: (simple-page-master|page-sequence-master)+
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
- if (!localName.equals("simple-page-master")
- && !localName.equals("page-sequence-master")) {
+ if (!localName.equals("simple-page-master")
+ && !localName.equals("page-sequence-master")) {
invalidChildError(loc, nsURI, localName);
}
}
@@ -207,7 +207,7 @@
public String getLocalName() {
return "layout-master-set";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_LAYOUT_MASTER_SET}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.fo.pagination;
/**
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageProductionException.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageProductionException.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageProductionException.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageProductionException.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
private String localizedMessage;
private Locator locator;
-
+
/**
* Creates a new PageProductionException.
* @param message the message
@@ -47,7 +47,7 @@
super(message);
setLocator(locator);
}
-
+
/**
* Set a location associated with the exception.
* @param locator the locator holding the location.
@@ -64,7 +64,7 @@
public Locator getLocator() {
return this.locator;
}
-
+
/**
* Sets the localized message for this exception.
* @param msg the localized message
@@ -81,7 +81,7 @@
return super.getLocalizedMessage();
}
}
-
+
/** Exception factory for {@link PageProductionException}. */
public static class PageProductionExceptionFactory implements ExceptionFactory {
@@ -96,11 +96,11 @@
}
return ex;
}
-
+
/** {@inheritDoc} */
public Class getExceptionClass() {
return PageProductionException.class;
}
-
- }
+
+ }
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequence.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequence.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@
* <code>fo:page-sequence</code></a> object.
*/
public class PageSequence extends AbstractPageSequence {
-
+
// The value of properties relevant for fo:page-sequence.
private String country;
private String language;
@@ -87,10 +87,10 @@
language = pList.get(PR_LANGUAGE).getString();
masterReference = pList.get(PR_MASTER_REFERENCE).getString();
//writingMode = pList.getWritingMode();
-
+
if (masterReference == null || masterReference.equals("")) {
missingPropertyError("master-reference");
- }
+ }
}
/** {@inheritDoc} */
@@ -124,7 +124,7 @@
* {@inheritDoc}
XSL Content Model: (title?,static-content*,flow)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (localName.equals("title")) {
@@ -138,7 +138,7 @@
} else if (localName.equals("static-content")) {
if (mainFlow != null) {
nodesOutOfOrderError(loc, "fo:static-content", "fo:flow");
- }
+ }
} else if (localName.equals("flow")) {
if (mainFlow != null) {
tooManyNodesError(loc, "fo:flow");
@@ -186,8 +186,8 @@
flowName, flow.getLocator());
}
- if (!getRoot().getLayoutMasterSet().regionNameExists(flowName)
- && !flowName.equals("xsl-before-float-separator")
+ if (!getRoot().getLayoutMasterSet().regionNameExists(flowName)
+ && !flowName.equals("xsl-before-float-separator")
&& !flowName.equals("xsl-footnote-separator")) {
getFOValidationEventProducer().flowNameNotMapped(this, flow.getName(),
flowName, flow.getLocator());
@@ -226,7 +226,7 @@
* Determine if this PageSequence already has a flow with the given flow-name
* Used for validation of incoming fo:flow or fo:static-content objects
* @param flowName The flow-name to search for
- * @return true if flow-name already defined within this page sequence,
+ * @return true if flow-name already defined within this page sequence,
* false otherwise
*/
public boolean hasFlowName(String flowName) {
@@ -237,7 +237,7 @@
public Map getFlowMap() {
return this.flowMap;
}
-
+
/**
* Public accessor for determining the next page master to use within this page sequence.
* @param page the page number of the page to be created
@@ -251,9 +251,9 @@
* @return the SimplePageMaster to use for this page
* @throws PageProductionException if there's a problem determining the page master
*/
- public SimplePageMaster getNextSimplePageMaster(int page,
- boolean isFirstPage,
- boolean isLastPage,
+ public SimplePageMaster getNextSimplePageMaster(int page,
+ boolean isFirstPage,
+ boolean isLastPage,
boolean isOnlyPage,
boolean isBlank) throws PageProductionException {
@@ -263,13 +263,13 @@
boolean isOddPage = ((page % 2) == 1);
if (log.isDebugEnabled()) {
log.debug("getNextSimplePageMaster(page=" + page
- + " isOdd=" + isOddPage
- + " isFirst=" + isFirstPage
+ + " isOdd=" + isOddPage
+ + " isFirst=" + isFirstPage
+ " isLast=" + isLastPage
+ " isOnly=" + isOnlyPage
+ " isBlank=" + isBlank + ")");
}
- return pageSequenceMaster.getNextSimplePageMaster(isOddPage,
+ return pageSequenceMaster.getNextSimplePageMaster(isOddPage,
isFirstPage, isLastPage, isOnlyPage, isBlank);
}
@@ -293,7 +293,7 @@
return pageSequenceMaster.hasPagePositionLast();
}
}
-
+
/** @return true if the page-sequence has a page-master with page-position="only" */
public boolean hasPagePositionOnly() {
if (pageSequenceMaster == null) {
@@ -302,7 +302,7 @@
return pageSequenceMaster.hasPagePositionOnly();
}
}
-
+
/**
* Get the value of the <code>master-reference</code> property.
* @return the "master-reference" property
@@ -323,7 +323,7 @@
public int getNameId() {
return FO_PAGE_SEQUENCE;
}
-
+
/**
* Get the value of the <code>country</code> property.
* @return the country property value
@@ -331,7 +331,7 @@
public String getCountry() {
return this.country;
}
-
+
/**
* Get the value of the <code>language</code> property.
* @return the language property value
@@ -347,5 +347,5 @@
this.mainFlow = null;
this.flowMap.clear();
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,7 +42,7 @@
// The value of properties relevant for fo:page-sequence-master.
private String masterName;
// End of property values
-
+
private LayoutMasterSet layoutMasterSet;
private List subSequenceSpecifiers;
private SubSequenceSpecifier currentSubSequence;
@@ -68,7 +68,7 @@
/** {@inheritDoc} */
public void bind(PropertyList pList) throws FOPException {
masterName = pList.get(PR_MASTER_NAME).getString();
-
+
if (masterName == null || masterName.equals("")) {
missingPropertyError("master-name");
}
@@ -80,7 +80,7 @@
layoutMasterSet = parent.getRoot().getLayoutMasterSet();
layoutMasterSet.addPageSequenceMaster(masterName, this);
}
-
+
/** {@inheritDoc} */
protected void endOfNode() throws FOPException {
if (firstChild == null) {
@@ -94,12 +94,12 @@
* <br>XSL/FOP: (single-page-master-reference|repeatable-page-master-reference|
* repeatable-page-master-alternatives)+
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
- if (!"single-page-master-reference".equals(localName)
+ if (!"single-page-master-reference".equals(localName)
&& !"repeatable-page-master-reference".equals(localName)
- && !"repeatable-page-master-alternatives".equals(localName)) {
+ && !"repeatable-page-master-alternatives".equals(localName)) {
invalidChildError(loc, nsURI, localName);
}
}
@@ -159,19 +159,19 @@
}
return (currentSubSequence != null);
}
-
+
/** @return true if the page-sequence-master has a page-master with page-position="last" */
public boolean hasPagePositionLast() {
return (currentSubSequence != null
&& currentSubSequence.hasPagePositionLast());
}
-
+
/** @return true if the page-sequence-master has a page-master with page-position="only" */
public boolean hasPagePositionOnly() {
return (currentSubSequence != null
&& currentSubSequence.hasPagePositionOnly());
}
-
+
/**
* Returns the next simple-page-master.
* @param isOddPage True if the next page number is odd
@@ -230,7 +230,7 @@
public String getLocalName() {
return "page-sequence-master";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_PAGE_SEQUENCE_MASTER}
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,7 +37,7 @@
private String indexClass;
private String indexKey;
// End of property values
-
+
/**
* Create a PageSequenceWrapper instance that is a child of
* the given parent {@link FONode}.
@@ -59,7 +59,7 @@
* {@inheritDoc}
* <br>XSL/FOP: (bookmark+)
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
if (!(localName.equals("page-sequence")
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Region.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Region.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Region.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/Region.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@
private Numeric referenceOrientation;
private int writingMode;
// End of property values
-
+
private SimplePageMaster layoutMaster;
/**
@@ -68,7 +68,7 @@
regionName = pList.get(PR_REGION_NAME).getString();
referenceOrientation = pList.get(PR_REFERENCE_ORIENTATION).getNumeric();
writingMode = pList.getWritingMode();
-
+
// regions may have name, or default
if (regionName.equals("")) {
regionName = getDefaultRegionName();
@@ -80,7 +80,7 @@
regionName, getLocator());
}
}
-
+
//TODO do we need context for getBPPaddingAndBorder() and getIPPaddingAndBorder()?
if ((getCommonBorderPaddingBackground().getBPPaddingAndBorder(false, null) != 0
|| getCommonBorderPaddingBackground().getIPPaddingAndBorder(false, null) != 0)) {
@@ -93,7 +93,7 @@
* {@inheritDoc} String, String)
* <br>XSL Content Model: empty
*/
- protected void validateChildNode(Locator loc, String nsURI, String localName)
+ protected void validateChildNode(Locator loc, String nsURI, String localName)
throws ValidationException {
if (FO_URI.equals(nsURI)) {
invalidChildError(loc, nsURI, localName);
@@ -149,7 +149,7 @@
* @return the Background Properties (border and padding are not used here).
*/
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
- return commonBorderPaddingBackground;
+ return commonBorderPaddingBackground;
}
/** @return the "region-name" property. */
@@ -166,12 +166,12 @@
public int getOverflow() {
return overflow;
}
-
+
/** @return the display-align property. */
public int getDisplayAlign() {
return displayAlign;
}
-
+
/** @return the "reference-orientation" property. */
public int getReferenceOrientation() {
return referenceOrientation.getValue();
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionAfter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionAfter.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionAfter.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionAfter.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,13 +45,13 @@
/** {@inheritDoc} */
public Rectangle getViewportRectangle (FODimension reldims, SimplePageMaster spm) {
- /* Special rules apply to resolving extent as values are resolved relative
+ /* Special rules apply to resolving extent as values are resolved relative
* to the page size and reference orientation.
*/
SimplePercentBaseContext pageWidthContext;
SimplePercentBaseContext pageHeightContext;
if (spm.getReferenceOrientation() % 180 == 0) {
- pageWidthContext = new SimplePercentBaseContext(null,
+ pageWidthContext = new SimplePercentBaseContext(null,
LengthBase.CUSTOM_BASE,
spm.getPageWidth().getValue());
pageHeightContext = new SimplePercentBaseContext(null,
@@ -59,7 +59,7 @@
spm.getPageHeight().getValue());
} else {
// invert width and height since top left are rotated by 90 (cl or ccl)
- pageWidthContext = new SimplePercentBaseContext(null,
+ pageWidthContext = new SimplePercentBaseContext(null,
LengthBase.CUSTOM_BASE,
spm.getPageHeight().getValue());
pageHeightContext = new SimplePercentBaseContext(null,
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBA.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBA.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBA.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBA.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,7 +36,7 @@
// The value of properties relevant for fo:region-[before|after].
private int precedence;
// End of property values
-
+
/**
* Create a RegionBA instance that is a child of the
* given parent {@link FONode}.
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBefore.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBefore.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBefore.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBefore.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,13 +50,13 @@
/** {@inheritDoc} */
public Rectangle getViewportRectangle (FODimension reldims, SimplePageMaster spm) {
- /* Special rules apply to resolving extent as values are resolved relative
+ /* Special rules apply to resolving extent as values are resolved relative
* to the page size and reference orientation.
*/
SimplePercentBaseContext pageWidthContext;
SimplePercentBaseContext pageHeightContext;
if (spm.getReferenceOrientation() % 180 == 0) {
- pageWidthContext = new SimplePercentBaseContext(null,
+ pageWidthContext = new SimplePercentBaseContext(null,
LengthBase.CUSTOM_BASE,
spm.getPageWidth().getValue());
pageHeightContext = new SimplePercentBaseContext(null,
@@ -64,7 +64,7 @@
spm.getPageHeight().getValue());
} else {
// invert width and height since top left are rotated by 90 (cl or ccl)
- pageWidthContext = new SimplePercentBaseContext(null,
+ pageWidthContext = new SimplePercentBaseContext(null,
LengthBase.CUSTOM_BASE,
spm.getPageHeight().getValue());
pageHeightContext = new SimplePercentBaseContext(null,
Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBody.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBody.java?rev=679781&r1=679780&r2=679781&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBody.java (original)
+++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/fo/pagination/RegionBody.java Fri Jul 25 05:44:20 2008
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -58,7 +58,7 @@
commonMarginBlock = pList.getMarginBlockProps();
columnCount = pList.get(PR_COLUMN_COUNT).getNumeric();
columnGap = pList.get(PR_COLUMN_GAP).getLength();
-
+
if ((getColumnCount() > 1) && (getOverflow() == EN_SCROLL)) {
/* This is an error (See XSL Rec, fo:region-body description).
* The Rec allows for acting as if "1" is chosen in
@@ -103,13 +103,13 @@
* all margin properties are configured to using BLOCK_WIDTH.
* That's why we 'cheat' here and setup a context for the height but
* use the LengthBase.BLOCK_WIDTH.
- * Also the values are resolved relative to the page size
+ * Also the values are resolved relative to the page size
* and reference orientation.
*/
SimplePercentBaseContext pageWidthContext;
SimplePercentBaseContext pageHeightContext;
if (spm.getReferenceOrientation() % 180 == 0) {
- pageWidthContext = new SimplePercentBaseContext(null,
+ pageWidthContext = new SimplePercentBaseContext(null,
LengthBase.CONTAINING_BLOCK_WIDTH,
spm.getPageWidth().getValue());
pageHeightContext = new SimplePercentBaseContext(null,
@@ -117,7 +117,7 @@
spm.getPageHeight().getValue());
} else {
// invert width and height since top left are rotated by 90 (cl or ccl)
- pageWidthContext = new SimplePercentBaseContext(null,
+ pageWidthContext = new SimplePercentBaseContext(null,
LengthBase.CONTAINING_BLOCK_WIDTH,
spm.getPageHeight().getValue());
pageHeightContext = new SimplePercentBaseContext(null,
@@ -152,7 +152,7 @@
public String getLocalName() {
return "region-body";
}
-
+
/**
* {@inheritDoc}
* @return {@link org.apache.fop.fo.Constants#FO_REGION_BODY}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org